summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-10-23 21:08:19 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-11-03 12:17:40 (GMT)
commit9d9fb66aefef85a1c5ad432391014d15011747d1 (patch)
tree55b1ebe7dcb0108008a28ebf8fee773b27e60547 /Swift/Controllers/MainController.h
parentd509598b0f0edf5e103caedbab8662edc834445e (diff)
downloadswift-9d9fb66aefef85a1c5ad432391014d15011747d1.zip
swift-9d9fb66aefef85a1c5ad432391014d15011747d1.tar.bz2
Added ClientDiscoManager.
Diffstat (limited to 'Swift/Controllers/MainController.h')
-rw-r--r--Swift/Controllers/MainController.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/Swift/Controllers/MainController.h b/Swift/Controllers/MainController.h
index c36c136..c05d098 100644
--- a/Swift/Controllers/MainController.h
+++ b/Swift/Controllers/MainController.h
@@ -17,8 +17,8 @@
#include "Swiften/Base/String.h"
#include "Swiften/Client/ClientError.h"
#include "Swiften/JID/JID.h"
-#include "Swiften/Elements/VCard.h"
#include "Swiften/Elements/DiscoInfo.h"
+#include "Swiften/Elements/VCard.h"
#include "Swiften/Elements/ErrorPayload.h"
#include "Swiften/Elements/Presence.h"
#include "Swift/Controllers/Settings/SettingsProvider.h"
@@ -38,7 +38,6 @@ namespace Swift {
class MainWindowFactory;
class MainWindow;
class RosterController;
- class DiscoInfoResponder;
class LoginWindow;
class EventLoop;
class LoginWindowFactory;
@@ -132,11 +131,9 @@ namespace Swift {
EventController* eventController_;
EventWindowController* eventWindowController_;
LoginWindow* loginWindow_;
- DiscoInfoResponder* discoResponder_;
UIEventStream* uiEventStream_;
XMLConsoleController* xmlConsoleController_;
ChatsManager* chatsManager_;
- boost::shared_ptr<CapsInfo> capsInfo_;
JID jid_;
JID boundJID_;
SystemTrayController* systemTrayController_;