1 files changed, 14 insertions, 6 deletions
diff --git a/Swift/QtUI/QtMainWindow.h b/Swift/QtUI/QtMainWindow.h
index 3462bb0..321fa2d 100644
--- a/Swift/QtUI/QtMainWindow.h
+++ b/Swift/QtUI/QtMainWindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Kevin Smith
+ * Copyright (c) 2010-2011 Kevin Smith
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
@@ -8,6 +8,7 @@
 
 #include <QWidget>
 #include <QMenu>
+#include <QList>
 #include "Swift/Controllers/UIInterfaces/MainWindow.h"
 #include "Swift/QtUI/QtRosterHeader.h"
 #include "Swift/QtUI/EventViewer/QtEventWindow.h"
@@ -20,12 +21,11 @@ class QLineEdit;
 class QPushButton;
 class QToolBar;
 class QAction;
-
+class QMenu;
 class QTabWidget;
 
 namespace Swift {
-	class QtTreeWidget;
-	class QtTreeWidgetFactory;
+	class QtRosterWidget;
 	class TreeWidget;
 	class UIEventStream;
 	class QtTabWidget;
@@ -35,7 +35,7 @@ namespace Swift {
 		Q_OBJECT
 		public:
 			QtMainWindow(QtSettingsProvider*, UIEventStream* eventStream);
-			~QtMainWindow();
+			virtual ~QtMainWindow();
 			std::vector<QMenu*> getMenus() {return menus_;}
 			void setMyNick(const std::string& name);
 			void setMyJID(const JID& jid);
@@ -46,6 +46,7 @@ namespace Swift {
 			QtEventWindow* getEventWindow();
 			QtChatListWindow* getChatListWindow();
 			void setRosterModel(Roster* roster);
+			void setAvailableAdHocCommands(const std::vector<DiscoItems::Item>& commands);
 		private slots:
 			void handleStatusChanged(StatusShow::Type showType, const QString &statusMessage);
 			void handleUIEvent(boost::shared_ptr<UIEvent> event);
@@ -55,17 +56,22 @@ namespace Swift {
 			void handleEditProfileAction();
 			void handleAddUserActionTriggered(bool checked);
 			void handleChatUserActionTriggered(bool checked);
+			void handleAdHocActionTriggered(bool checked);
 			void handleEventCountUpdated(int count);
+			void handleChatCountUpdated(int count);
 			void handleEditProfileRequest();
+			void handleTabChanged(int index);
 
 		private:
+			QtSettingsProvider* settings_;
 			std::vector<QMenu*> menus_;
-			QtTreeWidget* treeWidget_;
+			QtRosterWidget* treeWidget_;
 			QtRosterHeader* meView_;
 			QAction* addUserAction_;
 			QAction* editUserAction_;
 			QAction* chatUserAction_;
 			QAction* showOfflineAction_;
+			QMenu* serverAdHocMenu_;
 			QtTabWidget* tabs_;
 			QWidget* contactsTabWidget_;
 			QWidget* eventsTabWidget_;
@@ -73,5 +79,7 @@ namespace Swift {
 			QtChatListWindow* chatListWindow_;
 			UIEventStream* uiEventStream_;
 			bool lastOfflineState_;
+			std::vector<DiscoItems::Item> serverAdHocCommands_;
+			QList<QAction*> serverAdHocCommandActions_;
 	};
 }