RemoteLinux: Move functions from Maemo-specific to generic class.

Change-Id: If4884ffffd4398af7ba3ad1849399e8b722c1a49
Reviewed-on: http://codereview.qt.nokia.com/2164
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

1 files changed, 1 insertions, 40 deletions

diff --git a/src/plugins/remotelinux/maemoglobal.cpp b/src/plugins/remotelinux/maemoglobal.cpp
index dd33519a58..b2c649fd7f 100644
--- a/src/plugins/remotelinux/maemoglobal.cpp
+++ b/src/plugins/remotelinux/maemoglobal.cpp
@@ -34,13 +34,8 @@
 #include "maemoconstants.h"
 #include "maemoqemumanager.h"
 
-#include <projectexplorer/projectexplorerconstants.h>
-
-#include <coreplugin/filemanager.h>
-#include <extensionsystem/pluginmanager.h>
 #include <qt4projectmanager/qt4projectmanagerconstants.h>
-#include <qtsupport/qtversionmanager.h>
-#include <qt4projectmanager/qt4target.h>
+#include <qtsupport/baseqtversion.h>
 #include <remotelinux/linuxdeviceconfiguration.h>
 #include <remotelinux/remotelinux_constants.h>
 #include <utils/environment.h>
@@ -96,29 +91,6 @@ bool MaemoGlobal::isValidMeegoQtVersion(const QString &qmakePath)
     return isValidMaemoQtVersion(qmakePath, QLatin1String(MeeGoOsType));
 }
 
-bool MaemoGlobal::isLinuxQt(const QtSupport::BaseQtVersion *qtVersion)
-{
-    if (!qtVersion)
-        return false;
-    const QList<ProjectExplorer::Abi> &abis = qtVersion->qtAbis();
-    foreach (const ProjectExplorer::Abi &abi, abis) {
-        if (abi.os() == ProjectExplorer::Abi::LinuxOS)
-            return true;
-    }
-    return false;
-}
-
-bool MaemoGlobal::hasLinuxQt(const ProjectExplorer::Target *target)
-{
-    const Qt4BaseTarget * const qtTarget
-        = qobject_cast<const Qt4BaseTarget *>(target);
-    if (!qtTarget)
-        return false;
-    const Qt4BuildConfiguration * const bc
-        = qtTarget->activeBuildConfiguration();
-    return bc && isLinuxQt(bc->qtVersion());
-}
-
 bool MaemoGlobal::isValidMaemoQtVersion(const QString &qmakePath, const QString &osType)
 {
     if (MaemoGlobal::osType(qmakePath) != osType)
@@ -335,16 +307,5 @@ QStringList MaemoGlobal::targetArgs(const QString &qmakePath, bool useTarget)
     return args;
 }
 
-QString MaemoGlobal::osTypeToString(const QString &osType)
-{
-    const QList<ILinuxDeviceConfigurationFactory *> &factories
-        = ExtensionSystem::PluginManager::instance()->getObjects<ILinuxDeviceConfigurationFactory>();
-    foreach (const ILinuxDeviceConfigurationFactory * const factory, factories) {
-        if (factory->supportsOsType(osType))
-            return factory->displayNameForOsType(osType);
-    }
-    return tr("Unknown OS");
-}
-
 } // namespace Internal
 } // namespace RemoteLinux