Combine multiple calls of Core::ICore::infoBar()

This will make a potential switch to instead calling popupInfoBar() a
simpler, 1-line change.

Change-Id: Ibcb2679534a0e8e6d32de40afaef200b09c010dd
Reviewed-by: Eike Ziller <[email protected]>

10 files changed, 38 insertions, 26 deletions

diff --git a/src/plugins/android/androidplugin.cpp b/src/plugins/android/androidplugin.cpp
index abe632e25b8..68dfed60a83 100644
--- a/src/plugins/android/androidplugin.cpp
+++ b/src/plugins/android/androidplugin.cpp
@@ -136,7 +136,8 @@ class AndroidPlugin final : public ExtensionSystem::IPlugin
     void askUserAboutAndroidSetup()
     {
         NANOTRACE_SCOPE("Android", "AndroidPlugin::askUserAboutAndroidSetup");
-        if (!Core::ICore::infoBar()->canInfoBeAdded(kSetupAndroidSetting))
+        Utils::InfoBar *infoBar = Core::ICore::infoBar();
+        if (!infoBar->canInfoBeAdded(kSetupAndroidSetting))
             return;
 
         Utils::InfoBarEntry
@@ -154,7 +155,7 @@ class AndroidPlugin final : public ExtensionSystem::IPlugin
             },
             {},
             Utils::InfoBarEntry::ButtonAction::SuppressPersistently);
-        Core::ICore::infoBar()->addInfo(info);
+        infoBar->addInfo(info);
     }
 };
 
diff --git a/src/plugins/coreplugin/coreplugin.cpp b/src/plugins/coreplugin/coreplugin.cpp
index f0fc3bb86e1..441d1af1555 100644
--- a/src/plugins/coreplugin/coreplugin.cpp
+++ b/src/plugins/coreplugin/coreplugin.cpp
@@ -501,7 +501,8 @@ void CorePlugin::checkSettings()
 
 void CorePlugin::warnAboutCrashReporing()
 {
-    if (!ICore::infoBar()->canInfoBeAdded(kWarnCrashReportingSetting))
+    InfoBar *infoBar = ICore::infoBar();
+    if (!infoBar->canInfoBeAdded(kWarnCrashReportingSetting))
         return;
 
     QString warnStr = ICore::settings()->value("CrashReportingEnabled", false).toBool()
@@ -537,7 +538,7 @@ void CorePlugin::warnAboutCrashReporing()
         label->setContentsMargins(0, 0, 0, 8);
         return label;
     });
-    ICore::infoBar()->addInfo(info);
+    infoBar->addInfo(info);
 }
 
 // static
diff --git a/src/plugins/extensionmanager/extensionmanagerwidget.cpp b/src/plugins/extensionmanager/extensionmanagerwidget.cpp
index e88a938ca21..06c61de865d 100644
--- a/src/plugins/extensionmanager/extensionmanagerwidget.cpp
+++ b/src/plugins/extensionmanager/extensionmanagerwidget.cpp
@@ -102,7 +102,8 @@ const char kRestartSetting[] = "RestartAfterPluginEnabledChanged";
 
 static void requestRestart()
 {
-    if (ICore::infoBar()->canInfoBeAdded(kRestartSetting)) {
+    InfoBar *infoBar = ICore::infoBar();
+    if (infoBar->canInfoBeAdded(kRestartSetting)) {
         Utils::InfoBarEntry
             info(kRestartSetting, Core::Tr::tr("Plugin changes will take effect after restart."));
         info.setTitle(Tr::tr("Restart Required"));
@@ -111,7 +112,7 @@ static void requestRestart()
             [] { QTimer::singleShot(0, ICore::instance(), &ICore::restart); },
             {},
             InfoBarEntry::ButtonAction::Hide);
-        ICore::infoBar()->addInfo(info);
+        infoBar->addInfo(info);
     }
 }
 
