Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-02-02 21:11:47 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-02-02 21:11:47 (GMT) |
| commit | e9939e9958b0dae2dc6d2211b52dca5058869418 (patch) | |
| tree | 57ab81b84f28f00531a29a5c2d1a0baba172dd1f /Swiften/Client | |
| parent | b66315290cf80b090f1b66eef021c811d1ea0b74 (diff) | |
| download | swift-contrib-e9939e9958b0dae2dc6d2211b52dca5058869418.zip swift-contrib-e9939e9958b0dae2dc6d2211b52dca5058869418.tar.bz2 | |
Removing unused parameter from Client constructor.
Diffstat (limited to 'Swiften/Client')
| -rw-r--r-- | Swiften/Client/Client.cpp | 2 | ||||
| -rw-r--r-- | Swiften/Client/Client.h | 2 | ||||
| -rw-r--r-- | Swiften/Client/CoreClient.cpp | 2 | ||||
| -rw-r--r-- | Swiften/Client/CoreClient.h | 4 |
4 files changed, 4 insertions, 6 deletions
diff --git a/Swiften/Client/Client.cpp b/Swiften/Client/Client.cpp index d3dcd3e..168c357 100644 --- a/Swiften/Client/Client.cpp +++ b/Swiften/Client/Client.cpp @@ -28,7 +28,7 @@ namespace Swift { -Client::Client(EventLoop* eventLoop, NetworkFactories* networkFactories, const JID& jid, const String& password, Storages* storages) : CoreClient(eventLoop, networkFactories, jid, password), storages(storages) { +Client::Client(const JID& jid, const String& password, NetworkFactories* networkFactories, Storages* storages) : CoreClient(jid, password, networkFactories), storages(storages) { memoryStorages = new MemoryStorages(); softwareVersionResponder = new SoftwareVersionResponder(getIQRouter()); diff --git a/Swiften/Client/Client.h b/Swiften/Client/Client.h index 975d499..4725d50 100644 --- a/Swiften/Client/Client.h +++ b/Swiften/Client/Client.h @@ -47,7 +47,7 @@ namespace Swift { * this is NULL, * all data will be stored in memory (and be lost on shutdown) */ - Client(EventLoop* eventLoop, NetworkFactories* networkFactories, const JID& jid, const String& password, Storages* storages = NULL); + Client(const JID& jid, const String& password, NetworkFactories* networkFactories, Storages* storages = NULL); ~Client(); diff --git a/Swiften/Client/CoreClient.cpp b/Swiften/Client/CoreClient.cpp index 0a684b1..2bd22c8 100644 --- a/Swiften/Client/CoreClient.cpp +++ b/Swiften/Client/CoreClient.cpp @@ -22,7 +22,7 @@ namespace Swift { -CoreClient::CoreClient(EventLoop* eventLoop, NetworkFactories* networkFactories, const JID& jid, const String& password) : jid_(jid), password_(password), eventLoop(eventLoop), networkFactories(networkFactories), disconnectRequested_(false), certificateTrustChecker(NULL) { +CoreClient::CoreClient(const JID& jid, const String& password, NetworkFactories* networkFactories) : jid_(jid), password_(password), networkFactories(networkFactories), disconnectRequested_(false), certificateTrustChecker(NULL) { stanzaChannel_ = new ClientSessionStanzaChannel(); stanzaChannel_->onMessageReceived.connect(boost::bind(&CoreClient::handleMessageReceived, this, _1)); stanzaChannel_->onPresenceReceived.connect(boost::bind(&CoreClient::handlePresenceReceived, this, _1)); diff --git a/Swiften/Client/CoreClient.h b/Swiften/Client/CoreClient.h index bac78a3..5ecf2c9 100644 --- a/Swiften/Client/CoreClient.h +++ b/Swiften/Client/CoreClient.h @@ -32,7 +32,6 @@ namespace Swift { class TimerFactory; class ClientSession; class BasicSessionStream; - class EventLoop; class PlatformTLSFactories; class CertificateTrustChecker; class NetworkFactories; @@ -53,7 +52,7 @@ namespace Swift { * Constructs a client for the given JID with the given password. * The given eventLoop will be used to post events to. */ - CoreClient(EventLoop* eventLoop, NetworkFactories* networkFactories, const JID& jid, const String& password); + CoreClient(const JID& jid, const String& password, NetworkFactories* networkFactories); ~CoreClient(); void setCertificate(const String& certificate); @@ -207,7 +206,6 @@ namespace Swift { private: JID jid_; String password_; - EventLoop* eventLoop; NetworkFactories* networkFactories; ClientSessionStanzaChannel* stanzaChannel_; IQRouter* iqRouter_; |