Remove unused defines and environment variables

Pick-to: 3.0
Change-Id: Ia6037b0d736cb1e001a8fa322540388fc95d7a5a
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>

3 files changed, 0 insertions, 18 deletions

diff --git a/src/daemons/daemon.h b/src/daemons/daemon.h
index 3ad1a41..a2bc26b 100644
--- a/src/daemons/daemon.h
+++ b/src/daemons/daemon.h
@@ -104,10 +104,6 @@ void printHelp()
     printf("Supported environment variables are:\n");
     printf("  QTLICD_LOG_LEVEL <loglevel>\n");
     printf("                         : Set logging level to be one of: none|info|warning|error|debug\n");
-    printf("  QTLICD_SINGLE_USER_ID <id>\n");
-    printf("                         : Override the single_user_id value from settings file\n");
-    printf("  QTLICD_SINGLE_LICENSE_ID <id>\n");
-    printf("                         : Override the single_license_id value from settings file\n");
 }
 
 
diff --git a/src/include/commonsetup.h.in b/src/include/commonsetup.h.in
index d7bbb9f..80e8dbc 100644
--- a/src/include/commonsetup.h.in
+++ b/src/include/commonsetup.h.in
@@ -21,10 +21,7 @@
 #define DAEMON_VERSION_CMD          "daemon_version"
 #define RESERVATION_QUERY_CMD       "reservation_query"
 #define CURRENT_RESERVATION_CMD     "current_reservation"
-#define PERMANENT_REQUEST_CMD       "permanent"
 #define LICENSE_REQUEST_CMD         "license"
-#define OP_ADD_RESERVATION          "add"
-#define OP_REMOVE_RESERVATION       "remove"
 #define PIPE_MSG_READY_READ         "ready_read"
 #define PIPE_MSG_TIMEOUT            "timeout"
 #define PIPE_MSG_LICENSE_EXPIRED    "license_expired"
@@ -65,7 +62,6 @@
 
 #define DAEMON_TCP_PORT_FILE      "qtlicd.port"
 #define DAEMON_SETTINGS_FILE      "qtlicd.ini"
-#define RESERVATION_CACHE_FILE    "reservations"
 #define DAEMON_INSTALLATIONS_FILE "installations.ini"
 #define CIP_LOCK_FILE             "cip.lock"
 
diff --git a/src/libs/qlicenseservice/licenser.cpp b/src/libs/qlicenseservice/licenser.cpp
index 1b0511b..f08e388 100644
--- a/src/libs/qlicenseservice/licenser.cpp
+++ b/src/libs/qlicenseservice/licenser.cpp
@@ -927,16 +927,6 @@ void Licenser::initSettings() {
         m_settings->set(sc_queueMinRetryInterval, std::to_string(QUEUE_MIN_RETRY_TIME));
     }
 
-    if (const char* singleUserId = std::getenv("QTLICD_SINGLE_USER_ID")) {
-        logInfo("Overriding single user id setting with value \"%s\"", singleUserId);
-        m_settings->set("single_user_id", singleUserId);
-    }
-
-    if (const char* singleLicenseId = std::getenv("QTLICD_SINGLE_LICENSE_ID")) {
-        logInfo("Overriding single license id setting with value \"%s\"", singleLicenseId);
-        m_settings->set("single_license_id", singleLicenseId);
-    }
-
     // To avoid calculating this possibly at each round again:
     //m_maxQueueTime = utils::strToInt(m_settings->get(sc_queueMaxWaitingTime)) * SECS_IN_HOUR;