summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2014-01-18 09:27:41 (GMT)
committerRemko Tronçon <git@el-tramo.be>2014-01-18 10:44:42 (GMT)
commitd869b157f0d3eee5d4964878b3990df98a07e020 (patch)
tree4c01b3cef0a1653b8aebd80ac71ca7ede7076fff /Sluift/SluiftClient.h
parent85c46a0fcce3495fe94397d53791628a8ccc74c4 (diff)
downloadswift-d869b157f0d3eee5d4964878b3990df98a07e020.zip
swift-d869b157f0d3eee5d4964878b3990df98a07e020.tar.bz2
Sluift: Refactor global debug & timeout options.
Use regular table values on the sluift table. Enable enabling tracing on a client after the fact. Change-Id: Iaa2bea61bdadf0b8dec4951654c402b7133c1151
Diffstat (limited to 'Sluift/SluiftClient.h')
-rw-r--r--Sluift/SluiftClient.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/Sluift/SluiftClient.h b/Sluift/SluiftClient.h
index 60eae16..f0192e4 100644
--- a/Sluift/SluiftClient.h
+++ b/Sluift/SluiftClient.h
@@ -12,7 +12,6 @@
#include <boost/function.hpp>
#include <Swiften/Client/ClientOptions.h>
-#include <Sluift/globals.h>
#include <Swiften/Elements/IQ.h>
#include <Swiften/Elements/Message.h>
#include <Swiften/Elements/Presence.h>
@@ -62,8 +61,7 @@ namespace Swift {
const JID& jid,
const std::string& password,
NetworkFactories* networkFactories,
- SimpleEventLoop* eventLoop,
- SluiftGlobals* globals);
+ SimpleEventLoop* eventLoop);
~SluiftClient();
Client* getClient() {
@@ -76,8 +74,9 @@ namespace Swift {
void connect();
void connect(const std::string& host, int port);
- void waitConnected();
+ void waitConnected(int timeout);
bool isConnected() const;
+ void setTraceEnabled(bool b);
template<typename T>
Sluift::Response sendPubSubRequest(
@@ -119,7 +118,6 @@ namespace Swift {
private:
NetworkFactories* networkFactories;
SimpleEventLoop* eventLoop;
- SluiftGlobals* globals;
Client* client;
ClientOptions options;
ClientXMLTracer* tracer;