Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-12-17 10:33:48 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-12-17 16:09:00 (GMT) |
| commit | ce54856995e6efe067276ed2f1a8c67decbc5abf (patch) | |
| tree | 9eefceaa7c908daf649ccf8fb67716324cdb11fe /Swift/Controllers/MainController.h | |
| parent | 0f69400cf4572a970cf602a2c5b90ffc38a4b3b0 (diff) | |
| download | swift-ce54856995e6efe067276ed2f1a8c67decbc5abf.zip swift-ce54856995e6efe067276ed2f1a8c67decbc5abf.tar.bz2 | |
Fixed IPv6 network test.
Diffstat (limited to 'Swift/Controllers/MainController.h')
| -rw-r--r-- | Swift/Controllers/MainController.h | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/Swift/Controllers/MainController.h b/Swift/Controllers/MainController.h index 0427307..2f101a5 100644 --- a/Swift/Controllers/MainController.h +++ b/Swift/Controllers/MainController.h @@ -6,7 +6,7 @@ #pragma once -#include "Swiften/Base/boost_bsignals.h" +#include <Swiften/Base/boost_bsignals.h> #include <boost/shared_ptr.hpp> #include <vector> @@ -27,22 +27,19 @@ #include "Swift/Controllers/UIEvents/UIEvent.h" namespace Swift { + class UIFactory; class EventLoop; class Client; - class ChatWindowFactory; class ChatController; class ChatsManager; class CertificateStorageFactory; class CertificateStorage; class CertificateStorageTrustChecker; - class ChatListWindowFactory; class EventController; - class MainWindowFactory; class MainWindow; class RosterController; class LoginWindow; class EventLoop; - class LoginWindowFactory; class MUCController; class Notifier; class TogglableNotifier; @@ -54,11 +51,9 @@ namespace Swift { class SoundPlayer; class XMLConsoleController; class UIEventStream; - class XMLConsoleWidgetFactory; class EventWindowFactory; class EventWindowController; class MUCSearchController; - class MUCSearchWindowFactory; class StatusTracker; class Dock; class Storages; @@ -70,16 +65,10 @@ namespace Swift { MainController( EventLoop* eventLoop, NetworkFactories* networkFactories, - ChatWindowFactory* chatWindowFactory, - MainWindowFactory *mainWindowFactory, - LoginWindowFactory *loginWindowFactory, - EventWindowFactory* eventWindowFactory, + UIFactory* uiFactories, SettingsProvider *settings, SystemTray* systemTray, SoundPlayer* soundPlayer, - XMLConsoleWidgetFactory* xmlConsoleWidgetFactory, - ChatListWindowFactory* chatListWindowFactory_, - MUCSearchWindowFactory* mucSearchWindowFactory, StoragesFactory* storagesFactory, CertificateStorageFactory* certificateStorageFactory, Dock* dock, @@ -116,6 +105,7 @@ namespace Swift { private: EventLoop* eventLoop_; NetworkFactories* networkFactories_; + UIFactory* uiFactory_; PlatformIdleQuerier idleQuerier_; ActualIdleDetector idleDetector_; StoragesFactory* storagesFactory_; @@ -124,10 +114,6 @@ namespace Swift { CertificateStorage* certificateStorage_; CertificateStorageTrustChecker* certificateTrustChecker_; Client* client_; - ChatWindowFactory* chatWindowFactory_; - MainWindowFactory* mainWindowFactory_; - LoginWindowFactory* loginWindowFactory_; - EventWindowFactory* eventWindowFactory_; SettingsProvider *settings_; ProfileSettingsProvider* profileSettings_; Dock* dock_; @@ -148,11 +134,9 @@ namespace Swift { String vCardPhotoHash_; String password_; String certificateFile_; - ChatListWindowFactory* chatListWindowFactory_; boost::shared_ptr<ErrorEvent> lastDisconnectError_; bool useDelayForLatency_; MUCSearchController* mucSearchController_; - MUCSearchWindowFactory* mucSearchWindowFactory_; int timeBeforeNextReconnect_; Timer::ref reconnectTimer_; StatusTracker* statusTracker_; |