From b8cb20ced67a4da445a1a5e1270ff40edf755077 Mon Sep 17 00:00:00 2001 From: nowrep Date: Fri, 27 Dec 2013 15:09:42 +0100 Subject: [PATCH] Revert "[Code] Use QDir::separator() instead of hardcoded "/"" This reverts commit 4f059a75ee0d3ad3ca4eaad020ce54af7cbdf45e. It is really not helpful at all (Qt will automatically use native separators) --- src/lib/app/mainapplication.cpp | 10 +++++----- src/lib/preferences/preferences.cpp | 2 +- src/lib/preferences/thememanager.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lib/app/mainapplication.cpp b/src/lib/app/mainapplication.cpp index 61370050e..7cb1f27d1 100644 --- a/src/lib/app/mainapplication.cpp +++ b/src/lib/app/mainapplication.cpp @@ -121,7 +121,7 @@ MainApplication::MainApplication(int &argc, char** argv) #if defined(QZ_WS_X11) && !defined(NO_SYSTEM_DATAPATH) DATADIR = USE_DATADIR; #else - DATADIR = qApp->applicationDirPath() + QDir::separator(); + DATADIR = qApp->applicationDirPath() + "/"; #endif #ifdef Q_OS_MAC @@ -250,11 +250,11 @@ MainApplication::MainApplication(int &argc, char** argv) m_activeProfil = PROFILEDIR + "profiles/default/"; } else { - m_activeProfil = PROFILEDIR + "profiles/" + settings.value("Profiles/startProfile", "default").toString() + QDir::separator(); + m_activeProfil = PROFILEDIR + "profiles/" + settings.value("Profiles/startProfile", "default").toString() + "/"; } } else { - m_activeProfil = PROFILEDIR + "profiles/" + startProfile + QDir::separator(); + m_activeProfil = PROFILEDIR + "profiles/" + startProfile + "/"; } ProfileUpdater u(m_activeProfil); @@ -685,7 +685,7 @@ void MainApplication::loadTheme(const QString &name) << THEMESDIR; foreach (const QString &path, themePaths) { - const QString &theme = path + name + QDir::separator(); + const QString &theme = path + name + "/"; if (QFile::exists(theme + "main.css")) { m_activeThemePath = theme; break; @@ -694,7 +694,7 @@ void MainApplication::loadTheme(const QString &name) if (m_activeThemePath.isEmpty()) { qWarning("Cannot load theme '%s'!", qPrintable(name)); - m_activeThemePath = THEMESDIR + DEFAULT_THEME_NAME + QDir::separator(); + m_activeThemePath = THEMESDIR + DEFAULT_THEME_NAME + "/"; } QFile cssFile(m_activeThemePath + "main.css"); diff --git a/src/lib/preferences/preferences.cpp b/src/lib/preferences/preferences.cpp index 13d5a11ee..307b19cd0 100644 --- a/src/lib/preferences/preferences.cpp +++ b/src/lib/preferences/preferences.cpp @@ -774,7 +774,7 @@ void Preferences::createProfile() return; } QDir dir(mApp->PROFILEDIR + "profiles/"); - if (QDir(dir.absolutePath() + QDir::separator() + name).exists()) { + if (QDir(dir.absolutePath() + "/" + name).exists()) { QMessageBox::warning(this, tr("Error!"), tr("This profile already exists!")); return; } diff --git a/src/lib/preferences/thememanager.cpp b/src/lib/preferences/thememanager.cpp index ab8ee73ab..819d0175e 100644 --- a/src/lib/preferences/thememanager.cpp +++ b/src/lib/preferences/thememanager.cpp @@ -50,7 +50,7 @@ ThemeManager::ThemeManager(QWidget* parent, Preferences* preferences) QDir dir(path); QStringList list = dir.entryList(QDir::AllDirs | QDir::NoDotAndDotDot); foreach (const QString &name, list) { - Theme themeInfo = parseTheme(dir.absoluteFilePath(name) + QDir::separator(), name); + Theme themeInfo = parseTheme(dir.absoluteFilePath(name) + "/", name); if (!themeInfo.isValid) { continue; }