Merge branch 'gtk3' into gtk3-bugfix

2016-10-28 23:48:22 +02:00
parent 4d19b97109 b16ef8d1f5
commit e4e474ca8a
259 changed files with 5062 additions and 3653 deletions
--- a/rtgui/preferences.cc
+++ b/rtgui/preferences.cc
@@ -1338,7 +1338,7 @@ void Preferences::parseDir (Glib::ustring dirname, std::vector<Glib::ustring>& i
    }

    // process directory
-    Glib::Dir* dir = NULL;
+    Glib::Dir* dir = nullptr;

    try {
        dir = new Glib::Dir (dirname);
@@ -2168,7 +2168,7 @@ void Preferences::updateFFinfos()
 bool Preferences::splashClosed(GdkEventAny* event)
 {
    delete splash;
-    splash = NULL;
+    splash = nullptr;
    return true;
 }