Merge master into gtk3

rtgui/thumbimageupdater.cc

@@ -47,10 +47,10 @@ public:
         {}
 
         Job():
-            tbe_(0),
-            priority_(NULL),
+            tbe_(nullptr),
+            priority_(nullptr),
             upgrade_(false),
-            listener_(0)
+            listener_(nullptr)
         {}
 
         ThumbBrowserEntryBase* tbe_;
@@ -144,7 +144,7 @@ public:
 
         // unlock and do processing; will relock on block exit, then call listener
         double scale = 1.0;
-        rtengine::IImage8* img = 0;
+        rtengine::IImage8* img = nullptr;
         Thumbnail* thm = j.tbe_->thumbnail;
 
         if ( j.upgrade_ ) {
@@ -173,7 +173,7 @@ public:
 };
 
 ThumbImageUpdater*
-ThumbImageUpdater::getInstance(void)
+ThumbImageUpdater::getInstance()
 {
     static ThumbImageUpdater instance_;
     return &instance_;
@@ -188,7 +188,7 @@ void
 ThumbImageUpdater::add(ThumbBrowserEntryBase* tbe, bool* priority, bool upgrade, ThumbImageUpdateListener* l)
 {
     // nobody listening?
-    if ( l == 0 ) {
+    if ( l == nullptr ) {
         return;
     }
 
@@ -247,7 +247,7 @@ ThumbImageUpdater::removeJobs(ThumbImageUpdateListener* listener)
 }
 
 void
-ThumbImageUpdater::removeAllJobs(void)
+ThumbImageUpdater::removeAllJobs()
 {
     DEBUG("stop");