diff options
author | Remko Tronçon <git@el-tramo.be> | 2010-09-12 16:10:50 (GMT) |
---|---|---|
committer | Remko Tronçon <git@el-tramo.be> | 2010-09-12 16:10:50 (GMT) |
commit | 41e89bb5ed1a9d38d1ece1310ef708daad54a9a9 (patch) | |
tree | 729117779ef76f28bff02413ce74daac46ccc565 /Swift/QtUI/QtSwift.h | |
parent | de0cdc61015f86a334bc4c0589bafe0bfdf89786 (diff) | |
download | swift-contrib-41e89bb5ed1a9d38d1ece1310ef708daad54a9a9.zip swift-contrib-41e89bb5ed1a9d38d1ece1310ef708daad54a9a9.tar.bz2 |
Moved application message display around.
Diffstat (limited to 'Swift/QtUI/QtSwift.h')
-rw-r--r-- | Swift/QtUI/QtSwift.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Swift/QtUI/QtSwift.h b/Swift/QtUI/QtSwift.h index 4c570ae..657b749 100644 --- a/Swift/QtUI/QtSwift.h +++ b/Swift/QtUI/QtSwift.h @@ -11,20 +11,24 @@ #include <boost/program_options/options_description.hpp> #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 "Swiften/Application/CocoaApplication.h" +#endif namespace po = boost::program_options; class QSplitter; namespace Swift { + class Dock; class VCardStorageFactory; class AutoUpdater; - class Application; class ApplicationPathProvider; class AvatarStorage; class CapsStorage; @@ -59,14 +63,16 @@ namespace Swift { QtSettingsProvider *settings_; QSplitter* splitter_; QtSoundPlayer* soundPlayer_; + Dock* dock_; QtChatTabs* tabs_; - Application* application_; ApplicationPathProvider* applicationPathProvider_; AvatarStorage* avatarStorage_; CapsStorage* capsStorage_; VCardStorageFactory* vcardStorageFactory_; AutoUpdater* autoUpdater_; - +#if defined(SWIFTEN_PLATFORM_MACOSX) + CocoaApplication cocoaApplication_; +#endif }; } |