1 files changed, 67 insertions, 60 deletions
diff --git a/Swift/QtUI/QtSwift.h b/Swift/QtUI/QtSwift.h
index a971324..3ad5714 100644
--- a/Swift/QtUI/QtSwift.h
+++ b/Swift/QtUI/QtSwift.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2015 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -30,65 +30,72 @@ namespace po = boost::program_options;
 class QSplitter;
 
 namespace Swift {
-	class QtUIFactory;
-	class CertificateStorageFactory;
-	class Dock;
-	class Notifier;
-	class StoragesFactory;
-	class AutoUpdater;
-	class ApplicationPathProvider;
-	class AvatarStorage;
-	class CapsStorage;
-	class MainController;
-	class QtSystemTray;
-	class QtChatTabsBase;
-	class QtChatWindowFactory;
-	class QtSoundPlayer;
-	class QtMUCSearchWindowFactory;
-	class QtUserSearchWindowFactory;
-	class EventLoop;
-	class URIHandler;
-	class SettingsProviderHierachy;
-	class XMLSettingsProvider;
-	class StatusCache;
-	class QtSingleWindow;
-		
-	class QtSwift : public QObject {
-		Q_OBJECT
-		public:
-			QtSwift(const po::variables_map& options);
-			static po::options_description getOptionsDescription();
-			~QtSwift();
-		private:
-			XMLSettingsProvider* loadSettingsFile(const QString& fileName);
-			void loadEmoticonsFile(const QString& fileName, std::map<std::string, std::string>& emoticons);
-		private:
-			QtEventLoop clientMainThreadCaller_;
-			PlatformTLSFactories tlsFactories_;
-			BoostNetworkFactories networkFactories_;
-			QtChatWindowFactory* chatWindowFactory_;
-			std::vector<MainController*> mainControllers_;
-			std::vector<QtSystemTray*> systemTrays_;
-			std::vector<QtUIFactory*> uiFactories_;
-			QtSettingsProvider* qtSettings_;
-			XMLSettingsProvider* xmlSettings_;
-			SettingsProviderHierachy* settingsHierachy_;
-			QtSingleWindow* splitter_;
-			QtSoundPlayer* soundPlayer_;
-			Dock* dock_;
-			URIHandler* uriHandler_;
-			QtChatTabsBase* tabs_;
-			ApplicationPathProvider* applicationPathProvider_;
-			StoragesFactory* storagesFactory_;
-			CertificateStorageFactory* certificateStorageFactory_;
-			AutoUpdater* autoUpdater_;
-			Notifier* notifier_;
-			StatusCache* statusCache_;
-			PlatformIdleQuerier idleQuerier_;
-			ActualIdleDetector idleDetector_;
+    class QtUIFactory;
+    class CertificateStorageFactory;
+    class Dock;
+    class Notifier;
+    class StoragesFactory;
+    class AutoUpdater;
+    class ApplicationPathProvider;
+    class AvatarStorage;
+    class CapsStorage;
+    class MainController;
+    class QtSystemTray;
+    class QtChatTabsBase;
+    class QtChatWindowFactory;
+    class QtSoundPlayer;
+    class QtMUCSearchWindowFactory;
+    class QtUserSearchWindowFactory;
+    class EventLoop;
+    class URIHandler;
+    class SettingsProviderHierachy;
+    class XMLSettingsProvider;
+    class StatusCache;
+    class QtSingleWindow;
+
+    class QtSwift : public QObject {
+        Q_OBJECT
+        public:
+            QtSwift(const po::variables_map& options);
+            static po::options_description getOptionsDescription();
+            ~QtSwift();
+
+        private slots:
+            void handleAboutToQuit();
+            void handleRecommendRestartToInstallUpdate();
+
+        private:
+            XMLSettingsProvider* loadSettingsFile(const QString& fileName);
+            void loadEmoticonsFile(const QString& fileName, std::map<std::string, std::string>& emoticons);
+            static const std::string& updateChannelToFeed(const std::string& channel);
+
+        private:
+            QtEventLoop clientMainThreadCaller_;
+            PlatformTLSFactories tlsFactories_;
+            BoostNetworkFactories networkFactories_;
+            QtChatWindowFactory* chatWindowFactory_;
+            std::vector<MainController*> mainControllers_;
+            std::vector<QtSystemTray*> systemTrays_;
+            std::vector<QtUIFactory*> uiFactories_;
+            QtSettingsProvider* qtSettings_;
+            XMLSettingsProvider* xmlSettings_;
+            SettingsProviderHierachy* settingsHierachy_;
+            QtSingleWindow* splitter_;
+            QtSoundPlayer* soundPlayer_;
+            Dock* dock_;
+            URIHandler* uriHandler_;
+            QtChatTabsBase* tabs_;
+            ApplicationPathProvider* applicationPathProvider_;
+            StoragesFactory* storagesFactory_;
+            CertificateStorageFactory* certificateStorageFactory_;
+            AutoUpdater* autoUpdater_;
+            Notifier* notifier_;
+            StatusCache* statusCache_;
+            PlatformIdleQuerier idleQuerier_;
+            ActualIdleDetector idleDetector_;
 #if defined(SWIFTEN_PLATFORM_MACOSX)
-			CocoaApplication cocoaApplication_;
-			CocoaApplicationActivateHelper cocoaApplicationActivateHelper_;
+            CocoaApplication cocoaApplication_;
+            CocoaApplicationActivateHelper cocoaApplicationActivateHelper_;
 #endif
-	};
+    };
 }