1 files changed, 8 insertions, 6 deletions
diff --git a/src/plugins/coreplugin/mainwindow.h b/src/plugins/coreplugin/mainwindow.h
index 0d7b533086..2847b341cb 100644
--- a/src/plugins/coreplugin/mainwindow.h
+++ b/src/plugins/coreplugin/mainwindow.h
@@ -31,22 +31,25 @@
 #include <utils/appmainwindow.h>
 #include <utils/dropsupport.h>
 
-#include <QMap>
 #include <QColor>
 
 #include <functional>
+#include <unordered_map>
 
 QT_BEGIN_NAMESPACE
 class QPrinter;
 class QToolButton;
 QT_END_NAMESPACE
 
+namespace Utils {
+class InfoBar;
+}
+
 namespace Core {
 
 class EditorManager;
 class ExternalToolManager;
 class IDocument;
-class InfoBar;
 class JsExpander;
 class MessageManager;
 class ModeManager;
@@ -82,7 +85,7 @@ public:
     void extensionsInitialized();
     void aboutToShutdown();
 
-    IContext *contextObject(QWidget *widget);
+    IContext *contextObject(QWidget *widget) const;
     void addContextObject(IContext *context);
     void removeContextObject(IContext *context);
 
@@ -94,7 +97,7 @@ public:
     virtual QPrinter *printer() const;
     IContext * currentContextObject() const;
     QStatusBar *statusBar() const;
-    InfoBar *infoBar() const;
+    Utils::InfoBar *infoBar() const;
 
     void updateAdditionalContexts(const Context &remove, const Context &add,
                                   ICore::ContextPriority priority);
@@ -121,7 +124,6 @@ private:
     void openFile();
     void aboutToShowRecentFiles();
     void setFocusToEditor();
-    void saveAll();
     void aboutQtCreator();
     void aboutPlugins();
     void updateFocusWidget(QWidget *old, QWidget *now);
@@ -165,7 +167,7 @@ private:
 
     QList<IContext *> m_activeContext;
 
-    QMap<QWidget *, IContext *> m_contextWidgets;
+    std::unordered_map<QWidget *, IContext *> m_contextWidgets;
 
     GeneralSettings *m_generalSettings = nullptr;
     SystemSettings *m_systemSettings = nullptr;