From ebdde9646ab98ddfe570c68ac4d1a4f706c6c2d6 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Tue, 24 Jan 2023 07:19:44 +0100 Subject: [PATCH] use native separators in some of "get-folder" methods --- src/librssguard/miscellaneous/application.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/librssguard/miscellaneous/application.cpp b/src/librssguard/miscellaneous/application.cpp index 4631089b4..994bb6500 100644 --- a/src/librssguard/miscellaneous/application.cpp +++ b/src/librssguard/miscellaneous/application.cpp @@ -470,7 +470,8 @@ QString Application::configFolder() const { QString Application::userDataAppFolder() const { // In "app" folder, we would like to separate all user data into own subfolder, // therefore stick to "data" folder in this mode. - return applicationDirPath() + QDir::separator() + QSL("data4"); + return QDir::toNativeSeparators(applicationDirPath() + QDir::separator() + QSL("data4")); + ; } QString Application::userDataFolder() { @@ -498,12 +499,16 @@ QStringList Application::replaceDataUserDataFolderPlaceholder(QStringList texts) } QString Application::userDataHomeFolder() const { + QString pth; + #if defined(Q_OS_ANDROID) - return IOFactory::getSystemFolder(QStandardPaths::GenericDataLocation) + QDir::separator() + QSL(APP_NAME) + - QSL(" 4"); + return pth = IOFactory::getSystemFolder(QStandardPaths::GenericDataLocation) + QDir::separator() + QSL(APP_NAME) + + QSL(" 4"); #else - return configFolder() + QDir::separator() + QSL(APP_NAME) + QSL(" 4"); + return pth = configFolder() + QDir::separator() + QSL(APP_NAME) + QSL(" 4"); #endif + + return QDir::toNativeSeparators(pth); } QString Application::tempFolder() const {