diff --git a/src/plugins/mcusupport/mcukitmanager.cpp b/src/plugins/mcusupport/mcukitmanager.cpp
index 68aa123b3f2..d87379efbe3 100644
--- a/src/plugins/mcusupport/mcukitmanager.cpp
+++ b/src/plugins/mcusupport/mcukitmanager.cpp
@@ -507,7 +507,8 @@ static void askUserAboutMcuSupportKitsUpgrade(const SettingsHandler::Ptr &settin
 {
     const char upgradeMcuSupportKits[] = "UpgradeMcuSupportKits";
 
-    if (!ICore::infoBar()->canInfoBeAdded(upgradeMcuSupportKits))
+    InfoBar *infoBar = ICore::infoBar();
+    if (!infoBar->canInfoBeAdded(upgradeMcuSupportKits))
         return;
 
     InfoBarEntry info(upgradeMcuSupportKits,
@@ -534,7 +535,7 @@ static void askUserAboutMcuSupportKitsUpgrade(const SettingsHandler::Ptr &settin
         {},
         InfoBarEntry::ButtonAction::Hide);
 
-    ICore::infoBar()->addInfo(info);
+    infoBar->addInfo(info);
 }
 
 void createAutomaticKits(const SettingsHandler::Ptr &settingsHandler)
diff --git a/src/plugins/mcusupport/mcusupportoptions.cpp b/src/plugins/mcusupport/mcusupportoptions.cpp
index 2c5118df247..8f93b841d35 100644
--- a/src/plugins/mcusupport/mcusupportoptions.cpp
+++ b/src/plugins/mcusupport/mcusupportoptions.cpp
@@ -261,7 +261,8 @@ void McuSupportOptions::displayKitCreationMessages(const MessagesList messages,
     if (messages.isEmpty() || !qtMCUsPackage->isValidStatus())
         return;
     static const char mcuKitCreationErrorInfoId[] = "ErrorWhileCreatingMCUKits";
-    if (!Core::ICore::infoBar()->canInfoBeAdded(mcuKitCreationErrorInfoId))
+    InfoBar *infoBar = Core::ICore::infoBar();
+    if (!infoBar->canInfoBeAdded(mcuKitCreationErrorInfoId))
         return;
 
     Utils::InfoBarEntry info(mcuKitCreationErrorInfoId,
@@ -278,7 +279,7 @@ void McuSupportOptions::displayKitCreationMessages(const MessagesList messages,
         {},
         InfoBarEntry::ButtonAction::Hide);
 
-    Core::ICore::infoBar()->addInfo(info);
+    infoBar->addInfo(info);
 }
 
 void McuSupportOptions::checkUpgradeableKits()
diff --git a/src/plugins/mcusupport/mcusupportplugin.cpp b/src/plugins/mcusupport/mcusupportplugin.cpp
index 0dba35bd245..c40a2797e03 100644
--- a/src/plugins/mcusupport/mcusupportplugin.cpp
+++ b/src/plugins/mcusupport/mcusupportplugin.cpp
@@ -123,7 +123,8 @@ static bool isQtMCUsProject(ProjectExplorer::Project *p)
 
 static void askUserAboutMcuSupportKitsSetup()
 {
-    if (!ICore::infoBar()->canInfoBeAdded(setupMcuSupportKits)
+    InfoBar *infoBar = ICore::infoBar();
+    if (!infoBar->canInfoBeAdded(setupMcuSupportKits)
         || dd->m_options.qulDirFromSettings().isEmpty()
         || !McuKitManager::existingKits(nullptr).isEmpty())
         return;
@@ -138,7 +139,7 @@ static void askUserAboutMcuSupportKitsSetup()
         [] { QTimer::singleShot(0, []() { ICore::showOptionsDialog(Constants::SETTINGS_ID); }); },
         {},
         InfoBarEntry::ButtonAction::Hide);
-    ICore::infoBar()->addInfo(info);
+    infoBar->addInfo(info);
 }
 
 static void askUserAboutRemovingUninstalledTargetsKits()
@@ -146,7 +147,8 @@ static void askUserAboutRemovingUninstalledTargetsKits()
     const char removeUninstalledKits[] = "RemoveUninstalledKits";
     QList<Kit *> uninstalledTargetsKits;
 
-    if (!ICore::infoBar()->canInfoBeAdded(removeUninstalledKits)
+    InfoBar *infoBar = ICore::infoBar();
+    if (!infoBar->canInfoBeAdded(removeUninstalledKits)
         || (uninstalledTargetsKits = McuKitManager::findUninstalledTargetsKits()).isEmpty())
         return;
 
@@ -169,7 +171,7 @@ static void askUserAboutRemovingUninstalledTargetsKits()
         {},
         InfoBarEntry::ButtonAction::Hide);
 
-    ICore::infoBar()->addInfo(info);
+    infoBar->addInfo(info);
 }
 
 class McuSupportPlugin final : public ExtensionSystem::IPlugin
@@ -241,7 +243,8 @@ void McuSupportPlugin::initialize()
         connect(ProjectManager::instance(),
                 &ProjectManager::projectFinishedParsing,
                 [&](ProjectExplorer::Project *p) {
-                    if (!isQtMCUsProject(p) || !ICore::infoBar()->canInfoBeAdded(qdsMcuDocInfoEntry))
+                    InfoBar *infoBar = ICore::infoBar();
+                    if (!isQtMCUsProject(p) || !infoBar->canInfoBeAdded(qdsMcuDocInfoEntry))
                         return;
                     Utils::InfoBarEntry docInfo(
                         qdsMcuDocInfoEntry,
@@ -255,7 +258,7 @@ void McuSupportPlugin::initialize()
                         },
                         {},
                         InfoBarEntry::ButtonAction::Suppress);
-                    ICore::infoBar()->addInfo(docInfo);
+                    infoBar->addInfo(docInfo);
                 });
     }
 
