From 1bbcfd17a9a78107e5f09d1287ae19459f31ab8f Mon Sep 17 00:00:00 2001
From: hjk <qthjk@ovi.com>
Date: Wed, 25 Jul 2012 17:19:44 +0200
Subject: [PATCH] madde: use IDevice base class for MaemoRemoteMounter

Change-Id: I01a0a735b129ce2aafda556a09002ed7a098c88a
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
---
 src/plugins/madde/maemoremotemounter.cpp |  5 +++--
 src/plugins/madde/maemoremotemounter.h   | 12 ++++--------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/plugins/madde/maemoremotemounter.cpp b/src/plugins/madde/maemoremotemounter.cpp
index 407f4035049..695a27e98f6 100644
--- a/src/plugins/madde/maemoremotemounter.cpp
+++ b/src/plugins/madde/maemoremotemounter.cpp
@@ -45,9 +45,10 @@
 
 #include <QTimer>
 
+using namespace ProjectExplorer;
+using namespace QSsh;
 using namespace Qt4ProjectManager;
 using namespace RemoteLinux;
-using namespace QSsh;
 using namespace Utils;
 
 namespace Madde {
@@ -67,7 +68,7 @@ MaemoRemoteMounter::~MaemoRemoteMounter()
 }
 
 void MaemoRemoteMounter::setConnection(SshConnection *connection,
-    const LinuxDeviceConfiguration::ConstPtr &devConf)
+    const IDevice::ConstPtr &devConf)
 {
     QTC_ASSERT(m_state == Inactive, return);
 
diff --git a/src/plugins/madde/maemoremotemounter.h b/src/plugins/madde/maemoremotemounter.h
index 5ae395f8786..42423afcefb 100644
--- a/src/plugins/madde/maemoremotemounter.h
+++ b/src/plugins/madde/maemoremotemounter.h
@@ -33,6 +33,7 @@
 
 #include "maemomountspecification.h"
 
+#include <projectexplorer/devicesupport/idevice.h>
 #include <utils/fileutils.h>
 
 #include <QList>
@@ -44,18 +45,13 @@
 QT_FORWARD_DECLARE_CLASS(QTimer)
 
 namespace QSsh {
-class SftpChannel;
 class SshConnection;
 class SshRemoteProcess;
 }
 
 namespace Utils { class PortList; }
 namespace Qt4ProjectManager { class Qt4BuildConfiguration; }
-
-namespace RemoteLinux {
-class LinuxDeviceConfiguration;
-class RemoteLinuxUsedPortsGatherer;
-}
+namespace RemoteLinux { class RemoteLinuxUsedPortsGatherer; }
 
 namespace Madde {
 namespace Internal {
@@ -69,7 +65,7 @@ public:
 
     // Must already be connected.
     void setConnection(QSsh::SshConnection *connection,
-        const QSharedPointer<const RemoteLinux::LinuxDeviceConfiguration> &devConf);
+        const ProjectExplorer::IDevice::ConstPtr &devConf);
 
     void setBuildConfiguration(const Qt4ProjectManager::Qt4BuildConfiguration *bc);
     void addMountSpecification(const MaemoMountSpecification &mountSpec,
@@ -124,7 +120,7 @@ private:
     };
 
     QSsh::SshConnection *m_connection;
-    QSharedPointer<const RemoteLinux::LinuxDeviceConfiguration> m_devConf;
+    ProjectExplorer::IDevice::ConstPtr m_devConf;
     QList<MountInfo> m_mountSpecs;
     QSharedPointer<QSsh::SshRemoteProcess> m_mountProcess;
     QSharedPointer<QSsh::SshRemoteProcess> m_unmountProcess;