Commit 54471bc3 authored by Christian Kandeler's avatar Christian Kandeler

Use ICore::userResourcePath() where applicable.

Change-Id: I9ac55c49af87d99609281f3f3d886b149a2fbbac
Reviewed-by: default avatarEike Ziller <eike.ziller@digia.com>
parent b3062d79
...@@ -141,7 +141,7 @@ void DeviceManager::load() ...@@ -141,7 +141,7 @@ void DeviceManager::load()
// Only create writer now: We do not want to save before the settings were read! // Only create writer now: We do not want to save before the settings were read!
d->writer = new Utils::PersistentSettingsWriter( d->writer = new Utils::PersistentSettingsWriter(
settingsFilePath(QLatin1String("/qtcreator/devices.xml")), settingsFilePath(QLatin1String("/devices.xml")),
QLatin1String("QtCreatorDevices")); QLatin1String("QtCreatorDevices"));
Utils::PersistentSettingsReader reader; Utils::PersistentSettingsReader reader;
...@@ -151,7 +151,7 @@ void DeviceManager::load() ...@@ -151,7 +151,7 @@ void DeviceManager::load()
sdkDevices = fromMap(reader.restoreValues().value(QLatin1String(DeviceManagerKey)).toMap()); sdkDevices = fromMap(reader.restoreValues().value(QLatin1String(DeviceManagerKey)).toMap());
// read devices file from user settings path // read devices file from user settings path
QList<IDevice::Ptr> userDevices; 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()); userDevices = fromMap(reader.restoreValues().value(QLatin1String(DeviceManagerKey)).toMap());
// Insert devices into the model. Prefer the higher device version when there are multiple // Insert devices into the model. Prefer the higher device version when there are multiple
// devices with the same id. // devices with the same id.
...@@ -215,7 +215,7 @@ QVariantMap DeviceManager::toMap() const ...@@ -215,7 +215,7 @@ QVariantMap DeviceManager::toMap() const
Utils::FileName DeviceManager::settingsFilePath(const QString &extension) 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) Utils::FileName DeviceManager::systemSettingsFilePath(const QString &deviceFileRelativePath)
......
...@@ -187,7 +187,7 @@ void BlackBerryDeviceConnectionManager::disconnectDevice(const ProjectExplorer:: ...@@ -187,7 +187,7 @@ void BlackBerryDeviceConnectionManager::disconnectDevice(const ProjectExplorer::
*/ */
const QString BlackBerryDeviceConnectionManager::privateKeyPath() const 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");
} }
/*! /*!
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment