Renaming

grliszas14 · grliszas14 · commit ed3c61ed6e3d · 2026-04-09T11:03:09.000+02:00
diff --git a/src/app/configs/update.cfg b/src/app/configs/update.cfg
@@ -1,5 +1,5 @@
 {
-    "appUrl": "https://www.musescore.org/",
+    "appWebSiteUrl": "https://www.musescore.org/",
     "privacyPolicyUrl": "https://www.musescore.org/about/desktop-privacy-policy",
     "latest": "https://updates.musescore.org/feed/latest.xml",
     "latest.test": "https://updates.musescore.org/feed/latest.test.xml",
diff --git a/src/appshell/internal/appshellconfiguration.cpp b/src/appshell/internal/appshellconfiguration.cpp
@@ -204,7 +204,7 @@ std::string AppShellConfiguration::accessibilityStatementUrl() const
 
 std::string AppShellConfiguration::museScoreUrl() const
 {
-    return globalConfiguration()->museScoreUrl();
+    return globalConfiguration()->appWebSiteUrl();
 }
 
 std::string AppShellConfiguration::museScoreForumUrl() const
diff --git a/src/appshell/qml/MuseScore/AppShell/FirstLaunchSetup/tutorialspagemodel.cpp b/src/appshell/qml/MuseScore/AppShell/FirstLaunchSetup/tutorialspagemodel.cpp
@@ -30,5 +30,5 @@ TutorialsPageModel::TutorialsPageModel(QObject* parent)
 
 QUrl TutorialsPageModel::museScorePrivacyPolicyUrl() const
 {
-    return QUrl(QString::fromStdString(updateConfiguration()->museScorePrivacyPolicyUrl()));
+    return QUrl(QString::fromStdString(updateConfiguration()->privacyPolicyUrl()));
 }
diff --git a/src/appshell/qml/MuseScore/AppShell/aboutmodel.cpp b/src/appshell/qml/MuseScore/AppShell/aboutmodel.cpp
@@ -67,7 +67,7 @@ QVariantMap AboutModel::museScoreContributionUrl() const
 
 QVariantMap AboutModel::museScorePrivacyPolicyUrl() const
 {
-    QUrl museScorePrivacyPolicyUrl(QString::fromStdString(updateConfiguration()->museScorePrivacyPolicyUrl()));
+    QUrl museScorePrivacyPolicyUrl(QString::fromStdString(updateConfiguration()->privacyPolicyUrl()));
     return makeUrl(museScorePrivacyPolicyUrl);
 }
 
diff --git a/src/framework/global/iglobalconfiguration.h b/src/framework/global/iglobalconfiguration.h
@@ -77,7 +77,7 @@ class IGlobalConfiguration : MODULE_GLOBAL_INTERFACE
     virtual bool metricUnit() const = 0;
     virtual void setMetricUnit(bool metricUnit) = 0;
 
-    virtual std::string museScoreUrl() const = 0;
+    virtual std::string appWebSiteUrl() const = 0;
     virtual std::string museHubWebUrl() const = 0;
 
     virtual bool highResolutionTimers() const = 0;
diff --git a/src/framework/global/internal/globalconfiguration.cpp b/src/framework/global/internal/globalconfiguration.cpp
@@ -172,9 +172,9 @@ void GlobalConfiguration::setMetricUnit(bool metricUnit)
     settings()->setSharedValue(METRIC_UNIT_KEY, Val(metricUnit));
 }
 
-std::string GlobalConfiguration::museScoreUrl() const
+std::string GlobalConfiguration::appWebSiteUrl() const
 {
-    return m_config.value("appUrl").toString();
+    return m_config.value("appWebSiteUrl").toString();
 }
 
 std::string GlobalConfiguration::museHubWebUrl() const
diff --git a/src/framework/global/internal/globalconfiguration.h b/src/framework/global/internal/globalconfiguration.h
@@ -60,7 +60,7 @@ class GlobalConfiguration : public IGlobalConfiguration
     bool metricUnit() const override;
     void setMetricUnit(bool metricUnit) override;
 
-    std::string museScoreUrl() const override;
+    std::string appWebSiteUrl() const override;
     std::string museHubWebUrl() const override;
 
     bool highResolutionTimers() const override;
diff --git a/src/framework/global/tests/mocks/globalconfigurationmock.h b/src/framework/global/tests/mocks/globalconfigurationmock.h
@@ -50,7 +50,7 @@ class GlobalConfigurationMock : public IGlobalConfiguration
     MOCK_METHOD(bool, metricUnit, (), (const, override));
     MOCK_METHOD(void, setMetricUnit, (bool), (override));
 
-    MOCK_METHOD(std::string, museScoreUrl, (), (const, override));
+    MOCK_METHOD(std::string, appWebSiteUrl, (), (const, override));
     MOCK_METHOD(std::string, museHubWebUrl, (), (const, override));
 
     MOCK_METHOD(bool, highResolutionTimers, (), (const, override));
