From 91afe4f29e55cffc7760347ffd3598f6c7f9c8d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Tue, 30 Jun 2015 23:22:49 +0200 Subject: [PATCH] add guhserver namespace to server --- server/guhcore.cpp | 5 ++++ server/guhcore.h | 7 +++++- server/guhservice.cpp | 4 +++ server/guhservice.h | 4 +++ server/jsonrpc/actionhandler.cpp | 4 +++ server/jsonrpc/actionhandler.h | 4 +++ server/jsonrpc/devicehandler.cpp | 4 +++ server/jsonrpc/devicehandler.h | 4 +++ server/jsonrpc/eventhandler.cpp | 4 +++ server/jsonrpc/eventhandler.h | 4 +++ server/jsonrpc/jsonhandler.cpp | 4 +++ server/jsonrpc/jsonhandler.h | 4 +++ server/jsonrpc/jsonrpcserver.cpp | 4 ++- server/jsonrpc/jsonrpcserver.h | 9 +++++-- server/jsonrpc/jsontypes.cpp | 4 +++ server/jsonrpc/jsontypes.h | 7 ++++-- server/jsonrpc/logginghandler.cpp | 6 ++++- server/jsonrpc/logginghandler.h | 4 +++ server/jsonrpc/ruleshandler.cpp | 4 +++ server/jsonrpc/ruleshandler.h | 4 +++ server/jsonrpc/statehandler.cpp | 4 +++ server/jsonrpc/statehandler.h | 4 +++ server/logging/logengine.cpp | 4 +++ server/logging/logengine.h | 4 +++ server/logging/logentry.cpp | 4 +++ server/logging/logentry.h | 4 +++ server/logging/logfilter.h | 4 +++ server/logging/logging.h | 6 ++++- server/main.cpp | 4 +++ server/qtservice/qtservice.cpp | 31 ++++++++++++------------ server/qtservice/qtservice.h | 7 ++++-- server/qtservice/qtservice_p.h | 4 +++ server/qtservice/qtservice_unix.cpp | 4 +++ server/qtservice/qtservice_win.cpp | 4 ++- server/qtservice/qtunixserversocket.cpp | 4 +++ server/qtservice/qtunixserversocket.h | 3 +++ server/qtservice/qtunixsocket.cpp | 4 +++ server/qtservice/qtunixsocket.h | 3 +++ server/rule.cpp | 4 +++ server/rule.h | 4 +++ server/ruleengine.cpp | 4 +++ server/ruleengine.h | 7 +++++- server/stateevaluator.cpp | 4 ++- server/stateevaluator.h | 4 +++ server/tcpserver.cpp | 4 ++- server/tcpserver.h | 4 +++ tests/auto/actions/testactions.cpp | 3 ++- tests/auto/devices/testdevices.cpp | 4 ++- tests/auto/events/testevents.cpp | 2 ++ tests/auto/guhtestbase.cpp | 4 +++ tests/auto/guhtestbase.h | 5 ++++ tests/auto/jsonrpc/testjsonrpc.cpp | 2 ++ tests/auto/mocktcpserver.cpp | 4 +++ tests/auto/mocktcpserver.h | 4 +++ tests/auto/plugins/testplugins.cpp | 2 ++ tests/auto/rules/testrules.cpp | 2 ++ tests/auto/states/teststates.cpp | 2 ++ tests/auto/versioning/testversioning.cpp | 2 ++ 58 files changed, 236 insertions(+), 31 deletions(-) diff --git a/server/guhcore.cpp b/server/guhcore.cpp index 3823b2f0..7161bbbe 100644 --- a/server/guhcore.cpp +++ b/server/guhcore.cpp @@ -112,6 +112,9 @@ #include "devicemanager.h" #include "plugin/device.h" + +namespace guhserver { + GuhCore* GuhCore::s_instance = 0; /*! Returns a pointer to the single \l{GuhCore} instance. */ @@ -517,3 +520,5 @@ void GuhCore::actionExecutionFinished(const ActionId &id, DeviceManager::DeviceE Action action = m_pendingActions.take(id); m_logger->logAction(action, status == DeviceManager::DeviceErrorNoError ? Logging::LoggingLevelInfo : Logging::LoggingLevelAlert, status); } + +} diff --git a/server/guhcore.h b/server/guhcore.h index 12d04dcb..e41c0beb 100644 --- a/server/guhcore.h +++ b/server/guhcore.h @@ -24,6 +24,8 @@ #include "rule.h" #include "types/event.h" +#include "plugin/device.h" +#include "plugin/deviceplugin.h" #include "plugin/deviceclass.h" #include "plugin/devicedescriptor.h" @@ -33,8 +35,9 @@ #include #include +namespace guhserver { + class JsonRPCServer; -class Device; class LogEngine; class GuhCore : public QObject @@ -131,4 +134,6 @@ private slots: friend class GuhTestBase; }; +} + #endif // GUHCORE_H diff --git a/server/guhservice.cpp b/server/guhservice.cpp index d13455c6..40554a6e 100644 --- a/server/guhservice.cpp +++ b/server/guhservice.cpp @@ -22,6 +22,8 @@ #include "guhservice.h" #include "loggingcategories.h" +namespace guhserver { + GuhService::GuhService(int argc, char **argv): QtService(argc, argv, "guh daemon") { @@ -44,3 +46,5 @@ void GuhService::start() { GuhCore::instance()->setRunningMode(GuhCore::RunningModeService); } + +} diff --git a/server/guhservice.h b/server/guhservice.h index dee27132..8b7b8e6d 100644 --- a/server/guhservice.h +++ b/server/guhservice.h @@ -26,6 +26,8 @@ #include "guhcore.h" +namespace guhserver { + class GuhService : public QtService { @@ -37,4 +39,6 @@ protected: void start(); }; +} + #endif // GUHSERVICE_H diff --git a/server/jsonrpc/actionhandler.cpp b/server/jsonrpc/actionhandler.cpp index 30eb3a0a..e0c1ad70 100644 --- a/server/jsonrpc/actionhandler.cpp +++ b/server/jsonrpc/actionhandler.cpp @@ -28,6 +28,8 @@ #include +namespace guhserver { + ActionHandler::ActionHandler(QObject *parent) : JsonHandler(parent) { @@ -102,3 +104,5 @@ void ActionHandler::actionExecuted(const ActionId &id, DeviceManager::DeviceErro reply->setData(statusToReply(status)); reply->finished(); } + +} diff --git a/server/jsonrpc/actionhandler.h b/server/jsonrpc/actionhandler.h index 11906306..5cc008e6 100644 --- a/server/jsonrpc/actionhandler.h +++ b/server/jsonrpc/actionhandler.h @@ -25,6 +25,8 @@ #include "jsonhandler.h" #include "devicemanager.h" +namespace guhserver { + class ActionHandler : public JsonHandler { Q_OBJECT @@ -44,4 +46,6 @@ private: QHash m_asyncActionExecutions; }; +} + #endif // ACTIONHANDLER_H diff --git a/server/jsonrpc/devicehandler.cpp b/server/jsonrpc/devicehandler.cpp index 1054ad03..06600645 100644 --- a/server/jsonrpc/devicehandler.cpp +++ b/server/jsonrpc/devicehandler.cpp @@ -29,6 +29,8 @@ #include +namespace guhserver { + DeviceHandler::DeviceHandler(QObject *parent) : JsonHandler(parent) { @@ -672,3 +674,5 @@ void DeviceHandler::pairingFinished(const PairingTransactionId &pairingTransacti m_asynDeviceAdditions.insert(deviceId, reply); } + +} diff --git a/server/jsonrpc/devicehandler.h b/server/jsonrpc/devicehandler.h index 5c9c0954..f27c5c3d 100644 --- a/server/jsonrpc/devicehandler.h +++ b/server/jsonrpc/devicehandler.h @@ -25,6 +25,8 @@ #include "jsonhandler.h" #include "devicemanager.h" +namespace guhserver { + class DeviceHandler : public JsonHandler { Q_OBJECT @@ -98,4 +100,6 @@ private: mutable QHash m_asyncPairingRequests; }; +} + #endif // DEVICEHANDLER_H diff --git a/server/jsonrpc/eventhandler.cpp b/server/jsonrpc/eventhandler.cpp index f915b4fe..a4edcd61 100644 --- a/server/jsonrpc/eventhandler.cpp +++ b/server/jsonrpc/eventhandler.cpp @@ -23,6 +23,8 @@ #include "guhcore.h" #include "loggingcategories.h" +namespace guhserver { + EventHandler::EventHandler(QObject *parent) : JsonHandler(parent) { @@ -73,3 +75,5 @@ JsonReply* EventHandler::GetEventType(const QVariantMap ¶ms) const } return createReply(statusToReply(DeviceManager::DeviceErrorEventTypeNotFound)); } + +} diff --git a/server/jsonrpc/eventhandler.h b/server/jsonrpc/eventhandler.h index a62e35ec..4d54f0a1 100644 --- a/server/jsonrpc/eventhandler.h +++ b/server/jsonrpc/eventhandler.h @@ -24,6 +24,8 @@ #include "jsonhandler.h" +namespace guhserver { + class EventHandler : public JsonHandler { Q_OBJECT @@ -39,4 +41,6 @@ private slots: void eventTriggered(const Event &event); }; +} + #endif // EVENTHANDLER_H diff --git a/server/jsonrpc/jsonhandler.cpp b/server/jsonrpc/jsonhandler.cpp index 230b0e64..0dc8fe5e 100644 --- a/server/jsonrpc/jsonhandler.cpp +++ b/server/jsonrpc/jsonhandler.cpp @@ -26,6 +26,8 @@ #include #include +namespace guhserver { + JsonHandler::JsonHandler(QObject *parent) : QObject(parent) { @@ -238,3 +240,5 @@ bool JsonReply::timedOut() const { return m_timedOut; } + +} diff --git a/server/jsonrpc/jsonhandler.h b/server/jsonrpc/jsonhandler.h index 69acede8..c3aec21a 100644 --- a/server/jsonrpc/jsonhandler.h +++ b/server/jsonrpc/jsonhandler.h @@ -29,6 +29,8 @@ #include #include +namespace guhserver { + class JsonHandler; class JsonReply: public QObject @@ -116,4 +118,6 @@ private: QHash m_returns; }; +} + #endif // JSONHANDLER_H diff --git a/server/jsonrpc/jsonrpcserver.cpp b/server/jsonrpc/jsonrpcserver.cpp index 3ab7cc72..1316ebdb 100644 --- a/server/jsonrpc/jsonrpcserver.cpp +++ b/server/jsonrpc/jsonrpcserver.cpp @@ -48,6 +48,8 @@ #include #include +namespace guhserver { + JsonRPCServer::JsonRPCServer(QObject *parent): JsonHandler(parent), #ifdef TESTING_ENABLED @@ -301,4 +303,4 @@ void JsonRPCServer::sendErrorResponse(const QUuid &clientId, int commandId, cons m_tcpServer->sendData(clientId, jsonDoc.toJson()); } - +} diff --git a/server/jsonrpc/jsonrpcserver.h b/server/jsonrpc/jsonrpcserver.h index cd6f46f8..8c5d9c6b 100644 --- a/server/jsonrpc/jsonrpcserver.h +++ b/server/jsonrpc/jsonrpcserver.h @@ -22,6 +22,7 @@ #ifndef JSONRPCSERVER_H #define JSONRPCSERVER_H +#include "plugin/device.h" #include "plugin/deviceclass.h" #include "jsonhandler.h" @@ -32,12 +33,14 @@ #include #include + +namespace guhserver { + #ifdef TESTING_ENABLED class MockTcpServer; #else class TcpServer; #endif -class Device; class JsonRPCServer: public JsonHandler { @@ -88,4 +91,6 @@ private: int m_notificationId; }; -#endif +} + +#endif // JSONRPCSERVER_H diff --git a/server/jsonrpc/jsontypes.cpp b/server/jsonrpc/jsontypes.cpp index b8f76b34..707c988e 100644 --- a/server/jsonrpc/jsontypes.cpp +++ b/server/jsonrpc/jsontypes.cpp @@ -31,6 +31,8 @@ #include #include +namespace guhserver { + bool JsonTypes::s_initialized = false; QString JsonTypes::s_lastError; @@ -1107,3 +1109,5 @@ QPair JsonTypes::validateEnum(const QVariantList &enumDescription return report(enumDescription.contains(value.toString()), QString("Value %1 not allowed in %2").arg(value.toString()).arg(enumStrings.join(", "))); } + +} diff --git a/server/jsonrpc/jsontypes.h b/server/jsonrpc/jsontypes.h index cd079797..339aabca 100644 --- a/server/jsonrpc/jsontypes.h +++ b/server/jsonrpc/jsontypes.h @@ -23,6 +23,8 @@ #define JSONTYPES_H #include "plugin/deviceclass.h" +#include "plugin/device.h" +#include "plugin/deviceplugin.h" #include "plugin/devicedescriptor.h" #include "rule.h" #include "devicemanager.h" @@ -44,8 +46,7 @@ #include #include -class DevicePlugin; -class Device; +namespace guhserver { #define DECLARE_OBJECT(typeName, jsonName) \ public: \ @@ -182,4 +183,6 @@ private: static QString s_lastError; }; +} + #endif // JSONTYPES_H diff --git a/server/jsonrpc/logginghandler.cpp b/server/jsonrpc/logginghandler.cpp index 9d77bd97..19ada5ea 100644 --- a/server/jsonrpc/logginghandler.cpp +++ b/server/jsonrpc/logginghandler.cpp @@ -24,6 +24,8 @@ #include "guhcore.h" #include "loggingcategories.h" +namespace guhserver { + LoggingHandler::LoggingHandler(QObject *parent) : JsonHandler(parent) { @@ -38,7 +40,7 @@ LoggingHandler::LoggingHandler(QObject *parent) : params.clear(); returns.clear(); setDescription("GetLogEntries", "Get the LogEntries matching the given filter."); -// params.insert("eventTypeId", JsonTypes::basicTypeToString(JsonTypes::Uuid)); + // params.insert("eventTypeId", JsonTypes::basicTypeToString(JsonTypes::Uuid)); setParams("GetLogEntries", params); returns.insert("loggingError", JsonTypes::loggingErrorRef()); returns.insert("o:logEntries", QVariantList() << JsonTypes::logEntryRef()); @@ -70,3 +72,5 @@ JsonReply* LoggingHandler::GetLogEntries(const QVariantMap ¶ms) const returns.insert("logEntries", entries); return createReply(returns); } + +} diff --git a/server/jsonrpc/logginghandler.h b/server/jsonrpc/logginghandler.h index 7beff9a5..1af6bbb2 100644 --- a/server/jsonrpc/logginghandler.h +++ b/server/jsonrpc/logginghandler.h @@ -25,6 +25,8 @@ #include "jsonhandler.h" #include "logging/logentry.h" +namespace guhserver { + class LoggingHandler : public JsonHandler { Q_OBJECT @@ -40,4 +42,6 @@ private slots: void logEntryAdded(const LogEntry &entry); }; +} + #endif // LOGGINGHANDLER_H diff --git a/server/jsonrpc/ruleshandler.cpp b/server/jsonrpc/ruleshandler.cpp index 11abbaa5..39db5a01 100644 --- a/server/jsonrpc/ruleshandler.cpp +++ b/server/jsonrpc/ruleshandler.cpp @@ -27,6 +27,8 @@ #include +namespace guhserver { + RulesHandler::RulesHandler(QObject *parent) : JsonHandler(parent) { @@ -511,3 +513,5 @@ void RulesHandler::ruleConfigurationChangedNotification(const Rule &rule) emit RuleConfigurationChanged(params); } + +} diff --git a/server/jsonrpc/ruleshandler.h b/server/jsonrpc/ruleshandler.h index 6b627a2c..e14cd4b5 100644 --- a/server/jsonrpc/ruleshandler.h +++ b/server/jsonrpc/ruleshandler.h @@ -24,6 +24,8 @@ #include "jsonhandler.h" +namespace guhserver { + class RulesHandler : public JsonHandler { Q_OBJECT @@ -68,4 +70,6 @@ private slots: }; +} + #endif // RULESHANDLER_H diff --git a/server/jsonrpc/statehandler.cpp b/server/jsonrpc/statehandler.cpp index af61b9d5..d6897f3b 100644 --- a/server/jsonrpc/statehandler.cpp +++ b/server/jsonrpc/statehandler.cpp @@ -23,6 +23,8 @@ #include "guhcore.h" #include "loggingcategories.h" +namespace guhserver { + StateHandler::StateHandler(QObject *parent) : JsonHandler(parent) { @@ -58,3 +60,5 @@ JsonReply* StateHandler::GetStateType(const QVariantMap ¶ms) const } return createReply(statusToReply(DeviceManager::DeviceErrorStateTypeNotFound)); } + +} diff --git a/server/jsonrpc/statehandler.h b/server/jsonrpc/statehandler.h index 0f975a5d..a9bebf97 100644 --- a/server/jsonrpc/statehandler.h +++ b/server/jsonrpc/statehandler.h @@ -24,6 +24,8 @@ #include "jsonhandler.h" +namespace guhserver { + class StateHandler : public JsonHandler { Q_OBJECT @@ -34,4 +36,6 @@ public: Q_INVOKABLE JsonReply *GetStateType(const QVariantMap ¶ms) const; }; +} + #endif // EVENTHANDLER_H diff --git a/server/logging/logengine.cpp b/server/logging/logengine.cpp index a5e00a56..abe241ec 100644 --- a/server/logging/logengine.cpp +++ b/server/logging/logengine.cpp @@ -30,6 +30,8 @@ #define DB_SCHEMA_VERSION 1 +namespace guhserver { + LogEngine::LogEngine(QObject *parent): QObject(parent) { @@ -210,3 +212,5 @@ void LogEngine::initDB() } } } + +} diff --git a/server/logging/logengine.h b/server/logging/logengine.h index e40fa1c4..a2da80e5 100644 --- a/server/logging/logengine.h +++ b/server/logging/logengine.h @@ -29,6 +29,8 @@ #include #include +namespace guhserver { + class LogEngine: public QObject { Q_OBJECT @@ -56,4 +58,6 @@ private: QSqlDatabase m_db; }; +} + #endif diff --git a/server/logging/logentry.cpp b/server/logging/logentry.cpp index d22b433c..cabdeebb 100644 --- a/server/logging/logentry.cpp +++ b/server/logging/logentry.cpp @@ -22,6 +22,8 @@ #include +namespace guhserver { + LogEntry::LogEntry(QDateTime timestamp, Logging::LoggingLevel level, Logging::LoggingSource source, int errorCode): m_timestamp(timestamp), m_level(level), @@ -109,3 +111,5 @@ int LogEntry::errorCode() const { return m_errorCode; } + +} diff --git a/server/logging/logentry.h b/server/logging/logentry.h index 51551fd6..aaa7dbd9 100644 --- a/server/logging/logentry.h +++ b/server/logging/logentry.h @@ -27,6 +27,8 @@ #include #include +namespace guhserver { + class LogEntry { Q_GADGET @@ -76,4 +78,6 @@ private: int m_errorCode; }; +} + #endif diff --git a/server/logging/logfilter.h b/server/logging/logfilter.h index 89978009..e76e0d26 100644 --- a/server/logging/logfilter.h +++ b/server/logging/logfilter.h @@ -23,6 +23,8 @@ #include +namespace guhserver { + class LogFilter { QDateTime m_startDate; @@ -30,4 +32,6 @@ class LogFilter }; +} + #endif diff --git a/server/logging/logging.h b/server/logging/logging.h index 2db38c85..a2401890 100644 --- a/server/logging/logging.h +++ b/server/logging/logging.h @@ -23,6 +23,8 @@ #include +namespace guhserver { + class Logging { Q_GADGET @@ -57,4 +59,6 @@ public: }; }; -#endif +} + +#endif // LOGGING_H diff --git a/server/main.cpp b/server/main.cpp index b96bd4f9..bd8763d0 100644 --- a/server/main.cpp +++ b/server/main.cpp @@ -24,14 +24,18 @@ #include #include #include +#include #include #include "guhcore.h" #include "guhservice.h" #include "loggingcategories.h" + QHash s_loggingFilters; +using namespace guhserver; + void loggingCategoryFilter(QLoggingCategory *category) { if (s_loggingFilters.contains(category->categoryName())) { diff --git a/server/qtservice/qtservice.cpp b/server/qtservice/qtservice.cpp index 20c54151..dbfd6f12 100644 --- a/server/qtservice/qtservice.cpp +++ b/server/qtservice/qtservice.cpp @@ -45,6 +45,7 @@ #include #include #include +#include #if defined(QTSERVICE_DEBUG) #include @@ -58,6 +59,7 @@ #include #endif + static QFile* f = 0; static void qtServiceCloseDebugLog() @@ -78,10 +80,10 @@ void qtServiceLogDebug(QtMsgType type, const char* msg) QMutexLocker locker(&mutex); QString s(QTime::currentTime().toString("HH:mm:ss.zzz ")); s += QString("[%1] ").arg( -#if defined(Q_OS_WIN32) - GetCurrentProcessId()); + #if defined(Q_OS_WIN32) + GetCurrentProcessId()); #else - getpid()); + getpid()); #endif if (!f) { @@ -201,6 +203,7 @@ void qtServiceLogDebug(QtMsgType type, const char* msg) \sa startupType() */ +namespace guhserver { /*! @@ -208,7 +211,7 @@ void qtServiceLogDebug(QtMsgType type, const char* msg) \a name. */ QtServiceController::QtServiceController(const QString &name) - : d_ptr(new QtServiceControllerPrivate()) + : d_ptr(new QtServiceControllerPrivate()) { Q_D(QtServiceController); d->q_ptr = this; @@ -303,7 +306,7 @@ QString QtServiceController::serviceName() const \sa uninstall(), start() */ bool QtServiceController::install(const QString &serviceFilePath, const QString &account, - const QString &password) + const QString &password) { QStringList arguments; arguments << QLatin1String("-i"); @@ -636,12 +639,12 @@ QtServiceBase::QtServiceBase(int argc, char **argv, const QString &name) QString nm(name); if (nm.length() > 255) { - qWarning("QtService: 'name' is longer than 255 characters."); - nm.truncate(255); + qWarning("QtService: 'name' is longer than 255 characters."); + nm.truncate(255); } if (nm.contains('\\')) { - qWarning("QtService: 'name' contains backslashes '\\'."); - nm.replace((QChar)'\\', (QChar)'\0'); + qWarning("QtService: 'name' contains backslashes '\\'."); + nm.replace((QChar)'\\', (QChar)'\0'); } d_ptr = new QtServiceBasePrivate(nm); @@ -771,7 +774,7 @@ int QtServiceBase::exec() return -1; } else { printf("The service %s has been installed under: %s\n", - serviceName().toLatin1().constData(), d_ptr->filePath().toLatin1().constData()); + serviceName().toLatin1().constData(), d_ptr->filePath().toLatin1().constData()); } } else { fprintf(stderr, "The service %s is already installed\n", serviceName().toLatin1().constData()); @@ -784,7 +787,7 @@ int QtServiceBase::exec() return -1; } else { printf("The service %s has been uninstalled.\n", - serviceName().toLatin1().constData()); + serviceName().toLatin1().constData()); } } else { fprintf(stderr, "The service %s is not installed\n", serviceName().toLatin1().constData()); @@ -792,7 +795,7 @@ int QtServiceBase::exec() return 0; } else if (a == QLatin1String("-v") || a == QLatin1String("-version")) { printf("The service\n" - "\t%s\n\t%s\n\n", serviceName().toLatin1().constData(), d_ptr->args.at(0).toLatin1().constData()); + "\t%s\n\t%s\n\n", serviceName().toLatin1().constData(), d_ptr->args.at(0).toLatin1().constData()); printf("is %s", (d_ptr->controller.isInstalled() ? "installed" : "not installed")); printf(" and %s\n\n", (d_ptr->controller.isRunning() ? "running" : "not running")); return 0; @@ -1111,6 +1114,4 @@ void QtServiceBase::processCommand(int /*code*/) \reimp */ - - - +} diff --git a/server/qtservice/qtservice.h b/server/qtservice/qtservice.h index 01d5b07f..d3310a91 100644 --- a/server/qtservice/qtservice.h +++ b/server/qtservice/qtservice.h @@ -42,6 +42,7 @@ #define QTSERVICE_H #include +#include #if defined(Q_OS_WIN) # if !defined(QT_QTSERVICE_EXPORT) && !defined(QT_QTSERVICE_IMPORT) @@ -59,7 +60,8 @@ # define QT_QTSERVICE_EXPORT #endif -class QStringList; +namespace guhserver { + class QtServiceControllerPrivate; class QT_QTSERVICE_EXPORT QtServiceController @@ -186,7 +188,8 @@ protected: private: Application *app; }; - Q_DECLARE_OPERATORS_FOR_FLAGS(QtServiceBase::ServiceFlags) +} + #endif // QTSERVICE_H diff --git a/server/qtservice/qtservice_p.h b/server/qtservice/qtservice_p.h index a88992cf..d9363c22 100644 --- a/server/qtservice/qtservice_p.h +++ b/server/qtservice/qtservice_p.h @@ -44,6 +44,8 @@ #include #include "qtservice.h" +namespace guhserver { + class QtServiceControllerPrivate { Q_DECLARE_PUBLIC(QtServiceController) @@ -84,4 +86,6 @@ public: class QtServiceSysPrivate *sysd; }; +} + #endif diff --git a/server/qtservice/qtservice_unix.cpp b/server/qtservice/qtservice_unix.cpp index 40d75c1a..815adfac 100644 --- a/server/qtservice/qtservice_unix.cpp +++ b/server/qtservice/qtservice_unix.cpp @@ -58,6 +58,9 @@ #include #include #include +#include + +namespace guhserver { static QString encodeName(const QString &name, bool allowUpper = false) { @@ -472,3 +475,4 @@ void QtServiceBase::setServiceFlags(QtServiceBase::ServiceFlags flags) d_ptr->sysd->serviceFlags = flags; } +} diff --git a/server/qtservice/qtservice_win.cpp b/server/qtservice/qtservice_win.cpp index f4b8cc90..0218dd9b 100644 --- a/server/qtservice/qtservice_win.cpp +++ b/server/qtservice/qtservice_win.cpp @@ -62,6 +62,8 @@ #include #endif +namespace guhserver { + typedef SERVICE_STATUS_HANDLE(WINAPI*PRegisterServiceCtrlHandler)(const wchar_t*,LPHANDLER_FUNCTION); static PRegisterServiceCtrlHandler pRegisterServiceCtrlHandler = 0; typedef BOOL(WINAPI*PSetServiceStatus)(SERVICE_STATUS_HANDLE,LPSERVICE_STATUS); @@ -942,4 +944,4 @@ void QtServiceBase::setServiceFlags(QtServiceBase::ServiceFlags flags) d_ptr->sysd->setServiceFlags(flags); } - +} diff --git a/server/qtservice/qtunixserversocket.cpp b/server/qtservice/qtunixserversocket.cpp index 0ad9134c..d1dbcee0 100644 --- a/server/qtservice/qtunixserversocket.cpp +++ b/server/qtservice/qtunixserversocket.cpp @@ -45,6 +45,8 @@ #include #include +namespace guhserver { + #ifndef SUN_LEN #define SUN_LEN(ptr) ((size_t)(((struct sockaddr_un *) 0)->sun_path) \ +strlen ((ptr)->sun_path)) @@ -90,3 +92,5 @@ void QtUnixServerSocket::close() path_.clear(); } } + +} diff --git a/server/qtservice/qtunixserversocket.h b/server/qtservice/qtunixserversocket.h index 1fc8b702..7c750555 100644 --- a/server/qtservice/qtunixserversocket.h +++ b/server/qtservice/qtunixserversocket.h @@ -43,6 +43,8 @@ #include +namespace guhserver { + class QtUnixServerSocket : public QTcpServer { Q_OBJECT @@ -57,5 +59,6 @@ private: QString path_; }; +} #endif diff --git a/server/qtservice/qtunixsocket.cpp b/server/qtservice/qtunixsocket.cpp index f6d4c970..9c81d702 100644 --- a/server/qtservice/qtunixsocket.cpp +++ b/server/qtservice/qtunixsocket.cpp @@ -50,6 +50,8 @@ +strlen ((ptr)->sun_path)) #endif +namespace guhserver { + QtUnixSocket::QtUnixSocket(QObject *parent) : QTcpSocket(parent) { @@ -76,3 +78,5 @@ bool QtUnixSocket::connectTo(const QString &path) } return ret; } + +} diff --git a/server/qtservice/qtunixsocket.h b/server/qtservice/qtunixsocket.h index 1d34fba4..4f4eb1db 100644 --- a/server/qtservice/qtunixsocket.h +++ b/server/qtservice/qtunixsocket.h @@ -43,6 +43,8 @@ #include +namespace guhserver { + class QtUnixSocket : public QTcpSocket { Q_OBJECT @@ -52,4 +54,5 @@ public: bool connectTo(const QString &path); }; +} #endif diff --git a/server/rule.cpp b/server/rule.cpp index ecf2a95b..f0874f28 100644 --- a/server/rule.cpp +++ b/server/rule.cpp @@ -36,6 +36,8 @@ #include +namespace guhserver { + /*! Constructs an empty, invalid rule. */ Rule::Rule(): Rule(RuleId(), QString(), QList(), StateEvaluator(), QList(), QList()) @@ -145,3 +147,5 @@ void Rule::setActive(bool active) { m_active = active; } + +} diff --git a/server/rule.h b/server/rule.h index b49cd3d2..a0f73acf 100644 --- a/server/rule.h +++ b/server/rule.h @@ -29,6 +29,8 @@ #include +namespace guhserver { + class Rule { public: @@ -66,4 +68,6 @@ private: bool m_active; }; +} + #endif // RULE_H diff --git a/server/ruleengine.cpp b/server/ruleengine.cpp index d5fc547f..ca10e7d2 100644 --- a/server/ruleengine.cpp +++ b/server/ruleengine.cpp @@ -95,6 +95,8 @@ #include #include +namespace guhserver { + /*! Constructs the RuleEngine with the given \a parent. Although it wouldn't harm to have multiple RuleEngines, there is one instance available from \l{GuhCore}. This one should be used instead of creating multiple ones. */ @@ -629,3 +631,5 @@ void RuleEngine::saveRule(const Rule &rule) } settings.endGroup(); } + +} diff --git a/server/ruleengine.h b/server/ruleengine.h index a0952fc7..5a868bab 100644 --- a/server/ruleengine.h +++ b/server/ruleengine.h @@ -30,6 +30,8 @@ #include #include +namespace guhserver { + class RuleEngine : public QObject { Q_OBJECT @@ -95,6 +97,9 @@ private: QHash m_rules; // ...but use a Hash for faster finding QList m_activeRules; }; -Q_DECLARE_METATYPE(RuleEngine::RuleError) + +} + +Q_DECLARE_METATYPE(guhserver::RuleEngine::RuleError) #endif // RULEENGINE_H diff --git a/server/stateevaluator.cpp b/server/stateevaluator.cpp index 3ddc90f2..5fe8d53d 100644 --- a/server/stateevaluator.cpp +++ b/server/stateevaluator.cpp @@ -24,6 +24,8 @@ #include "devicemanager.h" #include "loggingcategories.h" +namespace guhserver { + StateEvaluator::StateEvaluator(const StateDescriptor &stateDescriptor): m_stateDescriptor(stateDescriptor), m_operatorType(Types::StateOperatorAnd) @@ -171,4 +173,4 @@ StateEvaluator StateEvaluator::loadFromSettings(QSettings &settings, const QStri return ret; } - +} diff --git a/server/stateevaluator.h b/server/stateevaluator.h index e9308719..25b6f77f 100644 --- a/server/stateevaluator.h +++ b/server/stateevaluator.h @@ -28,6 +28,8 @@ #include #include +namespace guhserver { + class StateEvaluator { public: @@ -58,4 +60,6 @@ private: Types::StateOperator m_operatorType; }; +} + #endif // STATEEVALUATOR_H diff --git a/server/tcpserver.cpp b/server/tcpserver.cpp index 5f1c46a3..42ecc513 100644 --- a/server/tcpserver.cpp +++ b/server/tcpserver.cpp @@ -26,6 +26,8 @@ #include #include +namespace guhserver { + TcpServer::TcpServer(QObject *parent) : QObject(parent) { @@ -149,4 +151,4 @@ bool TcpServer::stopServer() return true; } - +} diff --git a/server/tcpserver.h b/server/tcpserver.h index 98b5d25d..c3b204b9 100644 --- a/server/tcpserver.h +++ b/server/tcpserver.h @@ -28,6 +28,8 @@ #include #include +namespace guhserver { + class TcpServer : public QObject { Q_OBJECT @@ -57,4 +59,6 @@ public slots: bool stopServer(); }; +} + #endif // TCPSERVER_H diff --git a/tests/auto/actions/testactions.cpp b/tests/auto/actions/testactions.cpp index f88885af..35e8f3c5 100644 --- a/tests/auto/actions/testactions.cpp +++ b/tests/auto/actions/testactions.cpp @@ -32,6 +32,8 @@ #include #include +using namespace guhserver; + class TestActions: public GuhTestBase { Q_OBJECT @@ -148,6 +150,5 @@ void TestActions::getActionType() } } - #include "testactions.moc" QTEST_MAIN(TestActions) diff --git a/tests/auto/devices/testdevices.cpp b/tests/auto/devices/testdevices.cpp index a9465f61..3daf65b3 100644 --- a/tests/auto/devices/testdevices.cpp +++ b/tests/auto/devices/testdevices.cpp @@ -30,6 +30,8 @@ #include #include +using namespace guhserver; + class TestDevices : public GuhTestBase { Q_OBJECT @@ -885,5 +887,5 @@ void TestDevices::removeDevice() } #include "testdevices.moc" - QTEST_MAIN(TestDevices) + diff --git a/tests/auto/events/testevents.cpp b/tests/auto/events/testevents.cpp index fec7411d..385fff1b 100644 --- a/tests/auto/events/testevents.cpp +++ b/tests/auto/events/testevents.cpp @@ -32,6 +32,8 @@ #include #include +using namespace guhserver; + class TestEvents: public GuhTestBase { Q_OBJECT diff --git a/tests/auto/guhtestbase.cpp b/tests/auto/guhtestbase.cpp index 5fa2ec5e..cd2a7437 100644 --- a/tests/auto/guhtestbase.cpp +++ b/tests/auto/guhtestbase.cpp @@ -34,6 +34,8 @@ #include #include +namespace guhserver { + PluginId mockPluginId = PluginId("727a4a9a-c187-446f-aadf-f1b2220607d1"); VendorId guhVendorId = VendorId("2062d64d-3232-433c-88bc-0d33c0ba2ba6"); DeviceClassId mockDeviceClassId = DeviceClassId("753f0d32-0468-4d08-82ed-1964aab03298"); @@ -193,3 +195,5 @@ void GuhTestBase::restartServer() spy.wait(); m_mockTcpServer = MockTcpServer::servers().first(); } + +} diff --git a/tests/auto/guhtestbase.h b/tests/auto/guhtestbase.h index d3127a14..62dd1679 100644 --- a/tests/auto/guhtestbase.h +++ b/tests/auto/guhtestbase.h @@ -34,6 +34,8 @@ #include #include +namespace guhserver { + extern DeviceClassId mockDeviceClassId; extern DeviceClassId mockDeviceAutoClassId; extern DeviceClassId mockDeviceDiscoveryClassId; @@ -50,6 +52,7 @@ extern EventTypeId mockEvent2Id; extern StateTypeId mockIntStateId; extern StateTypeId mockBoolStateId; + class MockTcpServer; class GuhTestBase : public QObject @@ -136,4 +139,6 @@ protected: QString m_rulesSettings; }; +} + #endif // GUHTESTBASE_H diff --git a/tests/auto/jsonrpc/testjsonrpc.cpp b/tests/auto/jsonrpc/testjsonrpc.cpp index da18e2f2..72c0efc2 100644 --- a/tests/auto/jsonrpc/testjsonrpc.cpp +++ b/tests/auto/jsonrpc/testjsonrpc.cpp @@ -33,6 +33,8 @@ #include #include +using namespace guhserver; + class TestJSONRPC: public GuhTestBase { Q_OBJECT diff --git a/tests/auto/mocktcpserver.cpp b/tests/auto/mocktcpserver.cpp index ccb95aec..fa332283 100644 --- a/tests/auto/mocktcpserver.cpp +++ b/tests/auto/mocktcpserver.cpp @@ -22,6 +22,8 @@ #include +namespace guhserver { + QList MockTcpServer::s_allServers; MockTcpServer::MockTcpServer(QObject *parent): @@ -66,3 +68,5 @@ bool MockTcpServer::stopServer() { return true; } + +} diff --git a/tests/auto/mocktcpserver.h b/tests/auto/mocktcpserver.h index 432093e8..a272fe8f 100644 --- a/tests/auto/mocktcpserver.h +++ b/tests/auto/mocktcpserver.h @@ -25,6 +25,8 @@ #include #include +namespace guhserver { + class MockTcpServer : public QObject { Q_OBJECT @@ -55,5 +57,7 @@ private: static QList s_allServers; }; +} + #endif // TCPSERVER_H diff --git a/tests/auto/plugins/testplugins.cpp b/tests/auto/plugins/testplugins.cpp index 123ef53a..dce38fc7 100644 --- a/tests/auto/plugins/testplugins.cpp +++ b/tests/auto/plugins/testplugins.cpp @@ -32,6 +32,8 @@ #include #include +using namespace guhserver; + class TestPlugins: public GuhTestBase { Q_OBJECT diff --git a/tests/auto/rules/testrules.cpp b/tests/auto/rules/testrules.cpp index 4dd74ace..9d4e6326 100644 --- a/tests/auto/rules/testrules.cpp +++ b/tests/auto/rules/testrules.cpp @@ -32,6 +32,8 @@ #include #include +using namespace guhserver; + class TestRules: public GuhTestBase { Q_OBJECT diff --git a/tests/auto/states/teststates.cpp b/tests/auto/states/teststates.cpp index 8fb310e9..e3e633d7 100644 --- a/tests/auto/states/teststates.cpp +++ b/tests/auto/states/teststates.cpp @@ -32,6 +32,8 @@ #include #include +using namespace guhserver; + class TestStates: public GuhTestBase { Q_OBJECT diff --git a/tests/auto/versioning/testversioning.cpp b/tests/auto/versioning/testversioning.cpp index 51d93865..aefcb76c 100644 --- a/tests/auto/versioning/testversioning.cpp +++ b/tests/auto/versioning/testversioning.cpp @@ -31,6 +31,8 @@ #include #include +using namespace guhserver; + class TestVersioning: public GuhTestBase { Q_OBJECT