Fixed compile error - conflicts between global/types/version and glob…

…al/version Renamed one of them to MUVersion as in master
musescore · Mar 13, 2023 · b65559e · b65559e
1 parent dbe7c6d
commit b65559e
Show file tree

Hide file tree

Showing 13 changed files with 39 additions and 39 deletions.
diff --git a/src/appshell/appshell.cpp b/src/appshell/appshell.cpp
@@ -38,7 +38,7 @@
 
 #include "modularity/ioc.h"
 #include "ui/internal/uiengine.h"
-#include "version.h"
+#include "muversion.h"
 
 #include "commandlinecontroller.h"
 
@@ -75,7 +75,7 @@ int AppShell::run(int argc, char** argv)
 #endif
 
     const char* appName;
-    if (framework::Version::unstable()) {
+    if (framework::MUVersion::unstable()) {
         appName  = "MuseScore4Development";
     } else {
         appName  = "MuseScore4";
@@ -108,7 +108,7 @@ int AppShell::run(int argc, char** argv)
     QCoreApplication::setApplicationName(appName);
     QCoreApplication::setOrganizationName("MuseScore");
     QCoreApplication::setOrganizationDomain("musescore.org");
-    QCoreApplication::setApplicationVersion(QString::fromStdString(framework::Version::fullVersion()));
+    QCoreApplication::setApplicationVersion(QString::fromStdString(framework::MUVersion::fullVersion()));
 
 #if !defined(Q_OS_WIN) && !defined(Q_OS_DARWIN) && !defined(Q_OS_WASM)
     // Any OS that uses Freedesktop.org Desktop Entry Specification (e.g. Linux, BSD)

diff --git a/src/appshell/commandlinecontroller.cpp b/src/appshell/commandlinecontroller.cpp
@@ -22,7 +22,7 @@
 #include "commandlinecontroller.h"
 
 #include "log.h"
-#include "global/version.h"
+#include "global/muversion.h"
 #include "config.h"
 
 using namespace mu::appshell;
@@ -386,11 +386,11 @@ CommandLineController::ConverterTask CommandLineController::converterTask() cons
 
 void CommandLineController::printLongVersion() const
 {
-    if (Version::unstable()) {
+    if (MUVersion::unstable()) {
         printf("MuseScore: Music Score Editor\nUnstable Prerelease for Version %s; Build %s\n",
-               Version::version().c_str(), Version::revision().c_str());
+               MUVersion::version().c_str(), MUVersion::revision().c_str());
     } else {
         printf("MuseScore: Music Score Editor; Version %s; Build %s\n",
-               Version::version().c_str(), Version::revision().c_str());
+               MUVersion::version().c_str(), MUVersion::revision().c_str());
     }
 }
diff --git a/src/appshell/view/aboutmodel.cpp b/src/appshell/view/aboutmodel.cpp
@@ -22,7 +22,7 @@
 #include "aboutmodel.h"
 
 #include "translation.h"
-#include "version.h"
+#include "muversion.h"
 #include "config.h"
 
 #include <QApplication>
@@ -39,7 +39,7 @@ AboutModel::AboutModel(QObject* parent)
 QString AboutModel::museScoreVersion() const
 {
     QString version = QString::fromStdString(configuration()->museScoreVersion());
-    return mu::framework::Version::unstable()
+    return mu::framework::MUVersion::unstable()
            ? qtrc("appshell/about", "Unstable prerelease for %1").arg(version)
            : version;
 }

diff --git a/src/appshell/view/internal/splashscreen.cpp b/src/appshell/view/internal/splashscreen.cpp
@@ -28,7 +28,7 @@
 #include <QSvgRenderer>
 
 #include "translation.h"
-#include "version.h"
+#include "muversion.h"
 
 using namespace mu::appshell;
 
@@ -109,7 +109,7 @@ void SplashScreen::draw(QPainter* painter)
 
     painter->drawText(websiteRect.translated(0.0, -websiteBoundingRect.height() - versionNumberSpacing),
                       Qt::AlignBottom | Qt::AlignRight | Qt::TextDontClip,
-                      qtrc("appshell", "Version %1").arg(QString::fromStdString(framework::Version::fullVersion())));
+                      qtrc("appshell", "Version %1").arg(QString::fromStdString(framework::MUVersion::fullVersion())));
 }
 
 void SplashScreen::setSize(const QSize& size)

