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/QtUI/QtSwift.h | |
| parent | 0f69400cf4572a970cf602a2c5b90ffc38a4b3b0 (diff) | |
| download | swift-ce54856995e6efe067276ed2f1a8c67decbc5abf.zip swift-ce54856995e6efe067276ed2f1a8c67decbc5abf.tar.bz2 | |
Fixed IPv6 network test.
Diffstat (limited to 'Swift/QtUI/QtSwift.h')
| -rw-r--r-- | Swift/QtUI/QtSwift.h | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/Swift/QtUI/QtSwift.h b/Swift/QtUI/QtSwift.h index 68933dd..f241fd0 100644 --- a/Swift/QtUI/QtSwift.h +++ b/Swift/QtUI/QtSwift.h @@ -14,9 +14,6 @@ #include "Swiften/Base/String.h" #include "Swiften/Base/Platform.h" #include "Swiften/EventLoop/Qt/QtEventLoop.h" -#include "QtLoginWindowFactory.h" -#include "QtMainWindowFactory.h" -#include "QtChatWindowFactory.h" #include "QtSettingsProvider.h" #if defined(SWIFTEN_PLATFORM_MACOSX) #include "SwifTools/Application/CocoaApplication.h" @@ -30,6 +27,7 @@ namespace po = boost::program_options; class QSplitter; namespace Swift { + class QtUIFactory; class CertificateStorageFactory; class Dock; class Notifier; @@ -39,14 +37,10 @@ namespace Swift { class AvatarStorage; class CapsStorage; class MainController; - class QtChatWindowFactory; - class QtMainWindowFactory; - class QtLoginWindowFactory; - class QtXMLConsoleWidgetFactory; class QtSystemTray; + class QtChatTabs; + class QtChatWindowFactory; class QtSoundPlayer; - class QtEventWindowFactory; - class QtChatListWindowFactory; class QtMUCSearchWindowFactory; class EventLoop; @@ -60,15 +54,10 @@ namespace Swift { QtEventLoop clientMainThreadCaller_; PlatformTLSFactories tlsFactories_; BoostNetworkFactories networkFactories_; + QtChatWindowFactory* chatWindowFactory_; std::vector<MainController*> mainControllers_; - QtChatWindowFactory *chatWindowFactory_; - std::vector<QtMainWindowFactory*> rosterWindowFactories_; - std::vector<QtLoginWindowFactory*> loginWindowFactories_; - std::vector<QtXMLConsoleWidgetFactory*> xmlConsoleWidgetFactories_; - std::vector<QtEventWindowFactory*> eventWindowFactories_; std::vector<QtSystemTray*> systemTrays_; - std::vector<QtChatListWindowFactory*> chatListWindowFactories_; - std::vector<QtMUCSearchWindowFactory*> mucSearchWindowFactories_; + std::vector<QtUIFactory*> uiFactories_; QtSettingsProvider *settings_; QSplitter* splitter_; QtSoundPlayer* soundPlayer_; |