summaryrefslogtreecommitdiff
path: root/src/client/Client.h
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-01-31 18:49:14 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-01-31 18:49:14 (GMT)
commit857b0cc1fc58f066acd59404d16ee5e566e20f00 (patch)
tree7607fc43f3bdd63687dff39209f44defa48e6a35 /src/client/Client.h
parent1d297cb57a338f2a9e34d0f16642afc6a83c1041 (diff)
downloadpowder-857b0cc1fc58f066acd59404d16ee5e566e20f00.zip
powder-857b0cc1fc58f066acd59404d16ee5e566e20f00.tar.gz
Load user information from preferences, fps display for testing
Diffstat (limited to 'src/client/Client.h')
-rw-r--r--src/client/Client.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/client/Client.h b/src/client/Client.h
index 0587d79..4ca0287 100644
--- a/src/client/Client.h
+++ b/src/client/Client.h
@@ -3,6 +3,7 @@
#include <queue>
#include <vector>
+#include <fstream>
#include "Config.h"
#include "HTTP.h"
@@ -11,6 +12,10 @@
#include "Singleton.h"
#include "User.h"
+#include "cajun/reader.h"
+#include "cajun/writer.h"
+#include "cajun/elements.h"
+
enum LoginStatus {
LoginOkay, LoginError
};
@@ -34,6 +39,9 @@ private:
int activeThumbRequestCompleteTimes[IMGCONNS];
std::string activeThumbRequestIDs[IMGCONNS];
public:
+ //Config file handle
+ json::Object configDocument;
+
Client();
~Client();