Rename SystemConfig to AppConfig

Author: erikjv

src/gui/creds/credentials.cpp

@@ -15,7 +15,7 @@
 
 #include "accessmanager.h"
 #include "account.h"
-#include "config/systemconfig.h"
+#include "config/appconfig.h"
 #include "creds/credentialmanager.h"
 #include "oauth.h"
 #include "requestauthenticationcontroller.h"
@@ -85,7 +85,7 @@ Credentials::Credentials(const QString &token, const QString &refreshToken, Acco
     , _accessToken(token)
     , _refreshToken(refreshToken)
     , _ready(false)
-    , _openIdConfig(SystemConfig().openIdConfig())
+    , _openIdConfig(AppConfig().openIdConfig())
 {
     if (!token.isEmpty() && !refreshToken.isEmpty())
         _ready = true;

src/gui/creds/oauth.cpp

@@ -15,7 +15,6 @@
 #include "oauth.h"
 
 #include "accessmanager.h"
-#include "config/systemconfig.h"
 #include "creds/credentialssupport.h"
 #include "gui/networkadapters/userinfoadapter.h"
 #include "libsync/creds/credentialmanager.h"

src/gui/creds/requestauthenticationcontroller.cpp

@@ -21,7 +21,7 @@
 #include "accountmodalwidget.h"
 #include "settingsdialog.h"
 
-#include <config/systemconfig.h>
+#include <config/appconfig.h>
 
 namespace OCC {
 
@@ -60,7 +60,7 @@ void RequestAuthenticationController::startAuthentication(Account *account)
         delete _oauth;
         _oauth = nullptr;
     }
-    SystemConfig systemConfig;
+    AppConfig systemConfig;
     _account = account;
     _oauth = new AccountBasedOAuth(_account, systemConfig.openIdConfig(), this);
     connect(_oauth, &OAuth::authorisationLinkChanged, this, &RequestAuthenticationController::authUrlReady);

src/gui/newaccountwizard/oauthpagecontroller.cpp

@@ -15,11 +15,10 @@
 
 #include "accessmanager.h"
 #include "accountmanager.h"
-#include "config/systemconfig.h"
+#include "config/appconfig.h"
 #include "networkadapters/fetchcapabilitiesadapter.h"
 #include "networkadapters/userinfoadapter.h"
 #include "networkadapters/webfingerlookupadapter.h"
-#include "resources.h"
 #include "template.h"
 #include "theme.h"
 
@@ -209,7 +208,7 @@ bool OAuthPageController::validate()
     _authEndpoint.clear();
     _urlField->clear();
 
-    SystemConfig systemConfig;
+    AppConfig systemConfig;
     _oauth = new OAuth(_authUrl, {}, systemConfig.openIdConfig(), _accessManager.get(), this);
     // if we ever need to split out the auth link calculation, it's coming from fetchWellKnown which is a subset of
     // the "full" authentication routine in the oauth impl

src/gui/newaccountwizard/urlpagecontroller.cpp

@@ -14,7 +14,7 @@
 #include "urlpagecontroller.h"
 
 #include "accessmanager.h"
-#include "config/systemconfig.h"
+#include "config/appconfig.h"
 #include "networkadapters/determineauthtypeadapter.h"
 #include "networkadapters/discoverwebfingerserviceadapter.h"
 #include "networkadapters/resolveurladapter.h"
@@ -39,7 +39,7 @@ UrlPageController::UrlPageController(QWizardPage *page, AccessManager *accessMan
         return;
     }
 
-    SystemConfig systemConfig;
+    AppConfig systemConfig;
     QString serverUrl = systemConfig.serverUrl();
     // no server url was given by any means, so the user has to provide one
     if (serverUrl.isEmpty()) {

src/libsync/CMakeLists.txt

@@ -52,7 +52,7 @@ set(libsync_SRCS
     abstractcorejob.cpp
 
     appprovider.cpp
-    config/systemconfig.cpp
+    config/appconfig.cpp
     config/openidconfig.cpp
 )
 

src/libsync/config/systemconfig.cpp src/libsync/config/appconfig.cppsrc/libsync/config/systemconfig.cpp renamed to src/libsync/config/appconfig.cpp

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 // SPDX-FileCopyrightText: 2026 Thomas Müller <thomas.mueller@tmit.eu>
 
-#include "systemconfig.h"
+#include "appconfig.h"
 
 #include "../theme.h"
 #include "common/utility.h"
@@ -17,7 +17,7 @@ Q_LOGGING_CATEGORY(lcSystemConfig, "sync.systemconfig", QtInfoMsg)
 
 namespace chrono = std::chrono;
 
-SystemConfig::SystemConfig()
+AppConfig::AppConfig()
 {
     _serverUrl = Theme::instance()->overrideServerUrlV2();
     // If a theme provides a hardcoded URL, do not allow for URL change.
@@ -47,7 +47,7 @@ SystemConfig::SystemConfig()
     }
 }
 
-OpenIdConfig SystemConfig::loadOpenIdConfigFromTheme()
+OpenIdConfig AppConfig::loadOpenIdConfigFromTheme()
 {
     Theme *theme = Theme::instance();
 
@@ -63,7 +63,7 @@ OpenIdConfig SystemConfig::loadOpenIdConfigFromTheme()
     return cfg;
 }
 
-OpenIdConfig SystemConfig::loadOpenIdConfigFromSystemConfig(const QSettings &system)
+OpenIdConfig AppConfig::loadOpenIdConfigFromSystemConfig(const QSettings &system)
 {
     QString clientId = system.value(OidcClientIdKey, QString()).toString();
     QString clientSecret = system.value(OidcClientSecretKey, QString()).toString();
@@ -87,7 +87,7 @@ OpenIdConfig SystemConfig::loadOpenIdConfigFromSystemConfig(const QSettings &sys
     return OpenIdConfig(clientId, clientSecret, ports, scopes, prompt);
 }
 
-QString SystemConfig::configPath(const QOperatingSystemVersion::OSType& os, const Theme& theme)
+QString AppConfig::configPath(const QOperatingSystemVersion::OSType& os, const Theme& theme)
 {
     // Important: these paths conform to how names typically work on the systems on which they are used. This includes usage of upper-/lowercase.
 
@@ -108,22 +108,22 @@ QString SystemConfig::configPath(const QOperatingSystemVersion::OSType& os, cons
     return QString("/etc/%1/%1.ini").arg(theme.appName());
 }
 
-bool SystemConfig::allowServerUrlChange() const
+bool AppConfig::allowServerUrlChange() const
 {
     return _allowServerURLChange;
 }
 
-QString SystemConfig::serverUrl() const
+QString AppConfig::serverUrl() const
 {
     return _serverUrl;
 }
 
-bool SystemConfig::skipUpdateCheck() const
+bool AppConfig::skipUpdateCheck() const
 {
     return _skipUpdateCheck;
 }
 
-OpenIdConfig SystemConfig::openIdConfig() const
+OpenIdConfig AppConfig::openIdConfig() const
 {
     return _openIdConfig;
 }

src/libsync/config/systemconfig.h src/libsync/config/appconfig.hsrc/libsync/config/systemconfig.h renamed to src/libsync/config/appconfig.h

@@ -15,7 +15,7 @@
 namespace OCC {
 
 /**
- * @brief The SystemConfig class
+ * @brief The AppConfig class
  * @ingroup libsync
  * @note This class provides access to system-wide configuration settings.
  * These settings are typically read-only and affect the behavior of the application globally.
@@ -63,10 +63,10 @@ namespace OCC {
  * "Prompt"="select_account consent"
  *
  */
-class OWNCLOUDSYNC_EXPORT SystemConfig
+class OWNCLOUDSYNC_EXPORT AppConfig
 {
 public:
-    explicit SystemConfig();
+    explicit AppConfig();
     /**
      * Determine if changing the server URL is allowed based on system configuration.
      * This value is only relevant if SystemConfig::serverUrl() returns a non-empty string.

src/libsync/configfile.cpp

@@ -14,18 +14,15 @@
 
 #include "common/asserts.h"
 #include "common/utility.h"
-#include "common/version.h"
 
-#include "config/systemconfig.h"
+#include "config/appconfig.h"
 #ifdef Q_OS_WIN
 #include "common/utility_win.h"
 #endif
 #include "configfile.h"
 #include "logger.h"
 #include "theme.h"
 
-#include "creds/abstractcredentials.h"
-
 #include "csync_exclude.h"
 
 #include <QHeaderView>

test/testoauth.cpp

@@ -13,7 +13,7 @@
 #include "testutils/syncenginetestutils.h"
 #include "theme.h"
 
-#include <config/systemconfig.h>
+#include <config/appconfig.h>
 
 using namespace std::chrono_literals;
 using namespace OCC;
@@ -157,7 +157,7 @@ class OAuthTestCase : public QObject
 
         QObject::connect(&desktopServiceHook, &DesktopServiceHook::hooked, this, &OAuthTestCase::openBrowserHook);
 
-        SystemConfig config;
+        AppConfig config;
         auto out = std::make_unique<AccountBasedOAuth>(account, config.openIdConfig(), nullptr);
         QObject::connect(out.get(), &OAuth::result, this, &OAuthTestCase::oauthResult);
         return out;