diff --git a/src/converter/internal/compat/backendapi.cpp b/src/converter/internal/compat/backendapi.cpp
@@ -39,7 +39,7 @@
 #include "backendjsonwriter.h"
 #include "notationmeta.h"
 
-#include "version.h"
+#include "muversion.h"
 #include "log.h"
 
 using namespace mu;
@@ -457,7 +457,7 @@ Ret BackendApi::devInfo(const notation::INotationPtr notation, BackendJsonWriter
     TRACEFUNC
 
     QJsonObject infoObj;
-    infoObj["version"] = QString::fromStdString(framework::Version::fullVersion() + "(" + framework::Version::revision() + ")");
+    infoObj["version"] = QString::fromStdString(framework::MUVersion::fullVersion() + "(" + framework::MUVersion::revision() + ")");
 
     jsonWriter.addKey(DEV_INFO_NAME.c_str());
     jsonWriter.addValue(QJsonDocument(infoObj).toJson(), addSeparator, true);

diff --git a/src/diagnostics/internal/crashhandler/crashhandler.cpp b/src/diagnostics/internal/crashhandler/crashhandler.cpp
@@ -29,7 +29,7 @@
 #include <thirdparty/google_crashpad_client/client/settings.h>
 
 #include "log.h"
-#include "global/version.h"
+#include "global/muversion.h"
 
 using namespace mu::diagnostics;
 using namespace crashpad;
@@ -62,7 +62,7 @@ bool CrashHandler::start(const io::path_t& handlerFilePath, const io::path_t& du
 
     // Optional annotations passed via --annotations to the handler
     std::map<std::string, std::string> annotations = {
-        { "sentry[release]", framework::Version::fullVersion() }
+        { "sentry[release]", framework::MUVersion::fullVersion() }
     };
     // Optional arguments to pass to the handler
     std::vector<std::string> arguments;

diff --git a/src/framework/global/CMakeLists.txt b/src/framework/global/CMakeLists.txt
@@ -40,8 +40,8 @@ set(MODULE_SRC
     ${CMAKE_CURRENT_LIST_DIR}/logremover.h
     ${CMAKE_CURRENT_LIST_DIR}/dataformatter.cpp
     ${CMAKE_CURRENT_LIST_DIR}/dataformatter.h
-    ${CMAKE_CURRENT_LIST_DIR}/version.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/version.h
+    ${CMAKE_CURRENT_LIST_DIR}/muversion.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/muversion.h
     ${CMAKE_CURRENT_LIST_DIR}/stringutils.cpp
     ${CMAKE_CURRENT_LIST_DIR}/stringutils.h
     ${CMAKE_CURRENT_LIST_DIR}/ptrutils.h

diff --git a/src/framework/global/globalmodule.cpp b/src/framework/global/globalmodule.cpp
@@ -27,7 +27,7 @@
 #include "log.h"
 #include "logremover.h"
 #include "thirdparty/haw_logger/logger/logdefdest.h"
-#include "version.h"
+#include "muversion.h"
 #include "config.h"
 
 #include "internal/application.h"
@@ -110,7 +110,7 @@ void GlobalModule::onPreInit(const IApplication::RunMode& mode)
 #endif
 
     LOGI() << "log path: " << logFile->filePath();
-    LOGI() << "=== Started MuseScore " << framework::Version::fullVersion() << ", build number " << BUILD_NUMBER << " ===";
+    LOGI() << "=== Started MuseScore " << framework::MUVersion::fullVersion() << ", build number " << BUILD_NUMBER << " ===";
 
     //! --- Setup profiler ---
     using namespace haw::profiler;

diff --git a/src/framework/global/internal/globalconfiguration.cpp b/src/framework/global/internal/globalconfiguration.cpp
@@ -28,7 +28,7 @@
 
 #include "config.h"
 #include "settings.h"
-#include "version.h"
+#include "muversion.h"
 #include "log.h"
 
 using namespace mu;
@@ -42,7 +42,7 @@ static const std::string MUSESCORE_URL("https://www.musescore.org/");
 
 void GlobalConfiguration::init()
 {
-    settings()->setDefaultValue(DEV_MODE_ENABLED_KEY, Val(Version::unstable()));
+    settings()->setDefaultValue(DEV_MODE_ENABLED_KEY, Val(MUVersion::unstable()));
 }
 
 io::path_t GlobalConfiguration::appBinPath() const

diff --git a/src/framework/global/version.cpp → src/framework/global/muversion.cpp b/src/framework/global/version.cpp → src/framework/global/muversion.cpp
@@ -19,7 +19,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-#include "version.h"
+#include "muversion.h"
 
 #include <array>
 
@@ -60,7 +60,7 @@ static constexpr version_components_t version_components = parse_result.first;
 
 static_assert(parse_result.second, "Invalid VERSION");
 
-bool Version::unstable()
+bool MUVersion::unstable()
 {
 #ifdef MSCORE_UNSTABLE
     return true;
@@ -69,12 +69,12 @@ bool Version::unstable()
 #endif
 }
 
-std::string Version::version()
+std::string MUVersion::version()
 {
     return versionString;
 }
 
-std::string Version::fullVersion()
+std::string MUVersion::fullVersion()
 {
     std::string version(versionString);
     std::string versionLabel(VERSION_LABEL);
@@ -85,22 +85,22 @@ std::string Version::fullVersion()
     return version;
 }
 
-std::string Version::revision()
+std::string MUVersion::revision()
 {
     return MUSESCORE_REVISION;
 }
 
-int Version::majorVersion()
+int MUVersion::majorVersion()
 {
     return version_components.at(0);
 }
 
-int Version::minorVersion()
+int MUVersion::minorVersion()
 {
     return version_components.at(1);
 }
 
-int Version::patchVersion()
+int MUVersion::patchVersion()
 {
     return version_components.at(2);
 }
diff --git a/src/framework/global/version.h → src/framework/global/muversion.h b/src/framework/global/version.h → src/framework/global/muversion.h
@@ -19,13 +19,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef MU_FRAMEWORK_VERSION_H
-#define MU_FRAMEWORK_VERSION_H
+#ifndef MU_FRAMEWORK_MUVERSION_H
+#define MU_FRAMEWORK_MUVERSION_H
 
 #include <string>
 
 namespace mu::framework {
-class Version
+class MUVersion
 {
 public:
     static bool unstable();
@@ -39,4 +39,4 @@ class Version
 };
 }
 
-#endif // MU_FRAMEWORK_VERSION_H
+#endif // MU_FRAMEWORK_MUVERSION_H
diff --git a/src/plugins/api/qmlplugin.cpp b/src/plugins/api/qmlplugin.cpp
@@ -22,7 +22,7 @@
 
 #include "qmlplugin.h"
 
-#include "version.h"
+#include "muversion.h"
 
 #include "engraving/libmscore/mscore.h"
 
@@ -149,17 +149,17 @@ int QmlPlugin::mscoreVersion() const
 
 int QmlPlugin::mscoreMajorVersion() const
 {
-    return framework::Version::majorVersion();
+    return framework::MUVersion::majorVersion();
 }
 
 int QmlPlugin::mscoreMinorVersion() const
 {
-    return framework::Version::minorVersion();
+    return framework::MUVersion::minorVersion();
 }
 
 int QmlPlugin::mscoreUpdateVersion() const
 {
-    return framework::Version::patchVersion();
+    return framework::MUVersion::patchVersion();
 }
 
 qreal QmlPlugin::mscoreDPI() const

diff --git a/src/workspace/internal/workspace.cpp b/src/workspace/internal/workspace.cpp
@@ -21,7 +21,7 @@
  */
 #include "workspace.h"
 
-#include "global/version.h"
+#include "global/muversion.h"
 #include "multiinstances/resourcelockguard.h"
 
 #include "workspacefile.h"
@@ -107,7 +107,7 @@ Ret Workspace::load()
 Ret Workspace::save()
 {
     mi::WriteResourceLockGuard resource_guard(multiInstancesProvider(), fileResourceName());
-    m_file.setMeta("app_version", Val(Version::version()));
+    m_file.setMeta("app_version", Val(MUVersion::version()));
     return m_file.save();
 }