feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Replace some QStrings with Utils::FileName

Browse Source 
Change-Id: Ia96963b90788250b4bc6bc89c2bb697de103535f
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Tobias Hunger
2012-08-20 18:52:20 +02:00
parent a03c2d2f3d
commit 61e95e9a99
15 changed files with 83 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/projectexplorer/toolchainmanager.cpp
View File

@@ -56,10 +56,10 @@ static const char LEGACY_TOOLCHAIN_FILENAME[] = "/toolChains.xml";
using Utils::PersistentSettingsWriter;
using Utils::PersistentSettingsReader;
static QString settingsFileName(const QString &path)
static Utils::FileName settingsFileName(const QString &path)
{
QFileInfo settingsLocation(ExtensionSystem::PluginManager::settings()->fileName());
return settingsLocation.absolutePath() + path;
return Utils::FileName::fromString(settingsLocation.absolutePath() + path);
}
namespace ProjectExplorer {
@@ -136,7 +136,7 @@ void ToolChainManager::restoreToolChains()
// read all tool chains from SDK
QFileInfo systemSettingsFile(Core::ICore::settings(QSettings::SystemScope)->fileName());
QList<ToolChain *> readTcs =
restoreToolChains(systemSettingsFile.absolutePath() + QLatin1String(LEGACY_TOOLCHAIN_FILENAME));
restoreToolChains(Utils::FileName::fromString(systemSettingsFile.absolutePath() + QLatin1String(LEGACY_TOOLCHAIN_FILENAME)));
// make sure we mark these as autodetected!
foreach (ToolChain *tc, readTcs)
tc->setAutoDetected(true);
@@ -146,8 +146,8 @@ void ToolChainManager::restoreToolChains()
// read all tool chains from user file.
// Read legacy settings once and keep them around...
QString fileName = settingsFileName(QLatin1String(TOOLCHAIN_FILENAME));
if (!QFileInfo(fileName).exists())
Utils::FileName fileName = settingsFileName(QLatin1String(TOOLCHAIN_FILENAME));
if (!fileName.toFileInfo().exists())
fileName = settingsFileName(QLatin1String(LEGACY_TOOLCHAIN_FILENAME));
readTcs = restoreToolChains(fileName);
@@ -222,7 +222,7 @@ void ToolChainManager::saveToolChains()
// Do not save default debuggers! Those are set by the SDK!
}
QList<ToolChain *> ToolChainManager::restoreToolChains(const QString &fileName)
QList<ToolChain *> ToolChainManager::restoreToolChains(const Utils::FileName &fileName)
{
QList<ToolChain *> result;
@@ -272,7 +272,7 @@ QList<ToolChain *> ToolChainManager::restoreToolChains(const QString &fileName)
if (!restored)
qWarning("Warning: Unable to restore compiler '%s' stored in %s.",
qPrintable(ToolChainFactory::idFromMap(tcMap)),
qPrintable(QDir::toNativeSeparators(fileName)));
qPrintable(fileName.toUserOutput()));
}
return result;
}