Add Qtx namespace.

sifteo · Jan 11, 2013 · 41b11c4 · 41b11c4
1 parent 613c216
commit 41b11c4
Show file tree

Hide file tree

Showing 10 changed files with 62 additions and 0 deletions.
diff --git a/include/QtxJson b/include/QtxJson
@@ -1,6 +1,7 @@
 #ifndef QTXJSON_MODULE_H
 #define QTXJSON_MODULE_H
 
+#include "../src/json/jsonglobal.h"
 #include "../src/json/jsonreader.h"
 #include "../src/json/jsonstreamreader.h"
 #include "../src/json/jsonstreamwriter.h"

diff --git a/src/json/jsonglobal.h b/src/json/jsonglobal.h
@@ -0,0 +1,17 @@
+#ifndef QTXJSON_GLOBAL_H
+#define QTXJSON_GLOBAL_H
+
+#ifndef QTX_NAMESPACE
+#  define QTX_NAMESPACE Qtx
+#endif
+#ifndef QTX_USE_NAMESPACE
+#  define QTX_USE_NAMESPACE using namespace ::QTX_NAMESPACE;
+#endif
+#ifndef QTX_BEGIN_NAMESPACE
+#  define QTX_BEGIN_NAMESPACE namespace QTX_NAMESPACE {
+#endif
+#ifndef QTX_END_NAMESPACE
+#  define QTX_END_NAMESPACE }
+#endif
+
+#endif /* QTXJSON_GLOBAL_H */
diff --git a/src/json/jsonreader.cpp b/src/json/jsonreader.cpp
@@ -1,5 +1,7 @@
 #include "jsonreader.h"
 
+QTX_BEGIN_NAMESPACE
+
 
 QHash<QString, QVariant> JsonReader::parse(const QByteArray & data)
 {
@@ -248,3 +250,6 @@ bool JsonReaderContext::add(const QString & key, const QVariant & value)
 
     return false;
 }
+
+
+QTX_END_NAMESPACE
diff --git a/src/json/jsonreader.h b/src/json/jsonreader.h
@@ -1,9 +1,12 @@
 #ifndef JSONREADER_H
 #define JSONREADER_H
 
+#include "jsonglobal.h"
 #include <QtCore>
 #include "jsonstreamreader.h"
 
+QTX_BEGIN_NAMESPACE
+
 
 class JsonReaderContext;
 
@@ -80,4 +83,7 @@ class JsonReaderContext
     QList<QVariant> mArray;
 };
 
+
+QTX_END_NAMESPACE
+
 #endif // JSONREADER_H
diff --git a/src/json/jsonstreamreader.cpp b/src/json/jsonstreamreader.cpp
@@ -1,5 +1,7 @@
 #include "jsonstreamreader.h"
 
+QTX_BEGIN_NAMESPACE
+
 
 static yajl_callbacks callbacks = {  
     json_parse_null,
@@ -192,3 +194,6 @@ int json_parse_end_array(void * ctx)
     reader->enqueueToken(JsonStreamReader::EndArray);
     return 1;
 }
+
+
+QTX_END_NAMESPACE
diff --git a/src/json/jsonstreamreader.h b/src/json/jsonstreamreader.h
@@ -1,9 +1,12 @@
 #ifndef JSONSTREAMREADER_H
 #define JSONSTREAMREADER_H
 
+#include "jsonglobal.h"
 #include <QtCore>
 #include <yajl/yajl_parse.h>
 
+QTX_BEGIN_NAMESPACE
+
 
 extern int json_parse_null(void * ctx);
 extern int json_parse_boolean(void * ctx, int boolean);
@@ -79,4 +82,7 @@ class JsonStreamReader
     friend int json_parse_end_array(void * ctx);
 };
 
+
+QTX_END_NAMESPACE
+
 #endif // JSONSTREAMREADER_H
diff --git a/src/json/jsonstreamwriter.cpp b/src/json/jsonstreamwriter.cpp
@@ -1,5 +1,7 @@
 #include "jsonstreamwriter.h"
 
+QTX_BEGIN_NAMESPACE
+
 
 JsonStreamWriter::JsonStreamWriter()
 {
@@ -77,3 +79,6 @@ QByteArray JsonStreamWriter::data()
 
     //yajl_gen_clear(g);
 }
+
+
+QTX_END_NAMESPACE
diff --git a/src/json/jsonstreamwriter.h b/src/json/jsonstreamwriter.h
@@ -1,9 +1,12 @@
 #ifndef JSONSTREAMWRITER_H
 #define JSONSTREAMWRITER_H
 
+#include "jsonglobal.h"
 #include <QtCore>
 #include <yajl/yajl_gen.h>
 
+QTX_BEGIN_NAMESPACE
+
 
 class JsonStreamWriter
 {
@@ -28,4 +31,7 @@ class JsonStreamWriter
     yajl_gen mGenerator;
 };
 
+
+QTX_END_NAMESPACE
+
 #endif // JSONSTREAMWRITER_H
diff --git a/src/json/jsonwriter.cpp b/src/json/jsonwriter.cpp
@@ -1,5 +1,7 @@
 #include "jsonwriter.h"
 
+QTX_BEGIN_NAMESPACE
+
 
 QString JsonWriter::stringify(const QHash<QString, QVariant> & object)
 {
@@ -87,3 +89,6 @@ void JsonWriter::writeArray(const QList<QVariant> & array)
 
     mWriter.writeEndArray();
 }
+
+
+QTX_END_NAMESPACE
diff --git a/src/json/jsonwriter.h b/src/json/jsonwriter.h
@@ -1,9 +1,12 @@
 #ifndef JSONWRITER_H
 #define JSONWRITER_H
 
+#include "jsonglobal.h"
 #include <QtCore>
 #include "jsonstreamwriter.h"
 
+QTX_BEGIN_NAMESPACE
+
 
 class JsonWriter
 {
@@ -25,4 +28,7 @@ class JsonWriter
     JsonStreamWriter mWriter;
 };
 
+
+QTX_END_NAMESPACE
+
 #endif // JSONWRITER_H