From 3a4199240ee4201fb1091fce7a2cf2e78d24f8e2 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Sun, 27 Nov 2022 03:11:57 +0100 Subject: [PATCH] Change `constexpr` to `const` --- src/qobuz/qobuzservice.cpp | 8 +++++--- src/tidal/tidalservice.cpp | 11 +++++++---- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/qobuz/qobuzservice.cpp b/src/qobuz/qobuzservice.cpp index 5df06101..2306a873 100644 --- a/src/qobuz/qobuzservice.cpp +++ b/src/qobuz/qobuzservice.cpp @@ -57,10 +57,12 @@ #include "settings/settingsdialog.h" #include "settings/qobuzsettingspage.h" -constexpr Song::Source QobuzService::kSource = Song::Source_Qobuz; +const Song::Source QobuzService::kSource = Song::Source_Qobuz; +const char QobuzService::kApiUrl[] = "https://www.qobuz.com/api.json/0.2"; + constexpr char QobuzService::kAuthUrl[] = "https://www.qobuz.com/api.json/0.2/user/login"; -constexpr char QobuzService::kApiUrl[] = "https://www.qobuz.com/api.json/0.2"; -constexpr int QobuzService::kLoginAttempts = 2; + +const int QobuzService::kLoginAttempts = 2; constexpr int QobuzService::kTimeResetLoginAttempts = 60000; constexpr char QobuzService::kArtistsSongsTable[] = "qobuz_artists_songs"; diff --git a/src/tidal/tidalservice.cpp b/src/tidal/tidalservice.cpp index 979bcd14..9f87c774 100644 --- a/src/tidal/tidalservice.cpp +++ b/src/tidal/tidalservice.cpp @@ -61,14 +61,17 @@ #include "settings/settingsdialog.h" #include "settings/tidalsettingspage.h" -constexpr Song::Source TidalService::kSource = Song::Source_Tidal; +const Song::Source TidalService::kSource = Song::Source_Tidal; + +const char TidalService::kApiUrl[] = "https://api.tidalhifi.com/v1"; +const char TidalService::kResourcesUrl[] = "https://resources.tidal.com"; + constexpr char TidalService::kOAuthUrl[] = "https://login.tidal.com/authorize"; constexpr char TidalService::kOAuthAccessTokenUrl[] = "https://login.tidal.com/oauth2/token"; constexpr char TidalService::kOAuthRedirectUrl[] = "tidal://login/auth"; constexpr char TidalService::kAuthUrl[] = "https://api.tidalhifi.com/v1/login/username"; -constexpr char TidalService::kApiUrl[] = "https://api.tidalhifi.com/v1"; -constexpr char TidalService::kResourcesUrl[] = "https://resources.tidal.com"; -constexpr int TidalService::kLoginAttempts = 2; + +const int TidalService::kLoginAttempts = 2; constexpr int TidalService::kTimeResetLoginAttempts = 60000; constexpr char TidalService::kArtistsSongsTable[] = "tidal_artists_songs";