qgis · Sep 9, 2015
diff --git a/‎src/analysis/raster/qgsalignraster.cpp
Lines changed: 2 additions & 2 deletions b/‎src/analysis/raster/qgsalignraster.cpp
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/app/composer/qgscomposer.cpp
Lines changed: 8 additions & 8 deletions b/‎src/app/composer/qgscomposer.cpp
Lines changed: 8 additions & 8 deletions
@@ -366,7 +366,7 @@ bool QgsAlignRaster::run()
 
   //dump();
 
-  foreach ( const Item& r, mRasters )
+  Q_FOREACH ( const Item& r, mRasters )
   {
     if ( !createAndWarp( r ) )
       return false;
@@ -401,7 +401,7 @@ int QgsAlignRaster::suggestedReferenceLayer() const
   QgsCoordinateReferenceSystem destCRS( "EPSG:4326" );
   QString destWkt = destCRS.toWkt();
 
-  foreach ( const Item& raster, mRasters )
+  Q_FOREACH ( const Item& raster, mRasters )
   {
     if ( !suggestedWarpOutput( RasterInfo( raster.inputFilename ), destWkt, &cs ) )
       return false;
 
@@ -561,7 +561,7 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
   mPanelMenu->addAction( mItemsDock->toggleViewAction() );
 
   QList<QDockWidget *> docks = findChildren<QDockWidget *>();
-  foreach ( QDockWidget* dock, docks )
+  Q_FOREACH ( QDockWidget* dock, docks )
   {
     dock->setFeatures( QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetClosable );
     connect( dock, SIGNAL( visibilityChanged( bool ) ), this, SLOT( dockVisibilityChanged( bool ) ) );
@@ -729,7 +729,7 @@ void QgsComposer::setIconSizes( int size )
 
   //Change all current icon sizes.
   QList<QToolBar *> toolbars = findChildren<QToolBar *>();
-  foreach ( QToolBar * toolbar, toolbars )
+  Q_FOREACH ( QToolBar * toolbar, toolbars )
   {
     toolbar->setIconSize( QSize( size, size ) );
   }
@@ -1384,14 +1384,14 @@ void QgsComposer::on_mActionHidePanels_triggered()
     mPanelStatus.clear();
     //record status of all docks
 
-    foreach ( QDockWidget* dock, docks )
+    Q_FOREACH ( QDockWidget* dock, docks )
     {
       mPanelStatus.insert( dock->windowTitle(), PanelStatus( dock->isVisible(), false ) );
       dock->setVisible( false );
     }
 
     //record active dock tabs
-    foreach ( QTabBar* tabBar, tabBars )
+    Q_FOREACH ( QTabBar* tabBar, tabBars )
     {
       QString currentTabTitle = tabBar->tabText( tabBar->currentIndex() );
       mPanelStatus[ currentTabTitle ].isActive = true;
@@ -1400,7 +1400,7 @@ void QgsComposer::on_mActionHidePanels_triggered()
   else
   {
     //restore visibility of all docks
-    foreach ( QDockWidget* dock, docks )
+    Q_FOREACH ( QDockWidget* dock, docks )
     {
       if ( ! mPanelStatus.contains( dock->windowTitle() ) )
       {
@@ -1411,7 +1411,7 @@ void QgsComposer::on_mActionHidePanels_triggered()
     }
 
     //restore previously active dock tabs
-    foreach ( QTabBar* tabBar, tabBars )
+    Q_FOREACH ( QTabBar* tabBar, tabBars )
     {
       //loop through all tabs in tab bar
       for ( int i = 0; i < tabBar->count(); ++i )
@@ -3725,7 +3725,7 @@ void QgsComposer::populateHelpMenu()
 void QgsComposer::populateWithOtherMenu( QMenu* thisMenu, QMenu* otherMenu )
 {
   thisMenu->clear();
-  foreach ( QAction* act, otherMenu->actions() )
+  Q_FOREACH ( QAction* act, otherMenu->actions() )
   {
     if ( act->menu() )
     {
@@ -3741,7 +3741,7 @@ void QgsComposer::populateWithOtherMenu( QMenu* thisMenu, QMenu* otherMenu )
 QMenu* QgsComposer::mirrorOtherMenu( QMenu* otherMenu )
 {
   QMenu* newMenu = new QMenu( otherMenu->title(), this );
-  foreach ( QAction* act, otherMenu->actions() )
+  Q_FOREACH ( QAction* act, otherMenu->actions() )
   {
     if ( act->menu() )
     {
Original file line number	Diff line number	Diff line change
`@@ -366,7 +366,7 @@ bool QgsAlignRaster::run()`
`366`	`366`
`367`	`367`	`//dump();`
`368`	`368`
`369`		`- foreach ( const Item& r, mRasters )`
	`369`	`+ Q_FOREACH ( const Item& r, mRasters )`
`370`	`370`	`{`
`371`	`371`	`if ( !createAndWarp( r ) )`
`372`	`372`	`return false;`
`@@ -401,7 +401,7 @@ int QgsAlignRaster::suggestedReferenceLayer() const`
`401`	`401`	`QgsCoordinateReferenceSystem destCRS( "EPSG:4326" );`
`402`	`402`	`QString destWkt = destCRS.toWkt();`
`403`	`403`
`404`		`- foreach ( const Item& raster, mRasters )`
	`404`	`+ Q_FOREACH ( const Item& raster, mRasters )`
`405`	`405`	`{`
`406`	`406`	`if ( !suggestedWarpOutput( RasterInfo( raster.inputFilename ), destWkt, &cs ) )`
`407`	`407`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -561,7 +561,7 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )`
`561`	`561`	`mPanelMenu->addAction( mItemsDock->toggleViewAction() );`
`562`	`562`
`563`	`563`	`QList<QDockWidget > docks = findChildren<QDockWidget >();`
`564`		`- foreach ( QDockWidget* dock, docks )`
	`564`	`+ Q_FOREACH ( QDockWidget* dock, docks )`
`565`	`565`	`{`
`566`	`566`	`dock->setFeatures( QDockWidget::DockWidgetMovable \| QDockWidget::DockWidgetClosable );`
`567`	`567`	`connect( dock, SIGNAL( visibilityChanged( bool ) ), this, SLOT( dockVisibilityChanged( bool ) ) );`
`@@ -729,7 +729,7 @@ void QgsComposer::setIconSizes( int size )`
`729`	`729`
`730`	`730`	`//Change all current icon sizes.`
`731`	`731`	`QList<QToolBar > toolbars = findChildren<QToolBar >();`
`732`		`- foreach ( QToolBar * toolbar, toolbars )`
	`732`	`+ Q_FOREACH ( QToolBar * toolbar, toolbars )`
`733`	`733`	`{`
`734`	`734`	`toolbar->setIconSize( QSize( size, size ) );`
`735`	`735`	`}`
`@@ -1384,14 +1384,14 @@ void QgsComposer::on_mActionHidePanels_triggered()`
`1384`	`1384`	`mPanelStatus.clear();`
`1385`	`1385`	`//record status of all docks`
`1386`	`1386`
`1387`		`- foreach ( QDockWidget* dock, docks )`
	`1387`	`+ Q_FOREACH ( QDockWidget* dock, docks )`
`1388`	`1388`	`{`
`1389`	`1389`	`mPanelStatus.insert( dock->windowTitle(), PanelStatus( dock->isVisible(), false ) );`
`1390`	`1390`	`dock->setVisible( false );`
`1391`	`1391`	`}`
`1392`	`1392`
`1393`	`1393`	`//record active dock tabs`
`1394`		`- foreach ( QTabBar* tabBar, tabBars )`
	`1394`	`+ Q_FOREACH ( QTabBar* tabBar, tabBars )`
`1395`	`1395`	`{`
`1396`	`1396`	`QString currentTabTitle = tabBar->tabText( tabBar->currentIndex() );`
`1397`	`1397`	`mPanelStatus[ currentTabTitle ].isActive = true;`
`@@ -1400,7 +1400,7 @@ void QgsComposer::on_mActionHidePanels_triggered()`
`1400`	`1400`	`else`
`1401`	`1401`	`{`
`1402`	`1402`	`//restore visibility of all docks`
`1403`		`- foreach ( QDockWidget* dock, docks )`
	`1403`	`+ Q_FOREACH ( QDockWidget* dock, docks )`
`1404`	`1404`	`{`
`1405`	`1405`	`if ( ! mPanelStatus.contains( dock->windowTitle() ) )`
`1406`	`1406`	`{`
`@@ -1411,7 +1411,7 @@ void QgsComposer::on_mActionHidePanels_triggered()`
`1411`	`1411`	`}`
`1412`	`1412`
`1413`	`1413`	`//restore previously active dock tabs`
`1414`		`- foreach ( QTabBar* tabBar, tabBars )`
	`1414`	`+ Q_FOREACH ( QTabBar* tabBar, tabBars )`
`1415`	`1415`	`{`
`1416`	`1416`	`//loop through all tabs in tab bar`
`1417`	`1417`	`for ( int i = 0; i < tabBar->count(); ++i )`
`@@ -3725,7 +3725,7 @@ void QgsComposer::populateHelpMenu()`
`3725`	`3725`	`void QgsComposer::populateWithOtherMenu( QMenu* thisMenu, QMenu* otherMenu )`
`3726`	`3726`	`{`
`3727`	`3727`	`thisMenu->clear();`
`3728`		`- foreach ( QAction* act, otherMenu->actions() )`
	`3728`	`+ Q_FOREACH ( QAction* act, otherMenu->actions() )`
`3729`	`3729`	`{`
`3730`	`3730`	`if ( act->menu() )`
`3731`	`3731`	`{`
`@@ -3741,7 +3741,7 @@ void QgsComposer::populateWithOtherMenu( QMenu* thisMenu, QMenu* otherMenu )`
`3741`	`3741`	`QMenu* QgsComposer::mirrorOtherMenu( QMenu* otherMenu )`
`3742`	`3742`	`{`
`3743`	`3743`	`QMenu* newMenu = new QMenu( otherMenu->title(), this );`
`3744`		`- foreach ( QAction* act, otherMenu->actions() )`
	`3744`	`+ Q_FOREACH ( QAction* act, otherMenu->actions() )`
`3745`	`3745`	`{`
`3746`	`3746`	`if ( act->menu() )`
`3747`	`3747`	`{`