diff --git a/src/framework/stubs/update/updateconfigurationstub.cpp b/src/framework/stubs/update/updateconfigurationstub.cpp
@@ -81,12 +81,12 @@ muse::network::RequestHeaders UpdateConfigurationStub::updateHeaders() const
     return {};
 }
 
-std::string UpdateConfigurationStub::museScoreUrl() const
+std::string UpdateConfigurationStub::appWebSiteUrl() const
 {
     return "";
 }
 
-std::string UpdateConfigurationStub::museScorePrivacyPolicyUrl() const
+std::string UpdateConfigurationStub::privacyPolicyUrl() const
 {
     return "";
 }
diff --git a/src/framework/stubs/update/updateconfigurationstub.h b/src/framework/stubs/update/updateconfigurationstub.h
@@ -47,8 +47,8 @@ class UpdateConfigurationStub : public IUpdateConfiguration
 
     muse::network::RequestHeaders updateHeaders() const override;
 
-    std::string museScoreUrl() const override;
-    std::string museScorePrivacyPolicyUrl() const override;
+    std::string appWebSiteUrl() const override;
+    std::string privacyPolicyUrl() const override;
 
     io::path_t updateDataPath() const override;
     io::path_t updateRequestHistoryJsonPath() const override;
diff --git a/src/framework/update/internal/appupdatescenario.cpp b/src/framework/update/internal/appupdatescenario.cpp
@@ -134,7 +134,7 @@ Promise<IInteractive::Result> AppUpdateScenario::showNoUpdateMsg()
 {
     const QString str = muse::qtrc("update", "You already have the latest version of MuseScore Studio. "
                                              "Please visit <a href=\"%1\">MuseScore.org</a> for news on what’s coming next.")
-                        .arg(QString::fromStdString(configuration()->museScoreUrl()));
+                        .arg(QString::fromStdString(configuration()->appWebSiteUrl()));
 
     const IInteractive::Text text(str.toStdString(), IInteractive::TextFormat::RichText);
     const IInteractive::ButtonData okBtn = interactive()->buttonData(IInteractive::Button::Ok);
diff --git a/src/framework/update/internal/updateconfiguration.cpp b/src/framework/update/internal/updateconfiguration.cpp
@@ -122,12 +122,12 @@ muse::network::RequestHeaders UpdateConfiguration::updateHeaders() const
     return networkConfiguration()->defaultHeaders();
 }
 
-std::string UpdateConfiguration::museScoreUrl() const
+std::string UpdateConfiguration::appWebSiteUrl() const
 {
-    return m_config.value("appUrl").toString();
+    return m_config.value("appWebSiteUrl").toString();
 }
 
-std::string UpdateConfiguration::museScorePrivacyPolicyUrl() const
+std::string UpdateConfiguration::privacyPolicyUrl() const
 {
     return m_config.value("privacyPolicyUrl").toString();
 }
diff --git a/src/framework/update/internal/updateconfiguration.h b/src/framework/update/internal/updateconfiguration.h
@@ -62,8 +62,8 @@ class UpdateConfiguration : public IUpdateConfiguration, public Contextable, pub
 
     muse::network::RequestHeaders updateHeaders() const override;
 
-    std::string museScoreUrl() const override;
-    std::string museScorePrivacyPolicyUrl() const override;
+    std::string appWebSiteUrl() const override;
+    std::string privacyPolicyUrl() const override;
 
     muse::io::path_t updateDataPath() const override;
     muse::io::path_t updateRequestHistoryJsonPath() const override;
diff --git a/src/framework/update/iupdateconfiguration.h b/src/framework/update/iupdateconfiguration.h
@@ -55,8 +55,8 @@ class IUpdateConfiguration : MODULE_GLOBAL_INTERFACE
 
     virtual muse::network::RequestHeaders updateHeaders() const = 0;
 
-    virtual std::string museScoreUrl() const = 0;
-    virtual std::string museScorePrivacyPolicyUrl() const = 0;
+    virtual std::string appWebSiteUrl() const = 0;
+    virtual std::string privacyPolicyUrl() const = 0;
 
     virtual muse::io::path_t updateDataPath() const = 0;
     virtual muse::io::path_t updateRequestHistoryJsonPath() const = 0;
diff --git a/src/framework/update/tests/mocks/updateconfigurationmock.h b/src/framework/update/tests/mocks/updateconfigurationmock.h
@@ -49,8 +49,8 @@ class UpdateConfigurationMock : public IUpdateConfiguration
 
     MOCK_METHOD(muse::network::RequestHeaders, updateHeaders, (), (const, override));
 
-    MOCK_METHOD(std::string, museScoreUrl, (), (const, override));
-    MOCK_METHOD(std::string, museScorePrivacyPolicyUrl, (), (const, override));
+    MOCK_METHOD(std::string, appWebSiteUrl, (), (const, override));
+    MOCK_METHOD(std::string, privacyPolicyUrl, (), (const, override));
 
     MOCK_METHOD(muse::io::path_t, updateDataPath, (), (const, override));
     MOCK_METHOD(muse::io::path_t, updateRequestHistoryJsonPath, (), (const, override));
