diff options
104 files changed, 275 insertions, 213 deletions
diff --git a/src/client/jsondb-client.cpp b/src/client/jsondb-client.cpp index 464611da..d4157afc 100644 --- a/src/client/jsondb-client.cpp +++ b/src/client/jsondb-client.cpp @@ -60,31 +60,31 @@ \brief The QtAddOn::JsonDb namespace contains the C++ client for JsonDb. - To use namespace QtAddOn::JsonDb from C++, use macro Q_USE_JSONDB_NAMESPACE. + To use namespace QtAddOn::JsonDb from C++, use macro QT_ADDON_JSONDB_USE_NAMESPACE. \code #include <jsondb-client.h> - Q_USE_JSONDB_NAMESPACE + QT_ADDON_JSONDB_USE_NAMESPACE \endcode To declare the class without including the declaration of the class: \code #include <jsondb-global.h> - Q_ADDON_JSONDB_BEGIN_NAMESPACE + QT_ADDON_JSONDB_BEGIN_NAMESPACE class JsonDbClient; - Q_ADDON_JSONDB_END_NAMESPACE - Q_USE_JSONDB_NAMESPACE + QT_ADDON_JSONDB_END_NAMESPACE + QT_ADDON_JSONDB_USE_NAMESPACE \endcode */ /*! - \macro Q_USE_JSONDB_NAMESPACE + \macro QT_ADDON_JSONDB_USE_NAMESPACE \inmodule QtJsonDb \brief Makes namespace QtAddOn::JsonDb visible to C++ source code. */ -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE /*! \class QtAddOn::JsonDb::JsonDbClient @@ -967,4 +967,4 @@ JsonDbChangesSince *JsonDbClient::changesSince() #include "moc_jsondb-client.cpp" -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE diff --git a/src/client/jsondb-client.h b/src/client/jsondb-client.h index 49f5028a..5728ac2a 100644 --- a/src/client/jsondb-client.h +++ b/src/client/jsondb-client.h @@ -55,7 +55,7 @@ QT_BEGIN_HEADER -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE class QsonObject; @@ -194,9 +194,10 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_timeout()) Q_PRIVATE_SLOT(d_func(), void _q_processQueue()) }; -} } // end namespace QtAddOn::JsonDb -Q_DECLARE_OPERATORS_FOR_FLAGS(QtAddOn::JsonDb::JsonDbClient::NotifyTypes) +Q_DECLARE_OPERATORS_FOR_FLAGS(JsonDbClient::NotifyTypes) + +QT_ADDON_JSONDB_END_NAMESPACE QT_END_HEADER diff --git a/src/client/jsondb-client_p.h b/src/client/jsondb-client_p.h index 24de48ca..a003b310 100644 --- a/src/client/jsondb-client_p.h +++ b/src/client/jsondb-client_p.h @@ -52,7 +52,7 @@ #include "jsondb-client.h" -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE /*! \class JsonDbClientPrivate @@ -120,6 +120,6 @@ public: bool send(int requestId, const QVariantMap &request); }; -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE #endif // JSONDBCLIENT_P_H diff --git a/src/client/jsondb-connection.cpp b/src/client/jsondb-connection.cpp index 5fd588cb..5e4ab0fc 100644 --- a/src/client/jsondb-connection.cpp +++ b/src/client/jsondb-connection.cpp @@ -45,7 +45,7 @@ #include "jsondb-connection_p.h" #include "jsondb-connection_p_p.h" -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE Q_GLOBAL_STATIC(JsonDbConnection, qtjsondbConnection) @@ -704,6 +704,7 @@ void JsonDbSyncCall::handleError(int id, int code, const QString& message) } } -} } // end namespace QtAddOn::JsonDb - #include "moc_jsondb-connection_p.cpp" +#include "moc_jsondb-connection_p_p.cpp" + +QT_ADDON_JSONDB_END_NAMESPACE diff --git a/src/client/jsondb-connection_p.h b/src/client/jsondb-connection_p.h index aaa68431..cc861fe0 100644 --- a/src/client/jsondb-connection_p.h +++ b/src/client/jsondb-connection_p.h @@ -52,7 +52,7 @@ #include "jsondb-global.h" -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE class QsonObject; class QsonMap; @@ -154,6 +154,6 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_onReceiveMessage(QsonObject)) }; -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE #endif /* JSONDB_CONNECTION_P_H */ diff --git a/src/client/jsondb-connection_p_p.h b/src/client/jsondb-connection_p_p.h index 813bc9fc..d30a8aef 100644 --- a/src/client/jsondb-connection_p_p.h +++ b/src/client/jsondb-connection_p_p.h @@ -55,7 +55,7 @@ #include "qsonstream.h" -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE class QsonObject; class QsonMap; @@ -117,6 +117,6 @@ private: JsonDbConnection *mSyncJsonDbConnection; }; -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE #endif /* JSONDB_CONNECTION_P_P_H */ diff --git a/src/client/jsondb-error.cpp b/src/client/jsondb-error.cpp index e2934612..3204baee 100644 --- a/src/client/jsondb-error.cpp +++ b/src/client/jsondb-error.cpp @@ -42,7 +42,7 @@ #include "jsondb-global.h" #include "jsondb-error.h" -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE /*! \class QtAddOn::JsonDb::JsonDbError @@ -94,6 +94,4 @@ namespace QtAddOn { namespace JsonDb { An error when creating an index object */ - } -} - +QT_ADDON_JSONDB_END_NAMESPACE diff --git a/src/client/jsondb-error.h b/src/client/jsondb-error.h index 7a72bbcb..11205d73 100644 --- a/src/client/jsondb-error.h +++ b/src/client/jsondb-error.h @@ -46,7 +46,7 @@ QT_BEGIN_HEADER -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE class JsonDbError { public: @@ -75,7 +75,7 @@ public: }; }; -} } // namespace +QT_ADDON_JSONDB_END_NAMESPACE QT_END_HEADER diff --git a/src/client/jsondb-global.h b/src/client/jsondb-global.h index a54760ea..ccc80de9 100644 --- a/src/client/jsondb-global.h +++ b/src/client/jsondb-global.h @@ -43,18 +43,29 @@ #include "qglobal.h" -QT_BEGIN_HEADER - #if defined(QT_ADDON_JSONDB_LIB) # define Q_ADDON_JSONDB_EXPORT Q_DECL_EXPORT #else # define Q_ADDON_JSONDB_EXPORT Q_DECL_IMPORT #endif -#define Q_ADDON_JSONDB_BEGIN_NAMESPACE namespace QtAddOn { namespace JsonDb { -#define Q_ADDON_JSONDB_END_NAMESPACE } } -#define Q_USE_JSONDB_NAMESPACE using namespace QtAddOn::JsonDb; -#define Q_ADDON_JSONDB_PREPEND_NAMESPACE(name) ::QtAddOn::JsonDb::name +#if defined(QT_NAMESPACE) +# define QT_ADDON_JSONDB_BEGIN_NAMESPACE namespace QT_NAMESPACE { namespace QtAddOn { namespace JsonDb { +# define QT_ADDON_JSONDB_END_NAMESPACE } } } +# define QT_ADDON_JSONDB_USE_NAMESPACE using namespace QT_NAMESPACE::QtAddOn::JsonDb; +# define QT_ADDON_JSONDB_PREPEND_NAMESPACE(name) ::QT_NAMESPACE::QtAddOn::JsonDb::name +#else +# define QT_ADDON_JSONDB_BEGIN_NAMESPACE namespace QtAddOn { namespace JsonDb { +# define QT_ADDON_JSONDB_END_NAMESPACE } } +# define QT_ADDON_JSONDB_USE_NAMESPACE using namespace QtAddOn::JsonDb; +# define QT_ADDON_JSONDB_PREPEND_NAMESPACE(name) ::QtAddOn::JsonDb::name +#endif + +// All the following macros will be deprecated in a future version of this file. +#define Q_ADDON_JSONDB_BEGIN_NAMESPACE QT_ADDON_JSONDB_BEGIN_NAMESPACE +#define Q_ADDON_JSONDB_END_NAMESPACE QT_ADDON_JSONDB_END_NAMESPACE +#define Q_USE_JSONDB_NAMESPACE QT_ADDON_JSONDB_USE_NAMESPACE +#define Q_ADDON_JSONDB_PREPEND_NAMESPACE(name) QT_ADDON_JSONDB_PREPEND_NAMESPACE(name) # define Q_ADDON_JSONDB_FORWARD_DECLARE_CLASS(name) \ Q_ADDON_JSONDB_BEGIN_NAMESPACE class name; Q_ADDON_JSONDB_END_NAMESPACE \ @@ -64,6 +75,4 @@ QT_BEGIN_HEADER Q_ADDON_JSONDB_BEGIN_NAMESPACE struct name; Q_ADDON_JSONDB_END_NAMESPACE \ using Q_ADDON_JSONDB_PREPEND_NAMESPACE(name); -QT_END_HEADER - #endif // JSONDB_GLOBAL_H diff --git a/src/client/jsondb-notification.cpp b/src/client/jsondb-notification.cpp index 2d98f586..10202d8f 100644 --- a/src/client/jsondb-notification.cpp +++ b/src/client/jsondb-notification.cpp @@ -42,7 +42,7 @@ #include "jsondb-notification.h" #include "jsondb-client.h" -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE /*! \class QtAddOn::JsonDb::JsonDbNotification @@ -91,4 +91,4 @@ quint32 JsonDbNotification::stateNumber() const return mStateNumber; } -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE diff --git a/src/client/jsondb-notification.h b/src/client/jsondb-notification.h index 7923c52e..35e1d6e2 100644 --- a/src/client/jsondb-notification.h +++ b/src/client/jsondb-notification.h @@ -49,7 +49,7 @@ QT_BEGIN_HEADER -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE class Q_ADDON_JSONDB_EXPORT JsonDbNotification { @@ -68,6 +68,8 @@ protected: void *reserved; }; -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE + +QT_END_HEADER #endif // JSONDB_NOTIFICATION_H diff --git a/src/client/jsondb-oneshot.cpp b/src/client/jsondb-oneshot.cpp index 4857ab77..f8e03a53 100644 --- a/src/client/jsondb-oneshot.cpp +++ b/src/client/jsondb-oneshot.cpp @@ -41,6 +41,8 @@ #include "jsondb-oneshot_p.h" -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE -} } // end namespace QtAddOn::JsonDb +#include "moc_jsondb-oneshot_p.cpp" + +QT_ADDON_JSONDB_END_NAMESPACE diff --git a/src/client/jsondb-oneshot_p.h b/src/client/jsondb-oneshot_p.h index 9bbfc587..551c377e 100644 --- a/src/client/jsondb-oneshot_p.h +++ b/src/client/jsondb-oneshot_p.h @@ -52,7 +52,7 @@ #include "jsondb-global.h" -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE /*! \internal @@ -76,6 +76,6 @@ private: int mId; }; -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE #endif // JSONDB_ONESHOT_P_H diff --git a/src/client/jsondb-query.cpp b/src/client/jsondb-query.cpp index ec498c1d..faa70976 100644 --- a/src/client/jsondb-query.cpp +++ b/src/client/jsondb-query.cpp @@ -43,7 +43,7 @@ #include "jsondb-client.h" #include "jsondb-strings_p.h" -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE /*! \class QtAddOn::JsonDb::JsonDbResultBase @@ -201,7 +201,7 @@ void JsonDbResultBase::start() \code #include <jsondb-client.h> - Q_USE_JSONDB_NAMESPACE + QT_ADDON_JSONDB_USE_NAMESPACE class QueryHandler : public QObject { @@ -709,4 +709,4 @@ void JsonDbChangesSince::start() #include "moc_jsondb-query.cpp" -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE diff --git a/src/client/jsondb-query.h b/src/client/jsondb-query.h index 05cd5d6e..57c9c544 100644 --- a/src/client/jsondb-query.h +++ b/src/client/jsondb-query.h @@ -53,7 +53,7 @@ QT_BEGIN_HEADER -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE class JsonDbClient; class JsonDbResultBasePrivate; @@ -203,7 +203,7 @@ private: friend class JsonDbClient; }; -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE QT_END_HEADER diff --git a/src/client/jsondb-strings_p.h b/src/client/jsondb-strings_p.h index fefce17b..19e0f04a 100644 --- a/src/client/jsondb-strings_p.h +++ b/src/client/jsondb-strings_p.h @@ -45,7 +45,7 @@ #include <QString> #include "jsondb-global.h" -Q_ADDON_JSONDB_BEGIN_NAMESPACE +QT_ADDON_JSONDB_BEGIN_NAMESPACE class Q_ADDON_JSONDB_EXPORT JsonDbString { public: @@ -106,6 +106,6 @@ public: static const QString kEphemeralPartitionName; }; -Q_ADDON_JSONDB_END_NAMESPACE +QT_ADDON_JSONDB_END_NAMESPACE #endif /* JSONDB-STRINGS_H */ diff --git a/src/common/jsondb-strings.cpp b/src/common/jsondb-strings.cpp index 1996d3a6..8d99ef8c 100644 --- a/src/common/jsondb-strings.cpp +++ b/src/common/jsondb-strings.cpp @@ -41,7 +41,7 @@ #include "jsondb-strings.h" -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE const QString JsonDbString::kUuidStr = QString::fromLatin1("_uuid"); const QString JsonDbString::kVersionStr = QString::fromLatin1("_version"); @@ -100,4 +100,4 @@ const QString JsonDbString::kPartitionStr = QString::fromLatin1("partition"); const QString JsonDbString::kSystemPartitionName = QString::fromLatin1("com.nokia.qtjsondb.System"); const QString JsonDbString::kEphemeralPartitionName = QString::fromLatin1("com.nokia.qtjsondb.Ephemeral"); -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE diff --git a/src/common/qsonconversion.cpp b/src/common/qsonconversion.cpp index 5ae684ba..2c72fe23 100644 --- a/src/common/qsonconversion.cpp +++ b/src/common/qsonconversion.cpp @@ -44,7 +44,7 @@ #include <QtJsonDbQson/private/qson_p.h> -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE static QJSValue qsonListToJSValue(const QsonList &list, QJSEngine *engine) { @@ -95,4 +95,4 @@ QsonObject jsValueToQson(const QJSValue &object) return variantToQson(object.toVariant()); } -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE diff --git a/src/common/qsonconversion.h b/src/common/qsonconversion.h index d73cc524..33c9705a 100644 --- a/src/common/qsonconversion.h +++ b/src/common/qsonconversion.h @@ -47,12 +47,12 @@ QT_BEGIN_HEADER -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE QJSValue qsonToJSValue(const QsonObject &object, QJSEngine *engine); QsonObject jsValueToQson(const QJSValue &object); -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE QT_END_HEADER diff --git a/src/common/qsonstream.cpp b/src/common/qsonstream.cpp index 8393410b..3096e8bb 100644 --- a/src/common/qsonstream.cpp +++ b/src/common/qsonstream.cpp @@ -52,7 +52,7 @@ #include <QCoreApplication> #endif -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE QsonStream::QsonStream(QIODevice *device, QObject *parent) : QObject(parent), @@ -152,4 +152,6 @@ QsonStream& operator<<(QsonStream& s, const QsonObject& map) return s; } -} } // end namespace QtAddOn::JsonDb +#include "moc_qsonstream.cpp" + +QT_ADDON_JSONDB_END_NAMESPACE diff --git a/src/common/qsonstream.h b/src/common/qsonstream.h index 70cb1c82..695cac64 100644 --- a/src/common/qsonstream.h +++ b/src/common/qsonstream.h @@ -48,7 +48,7 @@ QT_BEGIN_HEADER -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE class QsonStream : public QObject { @@ -82,7 +82,7 @@ private: QsonStream& operator<<( QsonStream&, const QsonObject& ); -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE QT_END_HEADER diff --git a/src/daemon/dbserver.cpp b/src/daemon/dbserver.cpp index 98e2edc1..7d049cc5 100644 --- a/src/daemon/dbserver.cpp +++ b/src/daemon/dbserver.cpp @@ -55,7 +55,7 @@ #include <sys/socket.h> #endif -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE #ifndef QT_NO_DEBUG_OUTPUT extern bool gDebug; @@ -624,4 +624,6 @@ void DBServer::removeConnection() } } -} } // end namespace QtAddOn::JsonDb +#include "moc_dbserver.cpp" + +QT_ADDON_JSONDB_END_NAMESPACE diff --git a/src/daemon/dbserver.h b/src/daemon/dbserver.h index e03b93f6..048b5bfc 100644 --- a/src/daemon/dbserver.h +++ b/src/daemon/dbserver.h @@ -52,11 +52,13 @@ QT_BEGIN_HEADER +QT_BEGIN_NAMESPACE class QIODevice; class QLocalServer; class QTcpServer; +QT_END_NAMESPACE -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE class DBServer : public QObject { @@ -109,7 +111,7 @@ private: QString mFileName; }; -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE QT_END_HEADER diff --git a/src/daemon/jsondb-map-reduce.cpp b/src/daemon/jsondb-map-reduce.cpp index c2d3af93..b480743a 100644 --- a/src/daemon/jsondb-map-reduce.cpp +++ b/src/daemon/jsondb-map-reduce.cpp @@ -63,7 +63,7 @@ #include "jsondb-proxy.h" #include "objecttable.h" -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE void JsonDb::initMap(const QString &partition) { @@ -801,5 +801,6 @@ void JsonDbReduceDefinition::setError(const QString &errorMsg) } } +#include "moc_jsondb-map-reduce.cpp" -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE diff --git a/src/daemon/jsondb-map-reduce.h b/src/daemon/jsondb-map-reduce.h index 174eda5e..ef168bd8 100644 --- a/src/daemon/jsondb-map-reduce.h +++ b/src/daemon/jsondb-map-reduce.h @@ -49,7 +49,7 @@ QT_BEGIN_HEADER -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE class JsonDb; class JsonDbOwner; @@ -135,7 +135,7 @@ private: QString mSourceKeyName; }; -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE QT_END_HEADER diff --git a/src/daemon/jsondb-owner.cpp b/src/daemon/jsondb-owner.cpp index 70cd68af..5581a767 100644 --- a/src/daemon/jsondb-owner.cpp +++ b/src/daemon/jsondb-owner.cpp @@ -44,7 +44,7 @@ #include "jsondb-strings.h" #include <qdebug.h> -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE bool gEnforceAccessControlPolicies = false; @@ -120,4 +120,6 @@ bool JsonDbOwner::isAllowed (QsonObject &object, const QString &op) const return false; } -} } // end namespace QtAddOn::JsonDb +#include "moc_jsondb-owner.cpp" + +QT_ADDON_JSONDB_END_NAMESPACE diff --git a/src/daemon/jsondb-owner.h b/src/daemon/jsondb-owner.h index 0c4f0b15..06151bd1 100644 --- a/src/daemon/jsondb-owner.h +++ b/src/daemon/jsondb-owner.h @@ -56,7 +56,7 @@ QT_BEGIN_HEADER class TestJsonDb; -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE extern bool gEnforceAccessControlPolicies; @@ -93,7 +93,7 @@ private: friend class ::TestJsonDb; }; -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE QT_END_HEADER diff --git a/src/daemon/jsondb-proxy.cpp b/src/daemon/jsondb-proxy.cpp index 1e91e365..e8c9f6dd 100644 --- a/src/daemon/jsondb-proxy.cpp +++ b/src/daemon/jsondb-proxy.cpp @@ -42,7 +42,7 @@ #include "jsondb-proxy.h" #include "jsondb-strings.h" -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE extern bool gDebug; @@ -192,4 +192,6 @@ void Console::debug(const QString &s) qDebug() << s; } -} } // end namespace QtAddOn::JsonDb +#include "moc_jsondb-proxy.cpp" + +QT_ADDON_JSONDB_END_NAMESPACE diff --git a/src/daemon/jsondb-proxy.h b/src/daemon/jsondb-proxy.h index b88038d9..43fb11f3 100644 --- a/src/daemon/jsondb-proxy.h +++ b/src/daemon/jsondb-proxy.h @@ -50,7 +50,7 @@ QT_BEGIN_HEADER -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE class JsonDbProxy : public QObject { Q_OBJECT @@ -124,7 +124,7 @@ public: Q_SCRIPTABLE void debug(const QString &string); }; -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE QT_END_HEADER diff --git a/src/daemon/jsondb-response.cpp b/src/daemon/jsondb-response.cpp index b2012e90..9928fd8e 100644 --- a/src/daemon/jsondb-response.cpp +++ b/src/daemon/jsondb-response.cpp @@ -47,7 +47,7 @@ #include "jsondb-response.h" #include "jsondb-strings.h" -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE extern bool gVerbose; @@ -115,4 +115,4 @@ bool JsonDbResponse::responseIsError(QsonMap responseMap) && !responseMap.isNull(JsonDbString::kErrorStr); } -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE diff --git a/src/daemon/jsondb-response.h b/src/daemon/jsondb-response.h index 726c819b..8e483865 100644 --- a/src/daemon/jsondb-response.h +++ b/src/daemon/jsondb-response.h @@ -46,7 +46,7 @@ QT_BEGIN_HEADER -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE class QsonMap; @@ -60,7 +60,7 @@ struct JsonDbResponse { static bool responseIsError(QsonMap responseMap); }; -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE QT_END_HEADER diff --git a/src/daemon/jsondb.cpp b/src/daemon/jsondb.cpp index c649fb91..0ab11398 100644 --- a/src/daemon/jsondb.cpp +++ b/src/daemon/jsondb.cpp @@ -77,7 +77,7 @@ #include "aodb.h" -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE bool gUseQsonInDb = true; bool gUseJsonInDb = false; @@ -1876,4 +1876,6 @@ QsonMap JsonDb::createPartition(const QsonMap &object) return result; } -} } // end namespace QtAddOn::JsonDb +#include "moc_jsondb.cpp" + +QT_ADDON_JSONDB_END_NAMESPACE diff --git a/src/daemon/jsondb.h b/src/daemon/jsondb.h index f923cc6a..515cf0b3 100644 --- a/src/daemon/jsondb.h +++ b/src/daemon/jsondb.h @@ -62,7 +62,7 @@ QT_BEGIN_HEADER class TestJsonDb; class AoDb; -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE extern bool gValidateSchemas; extern bool gRejectStaleUpdates; @@ -228,7 +228,7 @@ protected: friend class ObjectTable; }; -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE QT_END_HEADER diff --git a/src/daemon/jsondbbtreestorage.cpp b/src/daemon/jsondbbtreestorage.cpp index 6180daa4..bad1ddcf 100644 --- a/src/daemon/jsondbbtreestorage.cpp +++ b/src/daemon/jsondbbtreestorage.cpp @@ -69,7 +69,7 @@ #include "jsondbindex.h" #include "objecttable.h" -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE //#define QT_NO_DEBUG_OUTPUT #ifndef QT_NO_DEBUG_OUTPUT @@ -1855,4 +1855,6 @@ bool WithTransaction::addObjectTable(ObjectTable *table) return true; } -} } // end namespace QtAddOn::JsonDb +#include "moc_jsondbbtreestorage.cpp" + +QT_ADDON_JSONDB_END_NAMESPACE diff --git a/src/daemon/jsondbbtreestorage.h b/src/daemon/jsondbbtreestorage.h index 395d1413..ed6ccd8e 100644 --- a/src/daemon/jsondbbtreestorage.h +++ b/src/daemon/jsondbbtreestorage.h @@ -60,7 +60,7 @@ class TestJsonDb; class AoDb; class AoDbCursor; -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE class JsonDbOwner; class ObjectTable; @@ -300,7 +300,7 @@ void forwardValueSplit(const QByteArray &forwardValue, ObjectKey &objectKey); QDebug &operator<<(QDebug &, const ObjectKey &); -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE QT_END_HEADER diff --git a/src/daemon/jsondbephemeralstorage.cpp b/src/daemon/jsondbephemeralstorage.cpp index 016aaafc..85ebfb1b 100644 --- a/src/daemon/jsondbephemeralstorage.cpp +++ b/src/daemon/jsondbephemeralstorage.cpp @@ -46,7 +46,7 @@ #include "jsondb-response.h" #include "jsondb-strings.h" -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE JsonDbEphemeralStorage::JsonDbEphemeralStorage(QObject *parent) : QObject(parent) @@ -148,4 +148,6 @@ QsonMap JsonDbEphemeralStorage::query(const JsonDbQuery &query, int limit, int o return JsonDbResponse::makeResponse(map); } -} } // end namespace QtAddOn::JsonDb +#include "moc_jsondbephemeralstorage.cpp" + +QT_ADDON_JSONDB_END_NAMESPACE diff --git a/src/daemon/jsondbephemeralstorage.h b/src/daemon/jsondbephemeralstorage.h index b5ee6aef..f6b0e5b2 100644 --- a/src/daemon/jsondbephemeralstorage.h +++ b/src/daemon/jsondbephemeralstorage.h @@ -49,7 +49,7 @@ QT_BEGIN_HEADER -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE class JsonDbQuery; @@ -72,7 +72,7 @@ private: ObjectMap mObjects; }; -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE QT_END_HEADER diff --git a/src/daemon/jsondbindex.cpp b/src/daemon/jsondbindex.cpp index 141d0ee8..7796ef2c 100644 --- a/src/daemon/jsondbindex.cpp +++ b/src/daemon/jsondbindex.cpp @@ -52,7 +52,7 @@ #include "jsondbindex.h" #include "qsonconversion.h" -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE static bool debugIndexObject = false; @@ -364,4 +364,6 @@ bool JsonDbIndexCursor::prev() return mCursor.prev(); } -} } // end namespace QtAddOn::JsonDb +#include "moc_jsondbindex.cpp" + +QT_ADDON_JSONDB_END_NAMESPACE diff --git a/src/daemon/jsondbindex.h b/src/daemon/jsondbindex.h index 2ecb938c..f81ab1a0 100644 --- a/src/daemon/jsondbindex.h +++ b/src/daemon/jsondbindex.h @@ -57,7 +57,7 @@ QT_BEGIN_HEADER class Bdb; class AoDb; -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE class JsonDbBtreeStorage; @@ -140,7 +140,7 @@ public: QPointer<JsonDbIndex> index; }; -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE QT_END_HEADER diff --git a/src/daemon/jsondbquery.cpp b/src/daemon/jsondbquery.cpp index 78696564..77cc53a0 100644 --- a/src/daemon/jsondbquery.cpp +++ b/src/daemon/jsondbquery.cpp @@ -49,7 +49,7 @@ #include "jsondbbtreestorage.h" #include "jsondbquery.h" -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE #ifndef QT_NO_DEBUG_OUTPUT extern bool gDebug; @@ -658,4 +658,4 @@ OrderTerm::~OrderTerm() { } -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE diff --git a/src/daemon/jsondbquery.h b/src/daemon/jsondbquery.h index dcead4df..f821deac 100644 --- a/src/daemon/jsondbquery.h +++ b/src/daemon/jsondbquery.h @@ -52,7 +52,7 @@ QT_BEGIN_HEADER -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE class JsonDbBtreeStorage; @@ -171,7 +171,7 @@ private: QSet<QString> mMatchedTypes; }; -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE QT_END_HEADER diff --git a/src/daemon/main.cpp b/src/daemon/main.cpp index cb57e1a5..df193570 100644 --- a/src/daemon/main.cpp +++ b/src/daemon/main.cpp @@ -55,13 +55,13 @@ QString progname; -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE extern bool gUseJsonInDb; -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE -Q_USE_JSONDB_NAMESPACE +QT_ADDON_JSONDB_USE_NAMESPACE /***************************************************************************/ diff --git a/src/daemon/notification.cpp b/src/daemon/notification.cpp index 9ce46405..d443de03 100644 --- a/src/daemon/notification.cpp +++ b/src/daemon/notification.cpp @@ -50,7 +50,7 @@ #include "jsondb-strings.h" -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE static QMap<QString,Notification*> sNotificationMap; @@ -79,4 +79,4 @@ Notification::~Notification() } } -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE diff --git a/src/daemon/notification.h b/src/daemon/notification.h index 7deae187..2a9bb570 100644 --- a/src/daemon/notification.h +++ b/src/daemon/notification.h @@ -49,7 +49,7 @@ QT_BEGIN_HEADER -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE class JsonDbOwner; class JsonDbQuery; @@ -77,9 +77,9 @@ private: QString mPartition; }; -} } // end namespace QtAddOn::JsonDb +Q_DECLARE_OPERATORS_FOR_FLAGS(Notification::Actions) -Q_DECLARE_OPERATORS_FOR_FLAGS(QtAddOn::JsonDb::Notification::Actions) +QT_ADDON_JSONDB_END_NAMESPACE QT_END_HEADER diff --git a/src/daemon/objectkey.h b/src/daemon/objectkey.h index 97546411..4b976d00 100644 --- a/src/daemon/objectkey.h +++ b/src/daemon/objectkey.h @@ -51,7 +51,7 @@ QT_BEGIN_HEADER -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE class ObjectKey { @@ -80,21 +80,25 @@ inline QDebug &operator<<(QDebug &qdb, const ObjectKey &objectKey) return qdb; } -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE -template <> inline void qToBigEndian(QtAddOn::JsonDb::ObjectKey src, uchar *dest) +QT_BEGIN_NAMESPACE + +template <> inline void qToBigEndian(QT_ADDON_JSONDB_PREPEND_NAMESPACE(ObjectKey) src, uchar *dest) { //TODO: improve me QByteArray key = src.key.toRfc4122(); memcpy(dest, key.constData(), key.size()); } -template <> inline QtAddOn::JsonDb::ObjectKey qFromBigEndian(const uchar *src) +template <> inline QT_ADDON_JSONDB_PREPEND_NAMESPACE(ObjectKey) qFromBigEndian(const uchar *src) { - QtAddOn::JsonDb::ObjectKey key; + QT_ADDON_JSONDB_PREPEND_NAMESPACE(ObjectKey) key; key.key = QUuid::fromRfc4122(QByteArray::fromRawData((const char *)src, 16)); return key; } +QT_END_NAMESPACE + QT_END_HEADER #endif // OBJECT_KEY_H diff --git a/src/daemon/objecttable.cpp b/src/daemon/objecttable.cpp index cff1e64a..d2cf7cb1 100644 --- a/src/daemon/objecttable.cpp +++ b/src/daemon/objecttable.cpp @@ -52,7 +52,7 @@ #include "jsondbindex.h" #include "jsondb-strings.h" -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE #ifndef QT_NO_DEBUG_OUTPUT extern bool gDebug; @@ -599,4 +599,6 @@ QsonMap ObjectTable::changesSince(quint32 stateNumber, const QSet<QString> &limi return JsonDb::makeResponse(resultmap, errormap); } -} } // end namespace QtAddOn::JsonDb +#include "moc_objecttable.cpp" + +QT_ADDON_JSONDB_END_NAMESPACE diff --git a/src/daemon/objecttable.h b/src/daemon/objecttable.h index b29ab47b..41f6ca8b 100644 --- a/src/daemon/objecttable.h +++ b/src/daemon/objecttable.h @@ -58,7 +58,7 @@ QT_BEGIN_HEADER class AoDb; -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE class IndexSpec; class JsonDbBtreeStorage; @@ -159,7 +159,7 @@ void makeStateKey(QByteArray &baStateKey, quint32 stateNumber); bool isStateKey(const QByteArray &baStateKey); -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE QT_END_HEADER diff --git a/src/daemon/qsonobjecttypes_impl_p.h b/src/daemon/qsonobjecttypes_impl_p.h index 48ff3c73..4515bb3f 100644 --- a/src/daemon/qsonobjecttypes_impl_p.h +++ b/src/daemon/qsonobjecttypes_impl_p.h @@ -46,7 +46,7 @@ #include "qsonobjecttypes_p.h" #include "schemamanager_p.h" -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE inline QsonObjectTypes::ValueList::ValueList(const QsonList list) : QsonList(list) {} @@ -330,6 +330,6 @@ inline SchemaValidation::Schema<QsonObjectTypes> QsonObjectTypes::Service::loadS return m_schemas->schema(schemaName, this); } -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE #endif // QSONOBJECTTYPES_IMPL_P_H diff --git a/src/daemon/qsonobjecttypes_p.h b/src/daemon/qsonobjecttypes_p.h index f6818f9b..077c4757 100644 --- a/src/daemon/qsonobjecttypes_p.h +++ b/src/daemon/qsonobjecttypes_p.h @@ -53,7 +53,7 @@ #include <QPair> -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE class SchemaManager; @@ -172,6 +172,6 @@ public: }; }; -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE #endif // QSONOBJECTTYPES_P_H diff --git a/src/daemon/schemamanager_impl_p.h b/src/daemon/schemamanager_impl_p.h index 81f87e13..b6142361 100644 --- a/src/daemon/schemamanager_impl_p.h +++ b/src/daemon/schemamanager_impl_p.h @@ -45,7 +45,7 @@ #include "schemamanager_p.h" #include "schema-validation/object.h" -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE bool SchemaManager::contains(const QString &name) const { @@ -103,6 +103,6 @@ inline QsonMap SchemaManager::validate(const QString &schemaName, QsonMap object return callbacks.error(); } -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE #endif // SCHEMAMANAGER_IMPL_P_H diff --git a/src/daemon/schemamanager_p.h b/src/daemon/schemamanager_p.h index 8a08839e..362d854b 100644 --- a/src/daemon/schemamanager_p.h +++ b/src/daemon/schemamanager_p.h @@ -53,7 +53,7 @@ #include "schema-validation/object.h" #include "qsonobjecttypes_p.h" -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE //FIXME This can have better performance class SchemaManager @@ -74,6 +74,6 @@ private: QMap<QString, QsonMapSchemaPair> m_schemas; }; -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE #endif // SCHEMAMANAGER_P_H diff --git a/src/daemon/signals.h b/src/daemon/signals.h index e77396c0..28bc5654 100644 --- a/src/daemon/signals.h +++ b/src/daemon/signals.h @@ -46,7 +46,9 @@ QT_BEGIN_HEADER +QT_BEGIN_NAMESPACE class QSocketNotifier; +QT_END_NAMESPACE class Signals : public QObject { diff --git a/src/imports/jsondb-listmodel/jsondb-component.h b/src/imports/jsondb-listmodel/jsondb-component.h index 757a0bdb..f6b17af3 100644 --- a/src/imports/jsondb-listmodel/jsondb-component.h +++ b/src/imports/jsondb-listmodel/jsondb-component.h @@ -53,7 +53,7 @@ class JsonDbComponent; class JsonDbNotificationHandle; -Q_USE_JSONDB_NAMESPACE +QT_ADDON_JSONDB_USE_NAMESPACE class JsonDbNotificationComponent: public QObject { diff --git a/src/imports/jsondb-listmodel/jsondb-listmodel.h b/src/imports/jsondb-listmodel/jsondb-listmodel.h index 692a0cab..c7110bf2 100644 --- a/src/imports/jsondb-listmodel/jsondb-listmodel.h +++ b/src/imports/jsondb-listmodel/jsondb-listmodel.h @@ -54,12 +54,12 @@ #include "jsondb-global.h" -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE class QsonObject; class QsonMap; -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE -Q_USE_JSONDB_NAMESPACE +QT_ADDON_JSONDB_USE_NAMESPACE class JsonDbSortKeyPrivate; class JsonDbSortKey { diff --git a/src/imports/jsondb-listmodel/jsondb-listmodel_p.h b/src/imports/jsondb-listmodel/jsondb-listmodel_p.h index 3401ffef..ce26c6bf 100644 --- a/src/imports/jsondb-listmodel/jsondb-listmodel_p.h +++ b/src/imports/jsondb-listmodel/jsondb-listmodel_p.h @@ -53,7 +53,7 @@ #include <QtJsonDbQson/private/qson_p.h> -Q_USE_JSONDB_NAMESPACE +QT_ADDON_JSONDB_USE_NAMESPACE struct CallbackInfo { int index; diff --git a/src/imports/jsondb/jsondatabase.h b/src/imports/jsondb/jsondatabase.h index b260e064..787c988f 100644 --- a/src/imports/jsondb/jsondatabase.h +++ b/src/imports/jsondb/jsondatabase.h @@ -49,7 +49,7 @@ class JsonDbPartition; -Q_USE_JSONDB_NAMESPACE +QT_ADDON_JSONDB_USE_NAMESPACE class JsonDatabase : public QObject { diff --git a/src/imports/jsondb/jsondbchangessinceobject.cpp b/src/imports/jsondb/jsondbchangessinceobject.cpp index 1021186e..eecb0c7c 100644 --- a/src/imports/jsondb/jsondbchangessinceobject.cpp +++ b/src/imports/jsondb/jsondbchangessinceobject.cpp @@ -44,7 +44,7 @@ #include "private/jsondb-strings_p.h" #include <qdebug.h> -Q_USE_JSONDB_NAMESPACE +QT_ADDON_JSONDB_USE_NAMESPACE /*! \qmlclass ChangesSince diff --git a/src/imports/jsondb/jsondbchangessinceobject.h b/src/imports/jsondb/jsondbchangessinceobject.h index 165d6895..ccfb7f12 100644 --- a/src/imports/jsondb/jsondbchangessinceobject.h +++ b/src/imports/jsondb/jsondbchangessinceobject.h @@ -53,7 +53,7 @@ class JsonDbPartition; class JsonDbPartitionPrivate; -Q_USE_JSONDB_NAMESPACE +QT_ADDON_JSONDB_USE_NAMESPACE class JsonDbChangesSinceObject : public QObject, public QDeclarativeParserStatus { diff --git a/src/imports/jsondb/jsondblistmodel.h b/src/imports/jsondb/jsondblistmodel.h index ec537e0d..6f3c2207 100644 --- a/src/imports/jsondb/jsondblistmodel.h +++ b/src/imports/jsondb/jsondblistmodel.h @@ -55,12 +55,12 @@ #include "jsondb-global.h" #include "jsondbpartition.h" -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE class QsonObject; class QsonMap; -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE -Q_USE_JSONDB_NAMESPACE +QT_ADDON_JSONDB_USE_NAMESPACE class JsonDbSortKeyPrivate; class JsonDbSortKey { diff --git a/src/imports/jsondb/jsondblistmodel_p.h b/src/imports/jsondb/jsondblistmodel_p.h index a53bd70a..5da13607 100644 --- a/src/imports/jsondb/jsondblistmodel_p.h +++ b/src/imports/jsondb/jsondblistmodel_p.h @@ -54,7 +54,7 @@ #include <QtJsonDbQson/private/qson_p.h> -Q_USE_JSONDB_NAMESPACE +QT_ADDON_JSONDB_USE_NAMESPACE struct CallbackInfo { int index; diff --git a/src/imports/jsondb/jsondbnotification.cpp b/src/imports/jsondb/jsondbnotification.cpp index 6e76da70..5b22dbd9 100644 --- a/src/imports/jsondb/jsondbnotification.cpp +++ b/src/imports/jsondb/jsondbnotification.cpp @@ -45,7 +45,7 @@ #include "plugin.h" #include <qdebug.h> -Q_USE_JSONDB_NAMESPACE +QT_ADDON_JSONDB_USE_NAMESPACE /*! \qmlclass Notification diff --git a/src/imports/jsondb/jsondbnotification.h b/src/imports/jsondb/jsondbnotification.h index 8807ebd3..cbc44519 100644 --- a/src/imports/jsondb/jsondbnotification.h +++ b/src/imports/jsondb/jsondbnotification.h @@ -50,7 +50,7 @@ #include <QDeclarativeListProperty> #include "jsondb-client.h" -Q_USE_JSONDB_NAMESPACE +QT_ADDON_JSONDB_USE_NAMESPACE class JsonDbPartition; class JsonDbPartitionPrivate; diff --git a/src/imports/jsondb/jsondbpartition.cpp b/src/imports/jsondb/jsondbpartition.cpp index c44ecac1..9dd4e367 100644 --- a/src/imports/jsondb/jsondbpartition.cpp +++ b/src/imports/jsondb/jsondbpartition.cpp @@ -48,8 +48,7 @@ #include "jsondbchangessinceobject.h" #include <qdebug.h> -Q_USE_JSONDB_NAMESPACE - +QT_ADDON_JSONDB_USE_NAMESPACE /*! \qmlclass Partition diff --git a/src/imports/jsondb/jsondbpartition.h b/src/imports/jsondb/jsondbpartition.h index f8ed4659..bb531a86 100644 --- a/src/imports/jsondb/jsondbpartition.h +++ b/src/imports/jsondb/jsondbpartition.h @@ -58,7 +58,7 @@ class JsonDbPartitionPrivate; class JsonDbQueryObject; class JsonDbChangesSinceObject; -Q_USE_JSONDB_NAMESPACE +QT_ADDON_JSONDB_USE_NAMESPACE class JsonDbPartition: public QObject { diff --git a/src/imports/jsondb/jsondbqueryobject.cpp b/src/imports/jsondb/jsondbqueryobject.cpp index fd783b53..d19e54d6 100644 --- a/src/imports/jsondb/jsondbqueryobject.cpp +++ b/src/imports/jsondb/jsondbqueryobject.cpp @@ -44,7 +44,7 @@ #include "private/jsondb-strings_p.h" #include <qdebug.h> -Q_USE_JSONDB_NAMESPACE +QT_ADDON_JSONDB_USE_NAMESPACE /*! \qmlclass Query diff --git a/src/imports/jsondb/jsondbqueryobject.h b/src/imports/jsondb/jsondbqueryobject.h index f28348ba..4836e5d7 100644 --- a/src/imports/jsondb/jsondbqueryobject.h +++ b/src/imports/jsondb/jsondbqueryobject.h @@ -53,7 +53,7 @@ class JsonDbPartition; class JsonDbPartitionPrivate; -Q_USE_JSONDB_NAMESPACE +QT_ADDON_JSONDB_USE_NAMESPACE class JsonDbQueryObject : public QObject, public QDeclarativeParserStatus { diff --git a/src/imports/jsondb/jsondbsortinglistmodel.h b/src/imports/jsondb/jsondbsortinglistmodel.h index 2eaf419c..a6c62d21 100644 --- a/src/imports/jsondb/jsondbsortinglistmodel.h +++ b/src/imports/jsondb/jsondbsortinglistmodel.h @@ -56,10 +56,10 @@ #include "jsondb-global.h" #include "jsondbpartition.h" -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE class QsonObject; class QsonMap; -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE class JsonDbSortingListModelPrivate; class JsonDbPartition; diff --git a/src/imports/jsondb/jsondbsortinglistmodel_p.h b/src/imports/jsondb/jsondbsortinglistmodel_p.h index 8c433d69..6a16b82a 100644 --- a/src/imports/jsondb/jsondbsortinglistmodel_p.h +++ b/src/imports/jsondb/jsondbsortinglistmodel_p.h @@ -53,7 +53,7 @@ #include "jsondb-client.h" #include "private/jsondb-connection_p.h" -Q_USE_JSONDB_NAMESPACE +QT_ADDON_JSONDB_USE_NAMESPACE struct CallbackInfo { int index; diff --git a/src/qson/qson.cpp b/src/qson/qson.cpp index 7f12f27e..35ad6038 100644 --- a/src/qson/qson.cpp +++ b/src/qson/qson.cpp @@ -45,7 +45,7 @@ #include "json.h" -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE static int qsonobjectid = qRegisterMetaType<QsonObject>("QsonObject"); static int qsonmapid = qRegisterMetaType<QsonMap>("QsonMap"); @@ -207,4 +207,4 @@ QsonObject variantToQson(const QVariant &object) return QsonObject(); } -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE diff --git a/src/qson/qson_p.h b/src/qson/qson_p.h index 26c27f60..1814055c 100644 --- a/src/qson/qson_p.h +++ b/src/qson/qson_p.h @@ -51,7 +51,7 @@ #include <QDebug> -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE template <> inline QsonList QsonMap::value(const QString &key) const { return subList(key); } @@ -89,6 +89,6 @@ Q_ADDON_JSONDB_QSON_EXPORT QDebug operator<<(QDebug debug, const QsonObject &obj Q_ADDON_JSONDB_QSON_EXPORT QVariant qsonToVariant(const QsonObject &object); Q_ADDON_JSONDB_QSON_EXPORT QsonObject variantToQson(const QVariant &object); -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE #endif // QSON_H diff --git a/src/qson/qsonelement.cpp b/src/qson/qsonelement.cpp index f2aa3987..582601c4 100644 --- a/src/qson/qsonelement.cpp +++ b/src/qson/qsonelement.cpp @@ -41,7 +41,7 @@ #include "qsonelement_p.h" -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE QsonElement::QsonElement(const QsonContent &body, const QsonEntry &entry) { @@ -108,4 +108,4 @@ void QsonElement::setValue(const QString &value) mBody[0]->writeValue(value); } -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE diff --git a/src/qson/qsonelement_p.h b/src/qson/qsonelement_p.h index 1f36e5fa..10a570d2 100644 --- a/src/qson/qsonelement_p.h +++ b/src/qson/qsonelement_p.h @@ -45,7 +45,7 @@ #include <QtJsonDbQson/qsonglobal.h> #include <QtJsonDbQson/private/qsonobject_p.h> -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE class Q_ADDON_JSONDB_QSON_EXPORT QsonElement : public QsonObject { @@ -100,6 +100,6 @@ template <> inline double QsonElement::value() const template <> inline QString QsonElement::value() const { return mBody.at(0)->readString(0); } -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE #endif // QSONELEMENT_H diff --git a/src/qson/qsonglobal.h b/src/qson/qsonglobal.h index 8283ae9b..47ddc73f 100644 --- a/src/qson/qsonglobal.h +++ b/src/qson/qsonglobal.h @@ -42,6 +42,7 @@ #define QSON_GLOBAL_H #include "qglobal.h" +#include <QtAddOnJsonDb/jsondb-global.h> #if defined(QT_ADDON_JSONDB_QSON_LIB) # define Q_ADDON_JSONDB_QSON_EXPORT Q_DECL_EXPORT diff --git a/src/qson/qsonlist.cpp b/src/qson/qsonlist.cpp index 4f75bd3a..56298733 100644 --- a/src/qson/qsonlist.cpp +++ b/src/qson/qsonlist.cpp @@ -46,7 +46,7 @@ #include <QDebug> -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE /*! \class QtAddOn::JsonDb::QsonList @@ -469,4 +469,4 @@ QsonObject::CachedIndex *QsonList::index() const return &mIndex; } -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE diff --git a/src/qson/qsonlist_p.h b/src/qson/qsonlist_p.h index 785b043c..e9385dce 100644 --- a/src/qson/qsonlist_p.h +++ b/src/qson/qsonlist_p.h @@ -45,7 +45,7 @@ #include <QtJsonDbQson/qsonglobal.h> #include <QtJsonDbQson/private/qsonobject_p.h> -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE class Q_ADDON_JSONDB_QSON_EXPORT QsonList : public QsonObject { @@ -117,6 +117,6 @@ template <> inline QString QsonList::at(int pos) const template <> inline QsonList QsonList::at(int pos) const { return listAt(pos); } -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE #endif // QSONLIST_H diff --git a/src/qson/qsonmap.cpp b/src/qson/qsonmap.cpp index 1f35cd79..60fb354a 100644 --- a/src/qson/qsonmap.cpp +++ b/src/qson/qsonmap.cpp @@ -51,7 +51,7 @@ #include <QDebug> -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE /*! \class QtAddOn::JsonDb::QsonMap @@ -962,4 +962,4 @@ QsonObject::CachedIndex *QsonMap::index() const return &mIndex; } -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE diff --git a/src/qson/qsonmap_p.h b/src/qson/qsonmap_p.h index a388e5ee..daace454 100644 --- a/src/qson/qsonmap_p.h +++ b/src/qson/qsonmap_p.h @@ -52,7 +52,7 @@ #include <QMap> #include <QSet> -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE typedef QMap<QsonVersion, QsonMap> QsonVersionMap; typedef QSet<QsonVersion> QsonVersionSet; @@ -164,6 +164,6 @@ template <> inline QString QsonMap::value(const QString &key) const template <> inline QsonMap QsonMap::value(const QString &key) const { return subObject(key); } -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE #endif // QSONMAP_H diff --git a/src/qson/qsonobject.cpp b/src/qson/qsonobject.cpp index 9a65c910..6031342f 100644 --- a/src/qson/qsonobject.cpp +++ b/src/qson/qsonobject.cpp @@ -45,7 +45,7 @@ #include <QDebug> -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE /*! \class QtAddOn::JsonDb::QsonObject @@ -176,4 +176,4 @@ QByteArray QsonObject::data() const return result; } -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE diff --git a/src/qson/qsonobject_p.h b/src/qson/qsonobject_p.h index 820d58f7..a4542ea8 100644 --- a/src/qson/qsonobject_p.h +++ b/src/qson/qsonobject_p.h @@ -50,7 +50,7 @@ #include <QStringList> #include <QPair> -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE class QsonList; class QsonMap; @@ -271,6 +271,6 @@ protected: friend class QsonStream; }; -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE #endif // QSONOBJECT_H diff --git a/src/qson/qsonpage.cpp b/src/qson/qsonpage.cpp index f69b5d04..6a6ed86f 100644 --- a/src/qson/qsonpage.cpp +++ b/src/qson/qsonpage.cpp @@ -48,7 +48,7 @@ #include <QUuid> #include <qendian.h> -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE QsonPage::QsonPage() : mMaxSize(0) @@ -620,4 +620,4 @@ bool QsonPage::writeString(const QString& string) return true; } -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE diff --git a/src/qson/qsonpage_p.h b/src/qson/qsonpage_p.h index ecfb60d3..40ab955f 100644 --- a/src/qson/qsonpage_p.h +++ b/src/qson/qsonpage_p.h @@ -50,7 +50,7 @@ #include <QSharedData> #include <QUuid> -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE typedef unsigned short qson_size; @@ -172,8 +172,10 @@ private: typedef QSharedDataPointer<QsonPage> QsonPagePtr; typedef QList<QSharedDataPointer<QsonPage> > QsonContent; -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE +QT_BEGIN_NAMESPACE template<> Q_DECLARE_TYPEINFO_BODY(QSharedDataPointer<QtAddOn::JsonDb::QsonPage>, Q_MOVABLE_TYPE); +QT_END_NAMESPACE #endif // QSONPAGE_H diff --git a/src/qson/qsonparser.cpp b/src/qson/qsonparser.cpp index b9ef3e14..e1541ba0 100644 --- a/src/qson/qsonparser.cpp +++ b/src/qson/qsonparser.cpp @@ -43,7 +43,7 @@ #include <QDebug> -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE QsonParser::QsonParser(bool streamMode) : mObjectReady(false) @@ -285,4 +285,4 @@ QsonObject QsonParser::fromRawData(const QByteArray &buffer) return parser.isObjectReady() ? parser.getObject() : QsonObject(); } -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE diff --git a/src/qson/qsonparser_p.h b/src/qson/qsonparser_p.h index 7edc65ba..c9286eeb 100644 --- a/src/qson/qsonparser_p.h +++ b/src/qson/qsonparser_p.h @@ -48,7 +48,7 @@ #include <QList> #include <QByteArray> -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE class Q_ADDON_JSONDB_QSON_EXPORT QsonParser { @@ -105,6 +105,6 @@ private: qint32 mParseOffset; }; -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE #endif // QSONPARSER_H diff --git a/src/qson/qsonstrings.cpp b/src/qson/qsonstrings.cpp index 9c5a752d..55332589 100644 --- a/src/qson/qsonstrings.cpp +++ b/src/qson/qsonstrings.cpp @@ -41,7 +41,7 @@ #include "qsonstrings_p.h" -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE const QString QsonStrings::kUuidStr = QString::fromLatin1("_uuid"); const QString QsonStrings::kLastVersionStr = QString::fromLatin1("_lastVersion"); @@ -55,4 +55,4 @@ const QString QsonStrings::kDeleted = QString::fromLatin1("_deleted"); const QByteArray QsonStrings::kBlankUUID = QByteArray(16, 0); const QByteArray QsonStrings::kQsonMagic = QByteArray("QSON"); -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE diff --git a/src/qson/qsonstrings_p.h b/src/qson/qsonstrings_p.h index 21754e35..6896e8c4 100644 --- a/src/qson/qsonstrings_p.h +++ b/src/qson/qsonstrings_p.h @@ -47,7 +47,7 @@ #include <QString> #include <QByteArray> -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE class Q_ADDON_JSONDB_QSON_EXPORT QsonStrings { public: @@ -64,6 +64,6 @@ class Q_ADDON_JSONDB_QSON_EXPORT QsonStrings { static const QByteArray kQsonMagic; }; -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE #endif // QSONSTRINGS_H diff --git a/src/qson/qsonuuid.cpp b/src/qson/qsonuuid.cpp index 703d0e04..4b920b43 100644 --- a/src/qson/qsonuuid.cpp +++ b/src/qson/qsonuuid.cpp @@ -45,7 +45,7 @@ #include <QByteArray> #include <QCryptographicHash> -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE qson_uuid_t QsonUuidNs = { 0x6ba7b811, @@ -72,4 +72,4 @@ QByteArray QsonUUIDv3(const QString &source) { return result; } -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE diff --git a/src/qson/qsonuuid_p.h b/src/qson/qsonuuid_p.h index e6d16931..3e0030ce 100644 --- a/src/qson/qsonuuid_p.h +++ b/src/qson/qsonuuid_p.h @@ -46,7 +46,7 @@ #include <QCryptographicHash> -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE typedef struct { quint32 time_low; @@ -59,6 +59,6 @@ typedef struct { Q_ADDON_JSONDB_QSON_EXPORT QByteArray QsonUUIDv3(const QString &source); -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE #endif // QSON_UUID_H diff --git a/src/qson/qsonversion.cpp b/src/qson/qsonversion.cpp index 797a66dc..3a22dd7e 100644 --- a/src/qson/qsonversion.cpp +++ b/src/qson/qsonversion.cpp @@ -45,7 +45,7 @@ #include <stdio.h> #include <QStringBuilder> -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE QsonVersion::QsonVersion(const char *data) { @@ -139,4 +139,4 @@ uint qHash(const QsonVersion &version) return qHash(version.content()); } -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE diff --git a/src/qson/qsonversion_p.h b/src/qson/qsonversion_p.h index af736b32..b83c289c 100644 --- a/src/qson/qsonversion_p.h +++ b/src/qson/qsonversion_p.h @@ -47,7 +47,7 @@ #include <QMap> #include <QByteArray> -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE class QsonMap; @@ -82,6 +82,6 @@ private: Q_ADDON_JSONDB_QSON_EXPORT uint qHash(const QsonVersion &version); -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE #endif // QSON_VERSION_H diff --git a/tests/auto/client/test-jsondb-client.cpp b/tests/auto/client/test-jsondb-client.cpp index 5f9388b6..a5d36a38 100644 --- a/tests/auto/client/test-jsondb-client.cpp +++ b/tests/auto/client/test-jsondb-client.cpp @@ -66,7 +66,7 @@ #include "util.h" #include "clientwrapper.h" -Q_USE_JSONDB_NAMESPACE +QT_ADDON_JSONDB_USE_NAMESPACE // #define EXTRA_DEBUG diff --git a/tests/auto/common/test-common.cpp b/tests/auto/common/test-common.cpp index 9412d9d9..759e25b3 100644 --- a/tests/auto/common/test-common.cpp +++ b/tests/auto/common/test-common.cpp @@ -55,7 +55,8 @@ #include <json.h> -using namespace QtAddOn::JsonDb; +QT_ADDON_JSONDB_USE_NAMESPACE +QT_BEGIN_NAMESPACE namespace QTest { template<> @@ -73,6 +74,7 @@ bool qCompare<quint64, unsigned int>(quint64 const &t1, unsigned int const &t2, return QTest::qCompare(t1, (quint64)t2, actual, expected, file, line); } } +QT_END_NAMESPACE class TestCommon: public QObject { diff --git a/tests/auto/daemon/testjsondb.cpp b/tests/auto/daemon/testjsondb.cpp index 2bc1ad3c..8e287a96 100644 --- a/tests/auto/daemon/testjsondb.cpp +++ b/tests/auto/daemon/testjsondb.cpp @@ -66,11 +66,11 @@ #include "../../shared/util.h" -namespace QtAddOn { namespace JsonDb { +QT_ADDON_JSONDB_BEGIN_NAMESPACE extern bool gValidateSchemas; extern bool gDebug; extern bool gVerbose; -} } // end namespace QtAddOn::JsonDb +QT_ADDON_JSONDB_END_NAMESPACE #ifndef QT_NO_DEBUG_OUTPUT #define DBG() if (gDebug) qDebug() @@ -78,7 +78,7 @@ extern bool gVerbose; #define DBG() if (0) qDebug() #endif -Q_USE_JSONDB_NAMESPACE +QT_ADDON_JSONDB_USE_NAMESPACE static QString kContactStr = "com.noklab.nrcc.jsondb.unittest.contact"; diff --git a/tests/auto/jsondb-listmodel/test-jsondb-listmodel.h b/tests/auto/jsondb-listmodel/test-jsondb-listmodel.h index 6a459379..15303671 100644 --- a/tests/auto/jsondb-listmodel/test-jsondb-listmodel.h +++ b/tests/auto/jsondb-listmodel/test-jsondb-listmodel.h @@ -57,10 +57,13 @@ #include "jsondb-listmodel.h" #include "clientwrapper.h" -Q_USE_JSONDB_NAMESPACE - +QT_BEGIN_NAMESPACE class QDeclarativeEngine; class QDeclarativeComponent; +QT_END_NAMESPACE + +QT_ADDON_JSONDB_USE_NAMESPACE + class JsonDbListModel; class ModelData { diff --git a/tests/auto/jsondblistmodel/testjsondblistmodel.h b/tests/auto/jsondblistmodel/testjsondblistmodel.h index 7f5d0fc3..e7c574bf 100644 --- a/tests/auto/jsondblistmodel/testjsondblistmodel.h +++ b/tests/auto/jsondblistmodel/testjsondblistmodel.h @@ -57,10 +57,13 @@ #include <QAbstractItemModel> #include "clientwrapper.h" -Q_USE_JSONDB_NAMESPACE - +QT_BEGIN_NAMESPACE class QDeclarativeEngine; class QDeclarativeComponent; +QT_END_NAMESPACE + +QT_ADDON_JSONDB_USE_NAMESPACE + class JsonDbListModel; class ModelData { diff --git a/tests/auto/jsondbnotification/testjsondbnotification.h b/tests/auto/jsondbnotification/testjsondbnotification.h index 2ef9e0a4..7028f630 100644 --- a/tests/auto/jsondbnotification/testjsondbnotification.h +++ b/tests/auto/jsondbnotification/testjsondbnotification.h @@ -57,10 +57,12 @@ #include <QAbstractItemModel> #include "clientwrapper.h" -Q_USE_JSONDB_NAMESPACE - +QT_BEGIN_NAMESPACE class QDeclarativeEngine; class QDeclarativeComponent; +QT_END_NAMESPACE + +QT_ADDON_JSONDB_USE_NAMESPACE class ComponentData { public: diff --git a/tests/auto/jsondbpartition/testjsondbpartition.h b/tests/auto/jsondbpartition/testjsondbpartition.h index ba9707ec..464477a6 100644 --- a/tests/auto/jsondbpartition/testjsondbpartition.h +++ b/tests/auto/jsondbpartition/testjsondbpartition.h @@ -57,10 +57,13 @@ #include <QAbstractItemModel> #include "clientwrapper.h" -Q_USE_JSONDB_NAMESPACE - +QT_BEGIN_NAMESPACE class QDeclarativeEngine; class QDeclarativeComponent; +QT_END_NAMESPACE + +QT_ADDON_JSONDB_USE_NAMESPACE + class ComponentData { public: diff --git a/tests/auto/jsondbsortinglistmodel/testjsondbsortinglistmodel.h b/tests/auto/jsondbsortinglistmodel/testjsondbsortinglistmodel.h index 5ddd03d1..95f85eed 100644 --- a/tests/auto/jsondbsortinglistmodel/testjsondbsortinglistmodel.h +++ b/tests/auto/jsondbsortinglistmodel/testjsondbsortinglistmodel.h @@ -57,10 +57,13 @@ #include <QAbstractListModel> #include "clientwrapper.h" -Q_USE_JSONDB_NAMESPACE - +QT_BEGIN_NAMESPACE class QDeclarativeEngine; class QDeclarativeComponent; +QT_END_NAMESPACE + +QT_ADDON_JSONDB_USE_NAMESPACE + class JsonDbListModel; class ModelData { diff --git a/tests/auto/qsonstream/test-qsonstream.cpp b/tests/auto/qsonstream/test-qsonstream.cpp index c87bd0bf..97d575b2 100644 --- a/tests/auto/qsonstream/test-qsonstream.cpp +++ b/tests/auto/qsonstream/test-qsonstream.cpp @@ -47,7 +47,7 @@ #include <QDebug> -using namespace QtAddOn::JsonDb; +QT_ADDON_JSONDB_USE_NAMESPACE class TestQsonStream: public QObject { diff --git a/tests/benchmarks/client/client-benchmark.h b/tests/benchmarks/client/client-benchmark.h index bdaa6a6a..3da3327a 100644 --- a/tests/benchmarks/client/client-benchmark.h +++ b/tests/benchmarks/client/client-benchmark.h @@ -56,7 +56,7 @@ #include "clientwrapper.h" -Q_USE_JSONDB_NAMESPACE +QT_ADDON_JSONDB_USE_NAMESPACE class TestJson: public ClientWrapper { diff --git a/tests/benchmarks/daemon/bench_daemon.cpp b/tests/benchmarks/daemon/bench_daemon.cpp index 611905e1..d3440e14 100644 --- a/tests/benchmarks/daemon/bench_daemon.cpp +++ b/tests/benchmarks/daemon/bench_daemon.cpp @@ -60,7 +60,7 @@ #include "../../shared/util.h" -Q_USE_JSONDB_NAMESPACE +QT_ADDON_JSONDB_USE_NAMESPACE Q_DECLARE_METATYPE(QsonList) Q_DECLARE_METATYPE(QsonMap) diff --git a/tests/benchmarks/jsondb-listmodel/listmodel-benchmark.h b/tests/benchmarks/jsondb-listmodel/listmodel-benchmark.h index 66907c81..e02df533 100644 --- a/tests/benchmarks/jsondb-listmodel/listmodel-benchmark.h +++ b/tests/benchmarks/jsondb-listmodel/listmodel-benchmark.h @@ -56,10 +56,12 @@ #include "clientwrapper.h" #include "jsondb-listmodel.h" -Q_USE_JSONDB_NAMESPACE - +QT_BEGIN_NAMESPACE class QDeclarativeEngine; class QDeclarativeComponent; +QT_END_NAMESPACE + +QT_ADDON_JSONDB_USE_NAMESPACE class JsonDbListModel; class ModelData { diff --git a/tests/shared/clientwrapper.h b/tests/shared/clientwrapper.h index 6e4b6524..24b86b4d 100644 --- a/tests/shared/clientwrapper.h +++ b/tests/shared/clientwrapper.h @@ -48,6 +48,8 @@ #include "jsondb-client.h" +QT_ADDON_JSONDB_USE_NAMESPACE + #define waitForResponse(eventloop, result, id_, code, notificationId, count) \ { \ int givenid_ = (id_); \ @@ -117,7 +119,7 @@ public: void connectToServer() { - mClient = new Q_ADDON_JSONDB_PREPEND_NAMESPACE(JsonDbClient)(this); + mClient = new QT_ADDON_JSONDB_PREPEND_NAMESPACE(JsonDbClient)(this); connect(mClient, SIGNAL(response(int,QVariant)), this, SLOT(response(int,QVariant))); connect(mClient, SIGNAL(error(int,int,QString)), @@ -128,7 +130,7 @@ public: bool debug_output; - Q_ADDON_JSONDB_PREPEND_NAMESPACE(JsonDbClient) *mClient; + QT_ADDON_JSONDB_PREPEND_NAMESPACE(JsonDbClient) *mClient; QEventLoop mEventLoop; QString mMessage; @@ -149,9 +151,9 @@ protected slots: mNotificationId = notifyUuid; QString action; switch (notification.action()) { - case Q_ADDON_JSONDB_PREPEND_NAMESPACE(JsonDbClient)::NotifyCreate: action = QLatin1String("create"); break; - case Q_ADDON_JSONDB_PREPEND_NAMESPACE(JsonDbClient)::NotifyUpdate: action = QLatin1String("update"); break; - case Q_ADDON_JSONDB_PREPEND_NAMESPACE(JsonDbClient)::NotifyRemove: action = QLatin1String("remove"); break; + case QT_ADDON_JSONDB_PREPEND_NAMESPACE(JsonDbClient)::NotifyCreate: action = QLatin1String("create"); break; + case QT_ADDON_JSONDB_PREPEND_NAMESPACE(JsonDbClient)::NotifyUpdate: action = QLatin1String("update"); break; + case QT_ADDON_JSONDB_PREPEND_NAMESPACE(JsonDbClient)::NotifyRemove: action = QLatin1String("remove"); break; } mNotifications << Notification(notifyUuid, notification.object(), action); diff --git a/tools/aodbread/main.cpp b/tools/aodbread/main.cpp index 9ccd7279..64ee8309 100644 --- a/tools/aodbread/main.cpp +++ b/tools/aodbread/main.cpp @@ -49,7 +49,7 @@ #include "json.h" -using namespace QtAddOn::JsonDb; +QT_ADDON_JSONDB_USE_NAMESPACE QString printable(const QByteArray &ba) { diff --git a/tools/jsondb-client/client.cpp b/tools/jsondb-client/client.cpp index 795b86aa..70197e02 100644 --- a/tools/jsondb-client/client.cpp +++ b/tools/jsondb-client/client.cpp @@ -54,7 +54,7 @@ #include "client.h" -Q_USE_JSONDB_NAMESPACE +QT_ADDON_JSONDB_USE_NAMESPACE extern bool gDebug; |