Merge remote-tracking branch 'simonsonc/rename-subtract'

wonder-sk · wonder-sk · commit e846a8986e14 · 2014-03-28T10:48:59.000+01:00
diff --git a/src/gui/qgsmapoverviewcanvas.cpp b/src/gui/qgsmapoverviewcanvas.cpp
@@ -45,7 +45,7 @@ class QgsPanningWidget : public QWidget
       QSize s = r->size();
       QRegion reg( 0, 0, s.width(), s.height() );
       QRegion reg2( 2, 2, s.width() - 4, s.height() - 4 );
-      QRegion reg3 = reg.subtract( reg2 );
+      QRegion reg3 = reg.subtracted( reg2 );
       setMask( reg3 );
     }
 

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ class QgsPanningWidget : public QWidget`
`45`	`45`	`QSize s = r->size();`
`46`	`46`	`QRegion reg( 0, 0, s.width(), s.height() );`
`47`	`47`	`QRegion reg2( 2, 2, s.width() - 4, s.height() - 4 );`
`48`		`- QRegion reg3 = reg.subtract( reg2 );`
	`48`	`+ QRegion reg3 = reg.subtracted( reg2 );`
`49`	`49`	`setMask( reg3 );`
`50`	`50`	`}`
`51`	`51`