Fix warnings

MSVC warns about pm being unused (because settings() is static)

Change-Id: I750804cc52edc71649545bc03f798a6802c87c7d
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: hjk <qthjk@ovi.com>

5 files changed, 7 insertions, 10 deletions

diff --git a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
index d9efc0bf1d..0dfa96e186 100644
--- a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
@@ -222,8 +222,7 @@ QVariantMap DeviceManager::toMap() const
 
 QString DeviceManager::settingsFilePath(const QString &extension)
 {
-    ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
-    return QFileInfo(pm->settings()->fileName()).absolutePath() + extension;
+    return QFileInfo(ExtensionSystem::PluginManager::settings()->fileName()).absolutePath() + extension;
 }
 
 void DeviceManager::addDevice(const IDevice::Ptr &_device)
diff --git a/src/plugins/projectexplorer/devicesupport/localprocesslist.cpp b/src/plugins/projectexplorer/devicesupport/localprocesslist.cpp
index 0497c6b0c7..e1896e897e 100644
--- a/src/plugins/projectexplorer/devicesupport/localprocesslist.cpp
+++ b/src/plugins/projectexplorer/devicesupport/localprocesslist.cpp
@@ -192,6 +192,8 @@ void LocalProcessList::doKillProcess(const DeviceProcess &process)
     else
         m_error.clear();
     QTimer::singleShot(0, this, SLOT(reportDelayedKillStatus()));
+#else
+    Q_UNUSED(process);
 #endif
 }
 
diff --git a/src/plugins/projectexplorer/profilemanager.cpp b/src/plugins/projectexplorer/profilemanager.cpp
index 2c2ad231e6..9bd39cce22 100644
--- a/src/plugins/projectexplorer/profilemanager.cpp
+++ b/src/plugins/projectexplorer/profilemanager.cpp
@@ -61,8 +61,7 @@ using Utils::PersistentSettingsReader;
 
 static QString settingsFileName()
 {
-    ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
-    QFileInfo settingsLocation(pm->settings()->fileName());
+    QFileInfo settingsLocation(ExtensionSystem::PluginManager::settings()->fileName());
     return settingsLocation.absolutePath() + QLatin1String(PROFILE_FILENAME);
 }
 
diff --git a/src/plugins/projectexplorer/settingsaccessor.cpp b/src/plugins/projectexplorer/settingsaccessor.cpp
index 9874035146..67850cebfa 100644
--- a/src/plugins/projectexplorer/settingsaccessor.cpp
+++ b/src/plugins/projectexplorer/settingsaccessor.cpp
@@ -2624,8 +2624,7 @@ static QString maddeRoot(const QString &qmakePath)
 
 void Version11Handler::parseQtversionFile()
 {
-    ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
-    QFileInfo settingsLocation(pm->settings()->fileName());
+    QFileInfo settingsLocation(ExtensionSystem::PluginManager::settings()->fileName());
     QString fileName = settingsLocation.absolutePath() + QLatin1String("/qtversion.xml");
     Utils::PersistentSettingsReader reader;
     if (!reader.load(fileName)) {
@@ -2669,8 +2668,7 @@ void Version11Handler::parseQtversionFile()
 
 void Version11Handler::parseToolChainFile()
 {
-    ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
-    QFileInfo settingsLocation(pm->settings()->fileName());
+    QFileInfo settingsLocation(ExtensionSystem::PluginManager::settings()->fileName());
     QString fileName = settingsLocation.absolutePath() + QLatin1String("/toolChains.xml");
     Utils::PersistentSettingsReader reader;
     if (!reader.load(fileName)) {
diff --git a/src/plugins/projectexplorer/toolchainmanager.cpp b/src/plugins/projectexplorer/toolchainmanager.cpp
index 2b86f2f051..ab9588dee1 100644
--- a/src/plugins/projectexplorer/toolchainmanager.cpp
+++ b/src/plugins/projectexplorer/toolchainmanager.cpp
@@ -58,8 +58,7 @@ using Utils::PersistentSettingsReader;
 
 static QString settingsFileName(const QString &path)
 {
-    ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
-    QFileInfo settingsLocation(pm->settings()->fileName());
+    QFileInfo settingsLocation(ExtensionSystem::PluginManager::settings()->fileName());
     return settingsLocation.absolutePath() + path;
 }