Merge pull request #9323 from m-kuhn/messagebar-cleanup

Some cleanup in QgsMessageBar
qgis · Mar 1, 2019 · 92b7356 · 92b7356
2 parents 819f275 + 6c6833d
commit 92b7356
Showing 1 changed file with 6 additions and 10 deletions.
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 )
     {