1 files changed, 25 insertions, 21 deletions
diff --git a/Swift/QtUI/QtMainWindow.h b/Swift/QtUI/QtMainWindow.h
index c46fdfc..0e7f290 100644
--- a/Swift/QtUI/QtMainWindow.h
+++ b/Swift/QtUI/QtMainWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -12,6 +12,7 @@
 #include <QMenu>
 #include <QWidget>
 
+#include <Swift/Controllers/Chat/Chattables.h>
 #include <Swift/Controllers/UIInterfaces/MainWindow.h>
 
 #include <Swift/QtUI/ChatList/QtChatListWindow.h>
@@ -19,44 +20,45 @@
 #include <Swift/QtUI/QtLoginWindow.h>
 #include <Swift/QtUI/QtRosterHeader.h>
 
+class QAction;
 class QComboBox;
 class QLineEdit;
-class QPushButton;
-class QToolBar;
-class QAction;
 class QMenu;
+class QPushButton;
 class QTabWidget;
+class QToolBar;
 
 namespace Swift {
+    class QtChatOverview;
     class QtRosterWidget;
-    class TreeWidget;
-    class UIEventStream;
     class QtTabWidget;
-    class SettingsProvider;
     class QtUIPreferences;
+    class SettingsProvider;
     class StatusCache;
+    class TreeWidget;
+    class UIEventStream;
 
     class QtMainWindow : public QWidget, public MainWindow {
         Q_OBJECT
         public:
-            QtMainWindow(SettingsProvider*, UIEventStream* eventStream, QtLoginWindow::QtMenus loginMenus, StatusCache* statusCache, bool emoticonsExist, bool enableAdHocCommandOnJID);
-            virtual ~QtMainWindow();
+            QtMainWindow(Chattables&, SettingsProvider*, UIEventStream* eventStream, QtLoginWindow::QtMenus loginMenus, StatusCache* statusCache, bool emoticonsExist, bool enableAdHocCommandOnJID);
+            virtual ~QtMainWindow() override;
             std::vector<QMenu*> getMenus() {return menus_;}
-            void setMyNick(const std::string& name);
-            void setMyJID(const JID& jid);
-            void setMyAvatarPath(const std::string& path);
-            void setMyStatusText(const std::string& status);
-            void setMyStatusType(StatusShow::Type type);
-            void setMyContactRosterItem(std::shared_ptr<ContactRosterItem> contact);
-            void setConnecting();
-            void setStreamEncryptionStatus(bool tlsInPlaceAndValid);
-            void openCertificateDialog(const std::vector<Certificate::ref>& chain);
+            void setMyNick(const std::string& name) override;
+            void setMyJID(const JID& jid) override;
+            void setMyAvatarPath(const std::string& path) override;
+            void setMyStatusText(const std::string& status) override;
+            void setMyStatusType(StatusShow::Type type) override;
+            void setMyContactRosterItem(std::shared_ptr<ContactRosterItem> contact) override;
+            void setConnecting() override;
+            void setStreamEncryptionStatus(bool tlsInPlaceAndValid) override;
+            void openCertificateDialog(const std::vector<Certificate::ref>& chain) override;
             static void openCertificateDialog(const std::vector<Certificate::ref>& chain, QWidget* parent);
             QtEventWindow* getEventWindow();
             QtChatListWindow* getChatListWindow();
-            void setRosterModel(Roster* roster);
-            void setAvailableAdHocCommands(const std::vector<DiscoItems::Item>& commands);
-            void setBlockingCommandAvailable(bool isAvailable);
+            void setRosterModel(Roster* roster) override;
+            void setAvailableAdHocCommands(const std::vector<DiscoItems::Item>& commands) override;
+            void setBlockingCommandAvailable(bool isAvailable) override;
         private slots:
             void handleStatusChanged(StatusShow::Type showType, const QString &statusMessage);
             void handleSettingChanged(const std::string& settingPath);
@@ -81,6 +83,7 @@ namespace Swift {
             void handleSomethingSelectedChanged(bool itemSelected);
 
         private:
+            Chattables& chattables_;
             SettingsProvider* settings_;
             QtLoginWindow::QtMenus loginMenus_;
             std::vector<QMenu*> menus_;
@@ -98,6 +101,7 @@ namespace Swift {
             QMenu* serverAdHocMenu_;
             QtTabWidget* tabs_;
             QComboBox* tabBarCombo_;
+            QtChatOverview* chatOverview_;
             QWidget* contactsTabWidget_;
             QWidget* eventsTabWidget_;
             QtEventWindow* eventWindow_;