Show filepath using native separators (backslash on Windows)

codecruisedor · Jul 4, 2023 · 1f4647d · 1f4647d
1 parent 0b1c292
commit 1f4647d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/src/framework/global/io/path.cpp b/src/framework/global/io/path.cpp
@@ -21,6 +21,10 @@
  */
 #include "path.h"
 
+#ifndef NO_QT_SUPPORT
+#include <QDir>
+#endif
+
 #include "stringutils.h"
 #include "fileinfo.h"
 
@@ -273,3 +277,12 @@ std::string mu::io::pathsToString(const paths_t& ps, const std::string& delim)
 
     return result;
 }
+
+path_t mu::io::toNativeSeparators(const path_t& path)
+{
+#ifndef NO_QT_SUPPORT
+    return QDir::toNativeSeparators(path.toQString());
+#else
+    return path;
+#endif
+}
diff --git a/src/framework/global/io/path.h b/src/framework/global/io/path.h
@@ -109,6 +109,8 @@ bool isAbsolute(const path_t& path);
 bool isAllowedFileName(const path_t& fn);
 path_t escapeFileName(const path_t& fn);
 
+path_t toNativeSeparators(const path_t& path);
+
 paths_t pathsFromString(const std::string& str, const std::string& delim = ";");
 std::string pathsToString(const paths_t& ps, const std::string& delim = ";");
 }

diff --git a/src/project/internal/projectactionscontroller.cpp b/src/project/internal/projectactionscontroller.cpp
@@ -1410,7 +1410,7 @@ bool ProjectActionsController::askIfUserAgreesToOpenProjectWithIncompatibleVersi
 
 void ProjectActionsController::warnFileTooNew(const io::path_t& filepath)
 {
-    interactive()->error(qtrc("project", "Cannot read file %1").arg(filepath.toQString()).toStdString(),
+    interactive()->error(qtrc("project", "Cannot read file %1").arg(io::toNativeSeparators(filepath).toQString()).toStdString(),
                          trc("project", "This file was saved using a newer version of MuseScore. "
                                         "Please visit <a href=\"https://musescore.org\">musescore.org</a> to obtain the latest version."));
 }