Add namespace for common library code

Change-Id: I7e5bc2af8451d4116762fc20f287d91bcc031fdf
Reviewed-by: Sami Littow <sami.littow@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>

28 files changed, 96 insertions, 8 deletions

diff --git a/src/libs/qlicenseservice/clienthandler.cpp b/src/libs/qlicenseservice/clienthandler.cpp
index 1c1c6c9..363cb4e 100644
--- a/src/libs/qlicenseservice/clienthandler.cpp
+++ b/src/libs/qlicenseservice/clienthandler.cpp
@@ -8,6 +8,8 @@
 #include "jsonhandler.h"
 #include "utils.h"
 
+namespace QLicenseService {
+
 bool ClientHandler::checkLicenseExpiryTime(std::string &reply)
 {
     std::cout << "Offline - checking validity from license file " << m_request.licenseFile << std::endl;
@@ -122,3 +124,4 @@ bool ClientHandler::checkLeewayTime(std::string &reply)
     return false;
 }
 
+} // namespace QLicenseService
diff --git a/src/libs/qlicenseservice/commonsetup.h b/src/libs/qlicenseservice/commonsetup.h
index d0f403b..a2ee5ef 100644
--- a/src/libs/qlicenseservice/commonsetup.h
+++ b/src/libs/qlicenseservice/commonsetup.h
@@ -47,6 +47,8 @@
 #define SECS_IN_HOUR            3600
 #define SECS_IN_DAY             86400
 
