RemoteLinux: Remote environment refactoring.

[qt-creator-jp/qt-creator-jp.git] / src / plugins / remotelinux / maemoglobal.cpp

diff --git a/src/plugins/remotelinux/maemoglobal.cpp b/src/plugins/remotelinux/maemoglobal.cpp
index dd33519..d65349b 100644 (file)
--- 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)
@@ -170,16 +142,6 @@ QString MaemoGlobal::remoteSudo(const QString &osType, const QString &uname)
     return QString(); // Using sudo would open a can of worms.
 }
 
-QString MaemoGlobal::remoteCommandPrefix(const QString &osType)
-{
-    QString prefix = QString::fromLocal8Bit("%1; ").arg(remoteSourceProfilesCommand());
-    if (osType != QLatin1String(Maemo5OsType)
-            && osType != QLatin1String(HarmattanOsType)) {
-        prefix += QLatin1String("DISPLAY=:0.0 ");
-    }
-    return prefix;
-}
-
 QString MaemoGlobal::remoteSourceProfilesCommand()
 {
     const QList<QByteArray> profiles = QList<QByteArray>() << "/etc/profile"
@@ -190,11 +152,6 @@ QString MaemoGlobal::remoteSourceProfilesCommand()
     return QString::fromAscii(remoteCall);
 }
 
-QString MaemoGlobal::deviceConfigurationName(const LinuxDeviceConfiguration::ConstPtr &devConf)
-{
-    return devConf ? devConf->name() : tr("(No device)");
-}
-
 PortList MaemoGlobal::freePorts(const LinuxDeviceConfiguration::ConstPtr &devConf,
     const QtSupport::BaseQtVersion *qtVersion)
 {
@@ -335,16 +292,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