Merge master into gtk3

2016-10-28 17:59:47 +02:00
parent 5244c44420 3a346d919d
commit b16ef8d1f5
259 changed files with 5061 additions and 3654 deletions
--- a/rtgui/whitebalance.cc
+++ b/rtgui/whitebalance.cc
@@ -147,7 +147,7 @@ static double wbTemp2Slider(double temp)
    return sval;
 }

-WhiteBalance::WhiteBalance () : FoldableToolPanel(this, "whitebalance", M("TP_WBALANCE_LABEL")), wbp(NULL), wblistener(NULL)
+WhiteBalance::WhiteBalance () : FoldableToolPanel(this, "whitebalance", M("TP_WBALANCE_LABEL")), wbp(nullptr), wblistener(nullptr)
 {

    Gtk::HBox* hbox = Gtk::manage (new Gtk::HBox ());
@@ -834,7 +834,7 @@ WBEntry* WhiteBalance::findWBEntry (Glib::ustring label, enum WB_LabelType lblTy
        }
    }

-    return NULL;
+    return nullptr;
 }

 int WhiteBalance::_setActiveMethod(Glib::ustring &label, Gtk::TreeModel::Children &children)