Merge branch 'master' into gtk3

2016-07-09 23:49:31 +02:00
parent 93360770e1 3b734e4a7a
commit 040962c1b7
49 changed files with 418 additions and 419 deletions
--- a/rtgui/cropwindow.cc
+++ b/rtgui/cropwindow.cc
@@ -511,7 +511,7 @@ void CropWindow::buttonRelease (int button, int num, int bstate, int x, int y)

        state = SNormal;

-        for (std::list<CropWindowListener*>::iterator i = listeners.begin(); i != listeners.end(); i++) {
+        for (std::list<CropWindowListener*>::iterator i = listeners.begin(); i != listeners.end(); ++i) {
            (*i)->cropPositionChanged (this);
        }

@@ -2304,7 +2304,7 @@ void CropWindow::delCropWindowListener (CropWindowListener* l)
        if (*i == l) {
            i = listeners.erase (i);
        } else {
-            i++;
+            ++i;
        }
 }