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

13
src/plugins/android/androidconfigurations.cpp
View File

@@ -83,10 +83,10 @@ namespace {
const QLatin1String jarsignerName("jarsigner");
const QLatin1String changeTimeStamp("ChangeTimeStamp");
static QString settingsFileName()
static Utils::FileName settingsFileName()
{
return QString::fromLatin1("%1/qtcreator/android.xml").arg(
QFileInfo(Core::ICore::settings(QSettings::SystemScope)->fileName()).absolutePath());
return Utils::FileName::fromString(QString::fromLatin1("%1/qtcreator/android.xml")
.arg(QFileInfo(Core::ICore::settings(QSettings::SystemScope)->fileName()).absolutePath()));
}
bool androidDevicesLessThan(const AndroidDeviceInfo &dev1, const AndroidDeviceInfo &dev2)
@@ -142,8 +142,9 @@ AndroidConfig::AndroidConfig(const QSettings &settings)
// user settings
PersistentSettingsReader reader;
if (reader.load(settingsFileName())
&& settings.value(changeTimeStamp).toInt() != QFileInfo(settingsFileName()).lastModified().toMSecsSinceEpoch() / 1000) {
Utils::FileName fn = settingsFileName();
if (reader.load(fn)
&& settings.value(changeTimeStamp).toInt() != fn.toFileInfo().lastModified().toMSecsSinceEpoch() / 1000) {
// persisten settings
sdkLocation = FileName::fromString(reader.restoreValue(SDKLocationKey).toString());
ndkLocation = FileName::fromString(reader.restoreValue(NDKLocationKey).toString());
@@ -181,7 +182,7 @@ AndroidConfig::AndroidConfig()
void AndroidConfig::save(QSettings &settings) const
{
QFileInfo fileInfo(settingsFileName());
QFileInfo fileInfo(settingsFileName().toFileInfo());
if (fileInfo.exists())
settings.setValue(changeTimeStamp, fileInfo.lastModified().toMSecsSinceEpoch() / 1000);