diff --git a/src/plugins/qtsupport/qtsupportplugin.cpp b/src/plugins/qtsupport/qtsupportplugin.cpp
index bd3c954644a..ffaa54e4df3 100644
--- a/src/plugins/qtsupport/qtsupportplugin.cpp
+++ b/src/plugins/qtsupport/qtsupportplugin.cpp
@@ -153,10 +153,11 @@ const char kLinkWithQtInstallationSetting[] = "LinkWithQtInstallation";
 
 static void askAboutQtInstallation()
 {
+    InfoBar *infoBar = ICore::infoBar();
     // if the install settings exist, the Qt Creator installation is (probably) already linked to
     // a Qt installation, so don't ask
     if (!LinkWithQtSupport::canLinkWithQt() || LinkWithQtSupport::isLinkedWithQt()
-        || !ICore::infoBar()->canInfoBeAdded(kLinkWithQtInstallationSetting))
+        || !infoBar->canInfoBeAdded(kLinkWithQtInstallationSetting))
         return;
 
     Utils::InfoBarEntry info(
@@ -171,7 +172,7 @@ static void askAboutQtInstallation()
         [] { QTimer::singleShot(0, ICore::dialogParent(), &LinkWithQtSupport::linkWithQt); },
         {},
         InfoBarEntry::ButtonAction::Hide);
-    ICore::infoBar()->addInfo(info);
+    infoBar->addInfo(info);
 }
 
 void QtSupportPlugin::extensionsInitialized()
diff --git a/src/plugins/remotelinux/linuxdevice.cpp b/src/plugins/remotelinux/linuxdevice.cpp
index d5f64683db1..fbf5b1aeb1a 100644
--- a/src/plugins/remotelinux/linuxdevice.cpp
+++ b/src/plugins/remotelinux/linuxdevice.cpp
@@ -1250,9 +1250,10 @@ bool LinuxDevicePrivate::checkDisconnectedWithWarning()
     if (!m_disconnected())
         return false;
 
-    QMetaObject::invokeMethod(Core::ICore::infoBar(), [id = q->id(), name = q->displayName()] {
+    InfoBar *infoBar = Core::ICore::infoBar();
+    QMetaObject::invokeMethod(infoBar, [id = q->id(), name = q->displayName(), infoBar] {
         const Id errorId = id.withPrefix("error_");
-        if (!Core::ICore::infoBar()->canInfoBeAdded(errorId))
+        if (!infoBar->canInfoBeAdded(errorId))
             return;
         const QString warnStr
             = Tr::tr("Device \"%1\" is currently marked as disconnected.").arg(name);
@@ -1269,7 +1270,7 @@ bool LinuxDevicePrivate::checkDisconnectedWithWarning()
             });
             return label;
         });
-        Core::ICore::infoBar()->addInfo(info);
+        infoBar->addInfo(info);
     });
     return true;
 }
diff --git a/src/plugins/updateinfo/updateinfoplugin.cpp b/src/plugins/updateinfo/updateinfoplugin.cpp
index 0a7e29a4fba..32283aa93a8 100644
--- a/src/plugins/updateinfo/updateinfoplugin.cpp
+++ b/src/plugins/updateinfo/updateinfoplugin.cpp
@@ -235,9 +235,10 @@ static void showUpdateInfo(const QList<Update> &updates,
             return scrollArea;
         });
     }
-    ICore::infoBar()->removeInfo(InstallUpdates); // remove any existing notifications
-    ICore::infoBar()->unsuppressInfo(InstallUpdates);
-    ICore::infoBar()->addInfo(info);
+    InfoBar *infoBar = ICore::infoBar();
+    infoBar->removeInfo(InstallUpdates); // remove any existing notifications
+    infoBar->unsuppressInfo(InstallUpdates);
+    infoBar->addInfo(info);
 }
 
 void UpdateInfoPlugin::checkForUpdatesFinished()
diff --git a/src/plugins/webassembly/webassemblydevice.cpp b/src/plugins/webassembly/webassemblydevice.cpp
index 9caf7caae28..32a28215b6e 100644
--- a/src/plugins/webassembly/webassemblydevice.cpp
+++ b/src/plugins/webassembly/webassemblydevice.cpp
@@ -53,7 +53,8 @@ static void askUserAboutEmSdkSetup()
 {
     const char setupWebAssemblyEmSdk[] = "SetupWebAssemblyEmSdk";
 
-    if (!ICore::infoBar()->canInfoBeAdded(setupWebAssemblyEmSdk)
+    InfoBar *infoBar = ICore::infoBar();
+    if (!infoBar->canInfoBeAdded(setupWebAssemblyEmSdk)
             || !WebAssemblyQtVersion::isQtVersionInstalled()
             || areToolChainsRegistered())
         return;
@@ -67,7 +68,7 @@ static void askUserAboutEmSdkSetup()
         [] { QTimer::singleShot(0, []() { ICore::showOptionsDialog(Constants::SETTINGS_ID); }); },
         {},
         InfoBarEntry::ButtonAction::Hide);
-    ICore::infoBar()->addInfo(info);
+    infoBar->addInfo(info);
 }
 
 class WebAssemblyDeviceFactory final : public IDeviceFactory