Some cleanup in QgsMessageBar

m-kuhn · m-kuhn · commit 6c6833d1da40 · 2019-03-01T22:49:58.000+01:00
diff --git a/src/gui/qgsmessagebar.cpp b/src/gui/qgsmessagebar.cpp
@@ -133,15 +133,11 @@ void QgsMessageBar::popItem( QgsMessageBarItem *item )
 
   if ( item == mCurrentItem )
   {
-    if ( mCurrentItem )
-    {
-      QWidget *widget = mCurrentItem;
-      mLayout->removeWidget( widget );
-      mCurrentItem->hide();
-      disconnect( mCurrentItem, &QgsMessageBarItem::styleChanged, this, &QWidget::setStyleSheet );
-      mCurrentItem->deleteLater();
-      mCurrentItem = nullptr;
-    }
+    mLayout->removeWidget( mCurrentItem );
+    mCurrentItem->hide();
+    disconnect( mCurrentItem, &QgsMessageBarItem::styleChanged, this, &QWidget::setStyleSheet );
+    mCurrentItem->deleteLater();
+    mCurrentItem = nullptr;
 
     if ( !mItems.isEmpty() )
     {
@@ -171,7 +167,7 @@ bool QgsMessageBar::popWidget( QgsMessageBarItem *item )
     return true;
   }
 
-  Q_FOREACH ( QgsMessageBarItem *existingItem, mItems )
+  for ( QgsMessageBarItem *existingItem : qgis::as_const( mItems ) )
   {
     if ( existingItem == item )
     {

Original file line number	Diff line number	Diff line change
`@@ -133,15 +133,11 @@ void QgsMessageBar::popItem( QgsMessageBarItem *item )`
`133`	`133`
`134`	`134`	`if ( item == mCurrentItem )`
`135`	`135`	`{`
`136`		`- if ( mCurrentItem )`
`137`		`- {`
`138`		`- QWidget *widget = mCurrentItem;`
`139`		`- mLayout->removeWidget( widget );`
`140`		`- mCurrentItem->hide();`
`141`		`- disconnect( mCurrentItem, &QgsMessageBarItem::styleChanged, this, &QWidget::setStyleSheet );`
`142`		`- mCurrentItem->deleteLater();`
`143`		`- mCurrentItem = nullptr;`
`144`		`- }`
	`136`	`+ mLayout->removeWidget( mCurrentItem );`
	`137`	`+ mCurrentItem->hide();`
	`138`	`+ disconnect( mCurrentItem, &QgsMessageBarItem::styleChanged, this, &QWidget::setStyleSheet );`
	`139`	`+ mCurrentItem->deleteLater();`
	`140`	`+ mCurrentItem = nullptr;`
`145`	`141`
`146`	`142`	`if ( !mItems.isEmpty() )`
`147`	`143`	`{`
`@@ -171,7 +167,7 @@ bool QgsMessageBar::popWidget( QgsMessageBarItem *item )`
`171`	`167`	`return true;`
`172`	`168`	`}`
`173`	`169`
`174`		`- Q_FOREACH ( QgsMessageBarItem *existingItem, mItems )`
	`170`	`+ for ( QgsMessageBarItem *existingItem : qgis::as_const( mItems ) )`
`175`	`171`	`{`
`176`	`172`	`if ( existingItem == item )`
`177`	`173`	`{`