From fea1d3558bbff8896f3f152e21b31181ea3bc679 Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 24 Nov 2021 19:11:34 +0100 Subject: [PATCH] App: remove code to copy user config from old to new location --- src/App/Application.cpp | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/App/Application.cpp b/src/App/Application.cpp index 4e8b043821..714bd83af9 100644 --- a/src/App/Application.cpp +++ b/src/App/Application.cpp @@ -2893,6 +2893,7 @@ QString getUserHome() * Returns a directory location where persistent data shared across applications can be stored. * This method returns the old non-XDG-compliant root path where to store config files and application data. */ +#if defined(FC_OS_WIN32) QString getOldGenericDataLocation(QString home) { #if defined(FC_OS_WIN32) @@ -2908,6 +2909,7 @@ QString getOldGenericDataLocation(QString home) return home; } +#endif /*! * \brief getSubDirectories @@ -3119,17 +3121,6 @@ void Application::ExtractUserPath() boost::filesystem::path config = findPath(configHome, customHome, subdirs, true); mConfig["UserConfigPath"] = pathToString(config) + PATHSEP; - std::vector oldsubdirs; - getOldDataLocation(mConfig, oldsubdirs); - boost::filesystem::path appData = findPath(getOldGenericDataLocation(homePath), customData, oldsubdirs, false); - - // If in new location user.cfg doesn't exist but in the old location then copy it - boost::filesystem::path oldUsercfg = appData / "user.cfg"; - boost::filesystem::path newUsercfg = config / "user.cfg"; - if (boost::filesystem::exists(oldUsercfg) && !boost::filesystem::exists(newUsercfg)) { - boost::filesystem::copy(oldUsercfg, newUsercfg); - } - // User cache path //