Fixed issue when compiling with unity builds enabled

PhilInTheGaps · Dec 17, 2023 · 246f6aa · 246f6aa
1 parent 7b54352
commit 246f6aa
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/services/google/googledriveconnectorlocal.cpp b/src/services/google/googledriveconnectorlocal.cpp
@@ -10,7 +10,7 @@ using namespace Services;
 using namespace Common::Settings;
 
 constexpr auto LOCAL_PORT = 59993;
-constexpr auto MAX_CONCURRENT_REQUESTS = 5;
+constexpr auto GOOGLE_DRIVE_MAX_CONCURRENT_REQUESTS = 5;
 constexpr auto SCOPE = "https://www.googleapis.com/auth/drive.file"; //"https://www.googleapis.com/auth/drive.appdata "
 
 Q_LOGGING_CATEGORY(gmGoogleDriveLocal, "gm.service.google.drive.local")
@@ -23,7 +23,7 @@ GoogleDriveConnectorLocal::GoogleDriveConnectorLocal(const QString &serviceName,
 
     config.scope = SCOPE;
     config.port = LOCAL_PORT;
-    config.maxConcurrentRequests = MAX_CONCURRENT_REQUESTS;
+    config.maxConcurrentRequests = GOOGLE_DRIVE_MAX_CONCURRENT_REQUESTS;
     config.authHeaderFormat = u"Bearer %1"_s;
     config.idRequest = Request<QString>(u"clientId"_s, u""_s, serviceName);
     config.secretRequest = Request<QString>(u"clientSecret"_s, u""_s, serviceName);

diff --git a/src/services/nextcloud/nextcloudconnector.cpp b/src/services/nextcloud/nextcloudconnector.cpp
@@ -15,7 +15,7 @@ using namespace Qt::Literals::StringLiterals;
 using namespace Services;
 using namespace Common::Settings;
 
-constexpr auto MAX_CONCURRENT_REQUESTS = 3;
+constexpr auto NEXTCLOUD_MAX_CONCURRENT_REQUESTS = 3;
 constexpr auto AUTH_URL = "/index.php/login/v2";
 constexpr auto AUTH_POLL_DELAY = 3000;
 constexpr auto MAX_AUTH_POLLS = 20;
@@ -26,7 +26,7 @@ Q_LOGGING_CATEGORY(gmNcConnector, "gm.service.nextcloud.connector")
 NextCloudConnector::NextCloudConnector(NextCloud *nc, QObject *parent)
     : RESTServiceConnector{nullptr, gmNcConnector(), {}, parent}, m_nc(nc)
 {
-    setMaxConcurrentRequests(MAX_CONCURRENT_REQUESTS);
+    setMaxConcurrentRequests(NEXTCLOUD_MAX_CONCURRENT_REQUESTS);
     updateTokenExpireTime(TOKEN_VALIDITY_TIME);
 
     connect(this, &NextCloudConnector::stateChanged, this, &NextCloudConnector::onStateChanged);

diff --git a/src/services/youtube/pipedconnector.cpp b/src/services/youtube/pipedconnector.cpp
@@ -16,13 +16,13 @@ constexpr auto PIPED_INSTANCES_WIKI_URL =
 constexpr auto PIPED_PARSER_TABLE_COLUMNS = 5;
 constexpr auto PIPED_PARSER_TABLE_HEADER_SIZE = 2;
 constexpr auto PIPED_INSTANCE_SELECTION_TIME = std::chrono::hours(1);
-constexpr auto MAX_CONCURRENT_REQUESTS = 1;
+constexpr auto PIPED_MAX_CONCURRENT_REQUESTS = 1;
 
 Q_LOGGING_CATEGORY(gmPiped, "gm.service.youtube.piped")
 
 PipedConnector::PipedConnector(QObject *parent) : RESTServiceConnector{nullptr, gmPiped(), {}, parent}
 {
-    setMaxConcurrentRequests(MAX_CONCURRENT_REQUESTS);
+    setMaxConcurrentRequests(PIPED_MAX_CONCURRENT_REQUESTS);
 }
 
 auto PipedConnector::instances() const -> std::vector<PipedInstance>