Skip to content

Commit 246f6aa

Browse files
committed
Fixed issue when compiling with unity builds enabled
1 parent 7b54352 commit 246f6aa

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

src/services/google/googledriveconnectorlocal.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ using namespace Services;
1010
using namespace Common::Settings;
1111

1212
constexpr auto LOCAL_PORT = 59993;
13-
constexpr auto MAX_CONCURRENT_REQUESTS = 5;
13+
constexpr auto GOOGLE_DRIVE_MAX_CONCURRENT_REQUESTS = 5;
1414
constexpr auto SCOPE = "https://www.googleapis.com/auth/drive.file"; //"https://www.googleapis.com/auth/drive.appdata "
1515

1616
Q_LOGGING_CATEGORY(gmGoogleDriveLocal, "gm.service.google.drive.local")
@@ -23,7 +23,7 @@ GoogleDriveConnectorLocal::GoogleDriveConnectorLocal(const QString &serviceName,
2323

2424
config.scope = SCOPE;
2525
config.port = LOCAL_PORT;
26-
config.maxConcurrentRequests = MAX_CONCURRENT_REQUESTS;
26+
config.maxConcurrentRequests = GOOGLE_DRIVE_MAX_CONCURRENT_REQUESTS;
2727
config.authHeaderFormat = u"Bearer %1"_s;
2828
config.idRequest = Request<QString>(u"clientId"_s, u""_s, serviceName);
2929
config.secretRequest = Request<QString>(u"clientSecret"_s, u""_s, serviceName);

src/services/nextcloud/nextcloudconnector.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ using namespace Qt::Literals::StringLiterals;
1515
using namespace Services;
1616
using namespace Common::Settings;
1717

18-
constexpr auto MAX_CONCURRENT_REQUESTS = 3;
18+
constexpr auto NEXTCLOUD_MAX_CONCURRENT_REQUESTS = 3;
1919
constexpr auto AUTH_URL = "/index.php/login/v2";
2020
constexpr auto AUTH_POLL_DELAY = 3000;
2121
constexpr auto MAX_AUTH_POLLS = 20;
@@ -26,7 +26,7 @@ Q_LOGGING_CATEGORY(gmNcConnector, "gm.service.nextcloud.connector")
2626
NextCloudConnector::NextCloudConnector(NextCloud *nc, QObject *parent)
2727
: RESTServiceConnector{nullptr, gmNcConnector(), {}, parent}, m_nc(nc)
2828
{
29-
setMaxConcurrentRequests(MAX_CONCURRENT_REQUESTS);
29+
setMaxConcurrentRequests(NEXTCLOUD_MAX_CONCURRENT_REQUESTS);
3030
updateTokenExpireTime(TOKEN_VALIDITY_TIME);
3131

3232
connect(this, &NextCloudConnector::stateChanged, this, &NextCloudConnector::onStateChanged);

src/services/youtube/pipedconnector.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ constexpr auto PIPED_INSTANCES_WIKI_URL =
1616
constexpr auto PIPED_PARSER_TABLE_COLUMNS = 5;
1717
constexpr auto PIPED_PARSER_TABLE_HEADER_SIZE = 2;
1818
constexpr auto PIPED_INSTANCE_SELECTION_TIME = std::chrono::hours(1);
19-
constexpr auto MAX_CONCURRENT_REQUESTS = 1;
19+
constexpr auto PIPED_MAX_CONCURRENT_REQUESTS = 1;
2020

2121
Q_LOGGING_CATEGORY(gmPiped, "gm.service.youtube.piped")
2222

2323
PipedConnector::PipedConnector(QObject *parent) : RESTServiceConnector{nullptr, gmPiped(), {}, parent}
2424
{
25-
setMaxConcurrentRequests(MAX_CONCURRENT_REQUESTS);
25+
setMaxConcurrentRequests(PIPED_MAX_CONCURRENT_REQUESTS);
2626
}
2727

2828
auto PipedConnector::instances() const -> std::vector<PipedInstance>

0 commit comments

Comments
 (0)