Merge master into gtk3

rtgui/rtwindow.cc

@@ -80,12 +80,12 @@ osx_open_file_cb (GtkosxApplication *app, gchar *path_, gpointer data)
 #endif // __APPLE__
 
 RTWindow::RTWindow ()
-    : mainNB(NULL)
-    , bpanel(NULL)
-    , splash(NULL)
-    , btn_fullscreen(NULL)
-    , epanel(NULL)
-    , fpanel(NULL)
+    : mainNB(nullptr)
+    , bpanel(nullptr)
+    , splash(nullptr)
+    , btn_fullscreen(nullptr)
+    , epanel(nullptr)
+    , fpanel(nullptr)
 {
 
     cacheMgr->init ();
@@ -142,19 +142,19 @@ RTWindow::RTWindow ()
     signal_key_press_event().connect( sigc::mem_fun(*this, &RTWindow::keyPressed) );
 
     if(simpleEditor) {
-        epanel = Gtk::manage( new EditorPanel (NULL) );
+        epanel = Gtk::manage( new EditorPanel (nullptr) );
         epanel->setParent (this);
         add (*epanel);
         show_all ();
 
-        pldBridge = NULL; // No progress listener
+        pldBridge = nullptr; // No progress listener
 
         CacheManager* cm = CacheManager::getInstance();
         Thumbnail* thm = cm->getEntry( argv1 );
 
         if(thm) {
             int error;
-            rtengine::InitialImage *ii = rtengine::InitialImage::load(argv1, thm->getType() == FT_Raw, &error, NULL);
+            rtengine::InitialImage *ii = rtengine::InitialImage::load(argv1, thm->getType() == FT_Raw, &error, nullptr);
             epanel->open( thm, ii );
         }
     } else {
@@ -299,7 +299,7 @@ RTWindow::~RTWindow()
         delete pldBridge;
     }
 
-    pldBridge = NULL;
+    pldBridge = nullptr;
 #if defined(__APPLE__)
     g_object_unref (osxApp);
 #endif
@@ -379,7 +379,7 @@ void RTWindow::on_realize ()
                 splash->show ();
             } else {
                 delete splash;
-                splash = NULL;
+                splash = nullptr;
             }
         }
     }
@@ -549,7 +549,7 @@ bool RTWindow::keyPressed (GdkEventKey* event)
 #endif
 
     if (try_quit) {
-        if (!on_delete_event(0)) {
+        if (!on_delete_event(nullptr)) {
             gtk_main_quit();
         }
     }
@@ -841,7 +841,7 @@ void RTWindow::updateHistogramPosition (int oldPosition, int newPosition)
 bool RTWindow::splashClosed(GdkEventAny* event)
 {
     delete splash;
-    splash = NULL;
+    splash = nullptr;
     return true;
 }