+namespace QLicenseService {
+
 struct License {
     uint64_t last_timestamp = 0;    //    |
     uint64_t current_timestamp = 0; //    | For internal use only, not in server resp JSON
@@ -116,3 +118,4 @@ struct RequestInfo {
     std::string parentReservationId;    // used by QA-Tools only
 };
 
+} // namespace QLicenseService
diff --git a/src/libs/qlicenseservice/daemon_clients/clienthandler.h b/src/libs/qlicenseservice/daemon_clients/clienthandler.h
index 8d04be8..b591cda 100644
--- a/src/libs/qlicenseservice/daemon_clients/clienthandler.h
+++ b/src/libs/qlicenseservice/daemon_clients/clienthandler.h
@@ -12,6 +12,8 @@
 #include "commonsetup.h"
 #include "licdsetup.h"
 
+namespace QLicenseService {
+
 class ClientHandler
 {
     public:
@@ -62,5 +64,7 @@ static std::map<RequestReply, std::string> replyString {
         {e_bad_connection, "No connection to server. Try again later."}
     };
 
+} // namespace QLicenseService
+
 
 
diff --git a/src/libs/qlicenseservice/daemon_clients/clitoolhandler.h b/src/libs/qlicenseservice/daemon_clients/clitoolhandler.h
index ce3429e..ccd819a 100644
--- a/src/libs/qlicenseservice/daemon_clients/clitoolhandler.h
+++ b/src/libs/qlicenseservice/daemon_clients/clitoolhandler.h
@@ -8,6 +8,8 @@
 #include "jsonhandler.h"
 #include "utils.h"
 
+namespace QLicenseService {
+
 class CliToolHandler : public virtual ClientHandler {
 
     public:
@@ -75,3 +77,5 @@ class CliToolHandler : public virtual ClientHandler {
             return 0;
         }
 };
+
+} // namespace QLicenseService
diff --git a/src/libs/qlicenseservice/daemon_clients/cocohandler.h b/src/libs/qlicenseservice/daemon_clients/cocohandler.h
index 48494e0..66c5150 100644
--- a/src/libs/qlicenseservice/daemon_clients/cocohandler.h
+++ b/src/libs/qlicenseservice/daemon_clients/cocohandler.h
@@ -7,6 +7,8 @@
 #include "clienthandler.h"
 #include "utils.h"
 
+namespace QLicenseService {
+
 class CocoHandler : public ClientHandler {
 
     public:
@@ -28,3 +30,5 @@ class CocoHandler : public ClientHandler {
         };
 
 };
+
+} // namespace QLicenseService
diff --git a/src/libs/qlicenseservice/daemon_clients/mochandler.h b/src/libs/qlicenseservice/daemon_clients/mochandler.h
index acf1228..0a28e99 100644
--- a/src/libs/qlicenseservice/daemon_clients/mochandler.h
+++ b/src/libs/qlicenseservice/daemon_clients/mochandler.h
@@ -8,6 +8,8 @@
 #include "jsonhandler.h"
 #include "utils.h"
 
+namespace QLicenseService {
+
 class MocHandler : virtual public ClientHandler {
     public:
         MocHandler(const RequestInfo &request, const LicdSetup &settings)
@@ -104,3 +106,5 @@ class MocHandler : virtual public ClientHandler {
             return 0;
         }
 };
+
+} // namespace QLicenseService
diff --git a/src/libs/qlicenseservice/daemon_clients/pluginhandler.h b/src/libs/qlicenseservice/daemon_clients/pluginhandler.h
index 27eae11..9e9d53d 100644
--- a/src/libs/qlicenseservice/daemon_clients/pluginhandler.h
+++ b/src/libs/qlicenseservice/daemon_clients/pluginhandler.h
@@ -8,6 +8,8 @@
 #include "jsonhandler.h"
 #include "utils.h"
 
+namespace QLicenseService {
+
 class PluginHandler : public ClientHandler {
 
     public:
@@ -76,3 +78,5 @@ class PluginHandler : public ClientHandler {
             return 0;
         }
 };
+
+} // namespace QLicenseService
diff --git a/src/libs/qlicenseservice/daemon_clients/squishhandler.h b/src/libs/qlicenseservice/daemon_clients/squishhandler.h
index 04d1abb..6458a16 100644
--- a/src/libs/qlicenseservice/daemon_clients/squishhandler.h
+++ b/src/libs/qlicenseservice/daemon_clients/squishhandler.h
@@ -8,6 +8,8 @@
 #include "jsonhandler.h"
 #include "utils.h"
 
+namespace QLicenseService {
+
 class SquishHandler : public ClientHandler {
 
     public:
@@ -103,3 +105,5 @@ class SquishHandler : public ClientHandler {
             return false;
         }
 };
+
+} // namespace QLicenseService
diff --git a/src/libs/qlicenseservice/daemon_clients/squishidehandler.h b/src/libs/qlicenseservice/daemon_clients/squishidehandler.h
index 30f3447..4ec122e 100644
--- a/src/libs/qlicenseservice/daemon_clients/squishidehandler.h
+++ b/src/libs/qlicenseservice/daemon_clients/squishidehandler.h
@@ -7,6 +7,8 @@
 #include "clienthandler.h"
 #include "utils.h"
 
+namespace QLicenseService {
+
 class SquishIdeHandler : public ClientHandler {
 
     public:
@@ -28,3 +30,5 @@ class SquishIdeHandler : public ClientHandler {
             return;
         };
 };
+
+} // namespace QLicenseService
diff --git a/src/libs/qlicenseservice/httpclient.cpp b/src/libs/qlicenseservice/httpclient.cpp
index 07d13ea..3a9e160 100644
--- a/src/libs/qlicenseservice/httpclient.cpp
+++ b/src/libs/qlicenseservice/httpclient.cpp
@@ -7,6 +7,8 @@
 
 #include "version.h"
 
+namespace QLicenseService {
+
 size_t WriteCallback(char *contents, size_t size, size_t nmemb, void *userp)
 {
     //std::cout << "Reading data\n";
@@ -130,3 +132,5 @@ int HttpClient::doRequest(CURL *curl, HttpRequest &request)
     request.reply = readBuffer;
     return 0;
 }
+
+} // namespace QLicenseService
diff --git a/src/libs/qlicenseservice/httpclient.h b/src/libs/qlicenseservice/httpclient.h
index a587c67..13d2478 100644
--- a/src/libs/qlicenseservice/httpclient.h
+++ b/src/libs/qlicenseservice/httpclient.h
@@ -22,6 +22,8 @@
     #include <curl/curl.h>
 #endif
 
+namespace QLicenseService {
+
 struct HttpRequest {
     std::string payload;
     std::string url;
@@ -54,3 +56,5 @@ private:
     std::string m_lastError;
     int doRequest(CURL *curl, HttpRequest &request);
 };
+
+} // namespace QLicenseService
diff --git a/src/libs/qlicenseservice/jsonhandler.cpp b/src/libs/qlicenseservice/jsonhandler.cpp
index 41a0c81..8e6ba05 100644
--- a/src/libs/qlicenseservice/jsonhandler.cpp
+++ b/src/libs/qlicenseservice/jsonhandler.cpp
@@ -7,6 +7,8 @@
 
 #include "utils.h"
 
+namespace QLicenseService {
+
 JsonHandler::JsonHandler(const std::string &jsonString)
 {
     if (preParse(jsonString) != 0) {
@@ -140,3 +142,5 @@ int JsonHandler::preParse(const std::string &jsonString)
     return 0;
 
 }
+
+} // namespace QLicenseService
diff --git a/src/libs/qlicenseservice/jsonhandler.h b/src/libs/qlicenseservice/jsonhandler.h
index 3755f19..ca989a8 100644
--- a/src/libs/qlicenseservice/jsonhandler.h
+++ b/src/libs/qlicenseservice/jsonhandler.h
@@ -11,6 +11,8 @@
 #include <iostream>
 #include <iomanip>
 
+namespace QLicenseService {
+
 // Very simple JSON reader/writer, takes a JSON string as input
 // Specific to Qt license daemon only, doesn't work with JSONs in general
 class JsonHandler  {
@@ -41,3 +43,5 @@ private:
     int preParse(const std::string &jsonString);
 
 };
+
+} // namespace QLicenseService
diff --git a/src/libs/qlicenseservice/licdsetup.cpp b/src/libs/qlicenseservice/licdsetup.cpp
index 45addda..0cbabd5 100644
--- a/src/libs/qlicenseservice/licdsetup.cpp
+++ b/src/libs/qlicenseservice/licdsetup.cpp
@@ -8,6 +8,8 @@
 #include "commonsetup.h"
 #include "utils.h"
 
+namespace QLicenseService {
+
 LicdSetup::LicdSetup(int type, const std::string &callerBinaryPath) :
     m_setType(type)
 {
@@ -306,3 +308,5 @@ std::string LicdSetup::getQtAppDataLocation()
     retVal += DIR_SEPARATOR;
     return retVal;
 }
+
+} // namespace QLicenseService
diff --git a/src/libs/qlicenseservice/licdsetup.h b/src/libs/qlicenseservice/licdsetup.h
index d4c7d84..0d34838 100644
--- a/src/libs/qlicenseservice/licdsetup.h
+++ b/src/libs/qlicenseservice/licdsetup.h
@@ -8,6 +8,8 @@
 #include <string>
 #include <map>
 
+namespace QLicenseService {
+
 enum settings_file_result {
     e_settings_ok           = 0,
     e_general_file_error    = 1,
@@ -51,3 +53,5 @@ private:
     std::string getQtAppDataLocation();
     std::string getUserFileSkeleton();
 };
+
+} // namespace QLicenseService
diff --git a/src/libs/qlicenseservice/licenser.cpp b/src/libs/qlicenseservice/licenser.cpp
index 3bd5f6b..c8cfdaf 100644
--- a/src/libs/qlicenseservice/licenser.cpp
+++ b/src/libs/qlicenseservice/licenser.cpp
@@ -15,6 +15,8 @@
 
 #include "hmac_sha256.h"
 
+namespace QLicenseService {
+
 Licenser::Licenser(uint16_t tcpPort)
 {
     // Init daemon settings
@@ -326,3 +328,5 @@ void Licenser::setHwId() {
     settings->set("hw_id", hash);
     return;
 }
+
+} // namespace QLicenseService
diff --git a/src/libs/qlicenseservice/licenser.h b/src/libs/qlicenseservice/licenser.h
index 7799e09..d8deafa 100644
--- a/src/libs/qlicenseservice/licenser.h
+++ b/src/libs/qlicenseservice/licenser.h
@@ -23,6 +23,8 @@
 #include "licdsetup.h"
 #include "clienthandler.h"
 
+namespace QLicenseService {
+
 class Licenser
 {
 public:
@@ -53,3 +55,4 @@ private:
     LicdSetup *settings;
 };
 
+} // namespace QLicenseService
diff --git a/src/libs/qlicenseservice/tcpclient.cpp b/src/libs/qlicenseservice/tcpclient.cpp
index 1922b76..b6c6657 100644
--- a/src/libs/qlicenseservice/tcpclient.cpp
+++ b/src/libs/qlicenseservice/tcpclient.cpp
@@ -5,6 +5,8 @@
 
 #include "tcpclient.h"
 
+namespace QLicenseService {
+
 TcpClient::TcpClient(const std::string &connAddr, uint16_t port)
 {
 #ifdef _WIN32
@@ -74,3 +76,5 @@ int TcpClient::sendAndReceive(const std::string &message, std::string &reply)
     reply = resp.substr(0, bytes_recv); // Had to cut it like this for windows
     return e_tcp_success;
 }
+
+} // namespace QLicenseService
diff --git a/src/libs/qlicenseservice/tcpclient.h b/src/libs/qlicenseservice/tcpclient.h
index 383b913..96f7f44 100644
--- a/src/libs/qlicenseservice/tcpclient.h
+++ b/src/libs/qlicenseservice/tcpclient.h
@@ -30,6 +30,8 @@
     typedef SOCKET type_socket;
 #endif
 
+namespace QLicenseService {
+
 enum TcpReturnValues {
     e_tcp_success           = 0,
     e_tcp_error_conn        = 1,
@@ -70,3 +72,5 @@ private:
     }
 
 };
+
+} // namespace QLicenseService
diff --git a/src/libs/qlicenseservice/tcpserver.cpp b/src/libs/qlicenseservice/tcpserver.cpp
index 79948e1..0962611 100644
--- a/src/libs/qlicenseservice/tcpserver.cpp
+++ b/src/libs/qlicenseservice/tcpserver.cpp
@@ -5,6 +5,8 @@
 
 #include "tcpserver.h"
 
+namespace QLicenseService {
+
 TcpServer::TcpServer(uint16_t serverPort)
 {
     int opt = TRUE;
@@ -176,3 +178,5 @@ int TcpServer::sendResponse(int socketIndex, const std::string &message)
     // m_clientSocket[socketIndex] = 0;
     return 0;
 }
+
+} // namespace QLicenseService
diff --git a/src/libs/qlicenseservice/tcpserver.h b/src/libs/qlicenseservice/tcpserver.h
index a031b88..d3835be 100644
--- a/src/libs/qlicenseservice/tcpserver.h
+++ b/src/libs/qlicenseservice/tcpserver.h
@@ -38,6 +38,8 @@ typedef int type_socket;
 
 #define BUFFER_SIZE 1024
 
+namespace QLicenseService {
+
 class TcpServer
 {
 public:
@@ -65,3 +67,5 @@ private:
 }
 
 };
+
+} // namespace QLicenseService
diff --git a/src/libs/qlicenseservice/utils.cpp b/src/libs/qlicenseservice/utils.cpp
index 2c58847..3a5b8ab 100644
--- a/src/libs/qlicenseservice/utils.cpp
+++ b/src/libs/qlicenseservice/utils.cpp
@@ -5,8 +5,7 @@
 
 #include "utils.h"
 
-namespace utils
-{
+namespace QLicenseService { namespace utils {
 
 // Trim whitespaces from start of a string
 void trimLeft(std::string &s)
@@ -359,4 +358,4 @@ uint64_t getTimestampNow()
 */
 
 
-} // namespace utils
+} } // namespace QLicenseService::utils
diff --git a/src/libs/qlicenseservice/utils.h b/src/libs/qlicenseservice/utils.h
index 163836e..2b5d999 100644
--- a/src/libs/qlicenseservice/utils.h
+++ b/src/libs/qlicenseservice/utils.h
@@ -42,7 +42,7 @@
     #define USER_SETTINGS_DIR  ".local/share/Qt/"
 #endif
 
-namespace utils {
+namespace QLicenseService { namespace utils {
 /*
 *   String tools
 */
@@ -95,4 +95,4 @@ template <typename T> T swapEndian(T val)
 */
 
 
-} // namespace utils
+} } // namespace QLicenseService::utils
diff --git a/src/linux_daemon/linuxdaemon.cpp b/src/linux_daemon/linuxdaemon.cpp
index 0b8a10a..5e1b000 100644
--- a/src/linux_daemon/linuxdaemon.cpp
+++ b/src/linux_daemon/linuxdaemon.cpp
@@ -9,6 +9,8 @@
 #include "licenser.h"
 #include "version.h"
 
+using namespace QLicenseService;
+
 int startProcess(uint16_t tcpPort) {
     // Fire it up
     Licenser license(tcpPort);
diff --git a/src/mocwrapper/mocwrapper.cpp b/src/mocwrapper/mocwrapper.cpp
index 830d894..281f967 100644
--- a/src/mocwrapper/mocwrapper.cpp
+++ b/src/mocwrapper/mocwrapper.cpp
@@ -11,6 +11,8 @@
 #include "commonsetup.h"
 #include "utils.h"
 
+using namespace QLicenseService;
+
 int main(int argc, char *argv[])
 {
     // First check if version is asked
diff --git a/src/qtlicensetool/qtlicensetool.cpp b/src/qtlicensetool/qtlicensetool.cpp
index 6c0bbc9..a9ae1b6 100644
--- a/src/qtlicensetool/qtlicensetool.cpp
+++ b/src/qtlicensetool/qtlicensetool.cpp
@@ -10,6 +10,8 @@
 #include "utils.h"
 #include "version.h"
 
+using namespace QLicenseService;
+
 int main(int argc, char *argv[])
 {
     // Fetch the settings from .ini file
diff --git a/src/qtlicensetool/qtlicensetool.h b/src/qtlicensetool/qtlicensetool.h
index 25ef04b..935fa74 100644
--- a/src/qtlicensetool/qtlicensetool.h
+++ b/src/qtlicensetool/qtlicensetool.h
@@ -43,8 +43,8 @@ enum qt_tool_action_type {
 
 int main(int argc, char *argv[]);
 void showVersion();
-int askStatus(const std::string &statusRequest, LicdSetup *setup);
-int doPermanentRequest(LicdSetup *setup);
-void overrideSetup(LicdSetup *setup, int argc, char *argv[]);
+int askStatus(const std::string &statusRequest, QLicenseService::LicdSetup *setup);
+int doPermanentRequest(QLicenseService::LicdSetup *setup);
+void overrideSetup(QLicenseService::LicdSetup *setup, int argc, char *argv[]);
 void errorAndExit(const std::string &reason = "");
 void helpAndExit();
diff --git a/src/windows_daemon/windowsdaemon.cpp b/src/windows_daemon/windowsdaemon.cpp
index 296f4b1..d073685 100644
--- a/src/windows_daemon/windowsdaemon.cpp
+++ b/src/windows_daemon/windowsdaemon.cpp
@@ -8,6 +8,8 @@
 
 #define SVCNAME TEXT("qtlicd")
 
+using namespace QLicenseService;
+
 SERVICE_STATUS          gSvcStatus;
 SERVICE_STATUS_HANDLE   gSvcStatusHandle;
 HANDLE                  ghSvcStopEvent = NULL;