summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-09-12 16:10:50 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-09-12 16:10:50 (GMT)
commit41e89bb5ed1a9d38d1ece1310ef708daad54a9a9 (patch)
tree729117779ef76f28bff02413ce74daac46ccc565 /Swift/Controllers/MainController.h
parentde0cdc61015f86a334bc4c0589bafe0bfdf89786 (diff)
downloadswift-41e89bb5ed1a9d38d1ece1310ef708daad54a9a9.zip
swift-41e89bb5ed1a9d38d1ece1310ef708daad54a9a9.tar.bz2
Moved application message display around.
Diffstat (limited to 'Swift/Controllers/MainController.h')
-rw-r--r--Swift/Controllers/MainController.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/Swift/Controllers/MainController.h b/Swift/Controllers/MainController.h
index 8596ace..7aad4a0 100644
--- a/Swift/Controllers/MainController.h
+++ b/Swift/Controllers/MainController.h
@@ -46,7 +46,6 @@ namespace Swift {
class XMPPRosterController;
class PresenceSender;
class DiscoInfoResponder;
- class ApplicationMessageDisplay;
class AvatarManager;
class CapsManager;
class EntityCapsManager;
@@ -70,6 +69,7 @@ namespace Swift {
class StatusTracker;
class VCardStorageFactory;
class MUCRegistry;
+ class Dock;
class MainController {
public:
@@ -87,7 +87,7 @@ namespace Swift {
AvatarStorage* avatarStorage,
CapsStorage* capsStorage,
VCardStorageFactory* vcardStorageFactory,
- ApplicationMessageDisplay* applicationMessageDisplay,
+ Dock* dock,
bool useDelayForLatency);
~MainController();
@@ -133,7 +133,7 @@ namespace Swift {
CapsStorage* capsStorage_;
VCardStorageFactory* vcardStorageFactory_;
VCardManager* vcardManager_;
- ApplicationMessageDisplay* applicationMessageDisplay_;
+ Dock* dock_;
ChatController* chatController_;
XMPPRosterController* xmppRosterController_;
RosterController* rosterController_;