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/filepanel.cc
+++ b/rtgui/filepanel.cc
@@ -28,7 +28,7 @@ int FilePanelInitUI (void* data)
    return 0;
 }

-FilePanel::FilePanel () : parent(NULL)
+FilePanel::FilePanel () : parent(nullptr)
 {

    // Contains everything except for the batch Tool Panel and tabs (Fast Export, Inspect, etc)
@@ -238,7 +238,7 @@ bool FilePanel::fileSelected (Thumbnail* thm)
    pendingLoadMutex.lock();
    pendingLoad *pl = new pendingLoad();
    pl->complete = false;
-    pl->pc = 0;
+    pl->pc = nullptr;
    pl->thm = thm;
    pendingLoads.push_back(pl);
    pendingLoadMutex.unlock();