From 54471bc3f4ce747dd4ea7d48af363b30c49bb42e Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@digia.com>
Date: Mon, 24 Feb 2014 12:00:48 +0100
Subject: [PATCH] Use ICore::userResourcePath() where applicable.
Change-Id: I9ac55c49af87d99609281f3f3d886b149a2fbbac
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
---
src/plugins/projectexplorer/devicesupport/devicemanager.cpp | 6 +++---
src/plugins/qnx/blackberrydeviceconnectionmanager.cpp | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
index 766de95002b..7491333504b 100644
--- a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
@@ -141,7 +141,7 @@ void DeviceManager::load()
// Only create writer now: We do not want to save before the settings were read!
d->writer = new Utils::PersistentSettingsWriter(
- settingsFilePath(QLatin1String("/qtcreator/devices.xml")),
+ settingsFilePath(QLatin1String("/devices.xml")),
QLatin1String("QtCreatorDevices"));
Utils::PersistentSettingsReader reader;
@@ -151,7 +151,7 @@ void DeviceManager::load()
sdkDevices = fromMap(reader.restoreValues().value(QLatin1String(DeviceManagerKey)).toMap());
// read devices file from user settings path
QList<IDevice::Ptr> userDevices;
- if (reader.load(settingsFilePath(QLatin1String("/qtcreator/devices.xml"))))
+ if (reader.load(settingsFilePath(QLatin1String("/devices.xml"))))
userDevices = fromMap(reader.restoreValues().value(QLatin1String(DeviceManagerKey)).toMap());
// Insert devices into the model. Prefer the higher device version when there are multiple
// devices with the same id.
@@ -215,7 +215,7 @@ QVariantMap DeviceManager::toMap() const
Utils::FileName DeviceManager::settingsFilePath(const QString &extension)
{
- return Utils::FileName::fromString(QFileInfo(Core::ICore::settings()->fileName()).absolutePath() + extension);
+ return Utils::FileName::fromString(Core::ICore::userResourcePath() + extension);
}
Utils::FileName DeviceManager::systemSettingsFilePath(const QString &deviceFileRelativePath)
diff --git a/src/plugins/qnx/blackberrydeviceconnectionmanager.cpp b/src/plugins/qnx/blackberrydeviceconnectionmanager.cpp
index 80d76b1eba7..a24e3657876 100644
--- a/src/plugins/qnx/blackberrydeviceconnectionmanager.cpp
+++ b/src/plugins/qnx/blackberrydeviceconnectionmanager.cpp
@@ -187,7 +187,7 @@ void BlackBerryDeviceConnectionManager::disconnectDevice(const ProjectExplorer::
*/
const QString BlackBerryDeviceConnectionManager::privateKeyPath() const
{
- return QFileInfo(Core::ICore::settings()->fileName()).absolutePath() + QLatin1String("/qtcreator/qnx/id_rsa");
+ return Core::ICore::userResourcePath() + QLatin1String("/qnx/id_rsa");
}
/*!
--
GitLab