diff --git a/src/musesounds/internal/musesamplercheckupdatescenario.cpp b/src/musesounds/internal/musesamplercheckupdatescenario.cpp
@@ -154,7 +154,7 @@ void MuseSamplerCheckUpdateScenario::openMuseHubAndQuit()
 void MuseSamplerCheckUpdateScenario::openMuseHubWebsiteAndQuit()
 {
 #ifdef Q_OS_LINUX
-    platformInteractive()->openUrl(globalConfiguration()->museScoreUrl());
+    platformInteractive()->openUrl(globalConfiguration()->appWebSiteUrl());
 #else
     platformInteractive()->openUrl(globalConfiguration()->museHubWebUrl());
 #endif
diff --git a/src/preferences/qml/MuseScore/Preferences/updatepreferencesmodel.cpp b/src/preferences/qml/MuseScore/Preferences/updatepreferencesmodel.cpp
@@ -58,5 +58,5 @@ void UpdatePreferencesModel::setNeedCheckForNewAppVersion(bool value)
 
 QString UpdatePreferencesModel::museScorePrivacyPolicyUrl() const
 {
-    return QString::fromStdString(updateConfiguration()->museScorePrivacyPolicyUrl());
+    return QString::fromStdString(updateConfiguration()->privacyPolicyUrl());
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "appUrl": "https://www.musescore.org/",`
	`2`	`+ "appWebSiteUrl": "https://www.musescore.org/",`
`3`	`3`	`"privacyPolicyUrl": "https://www.musescore.org/about/desktop-privacy-policy",`
`4`	`4`	`"latest": "https://updates.musescore.org/feed/latest.xml",`
`5`	`5`	`"latest.test": "https://updates.musescore.org/feed/latest.test.xml",`
Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ std::string AppShellConfiguration::accessibilityStatementUrl() const`
`204`	`204`
`205`	`205`	`std::string AppShellConfiguration::museScoreUrl() const`
`206`	`206`	`{`
`207`		`- return globalConfiguration()->museScoreUrl();`
	`207`	`+ return globalConfiguration()->appWebSiteUrl();`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`std::string AppShellConfiguration::museScoreForumUrl() const`
Original file line number	Diff line number	Diff line change
`@@ -30,5 +30,5 @@ TutorialsPageModel::TutorialsPageModel(QObject* parent)`
`30`	`30`
`31`	`31`	`QUrl TutorialsPageModel::museScorePrivacyPolicyUrl() const`
`32`	`32`	`{`
`33`		`- return QUrl(QString::fromStdString(updateConfiguration()->museScorePrivacyPolicyUrl()));`
	`33`	`+ return QUrl(QString::fromStdString(updateConfiguration()->privacyPolicyUrl()));`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ QVariantMap AboutModel::museScoreContributionUrl() const`
`67`	`67`
`68`	`68`	`QVariantMap AboutModel::museScorePrivacyPolicyUrl() const`
`69`	`69`	`{`
`70`		`- QUrl museScorePrivacyPolicyUrl(QString::fromStdString(updateConfiguration()->museScorePrivacyPolicyUrl()));`
	`70`	`+ QUrl museScorePrivacyPolicyUrl(QString::fromStdString(updateConfiguration()->privacyPolicyUrl()));`
`71`	`71`	`return makeUrl(museScorePrivacyPolicyUrl);`
`72`	`72`	`}`
`73`	`73`
Original file line number	Diff line number	Diff line change
`@@ -172,9 +172,9 @@ void GlobalConfiguration::setMetricUnit(bool metricUnit)`
`172`	`172`	`settings()->setSharedValue(METRIC_UNIT_KEY, Val(metricUnit));`
`173`	`173`	`}`
`174`	`174`
`175`		`-std::string GlobalConfiguration::museScoreUrl() const`
	`175`	`+std::string GlobalConfiguration::appWebSiteUrl() const`
`176`	`176`	`{`
`177`		`- return m_config.value("appUrl").toString();`
	`177`	`+ return m_config.value("appWebSiteUrl").toString();`
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`std::string GlobalConfiguration::museHubWebUrl() const`
Original file line number	Diff line number	Diff line change
`@@ -81,12 +81,12 @@ muse::network::RequestHeaders UpdateConfigurationStub::updateHeaders() const`
`81`	`81`	`return {};`
`82`	`82`	`}`
`83`	`83`
`84`		`-std::string UpdateConfigurationStub::museScoreUrl() const`
	`84`	`+std::string UpdateConfigurationStub::appWebSiteUrl() const`
`85`	`85`	`{`
`86`	`86`	`return "";`
`87`	`87`	`}`
`88`	`88`
`89`		`-std::string UpdateConfigurationStub::museScorePrivacyPolicyUrl() const`
	`89`	`+std::string UpdateConfigurationStub::privacyPolicyUrl() const`
`90`	`90`	`{`
`91`	`91`	`return "";`
`92`	`92`	`}`