feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

madde: use IDevice base class for MaemoRemoteMounter

Browse Source 
Change-Id: I01a0a735b129ce2aafda556a09002ed7a098c88a
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
This commit is contained in:
hjk
2012-07-25 17:19:44 +02:00
committed by Christian Kandeler
parent ba6bd10312
commit 1bbcfd17a9
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/madde/maemoremotemounter.cpp
View File

@@ -45,9 +45,10 @@
#include <QTimer> #include <QTimer>
using namespace ProjectExplorer;
using namespace QSsh;
using namespace Qt4ProjectManager; using namespace Qt4ProjectManager;
using namespace RemoteLinux; using namespace RemoteLinux;
using namespace QSsh;
using namespace Utils; using namespace Utils;
namespace Madde { namespace Madde {
@@ -67,7 +68,7 @@ MaemoRemoteMounter::~MaemoRemoteMounter()
} }
void MaemoRemoteMounter::setConnection(SshConnection *connection, void MaemoRemoteMounter::setConnection(SshConnection *connection,
const LinuxDeviceConfiguration::ConstPtr &devConf) const IDevice::ConstPtr &devConf)
{ {
QTC_ASSERT(m_state == Inactive, return); QTC_ASSERT(m_state == Inactive, return);

12
src/plugins/madde/maemoremotemounter.h
View File

@@ -33,6 +33,7 @@
#include "maemomountspecification.h" #include "maemomountspecification.h"
#include <projectexplorer/devicesupport/idevice.h>
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <QList> #include <QList>
@@ -44,18 +45,13 @@
QT_FORWARD_DECLARE_CLASS(QTimer) QT_FORWARD_DECLARE_CLASS(QTimer)
namespace QSsh { namespace QSsh {
class SftpChannel;
class SshConnection; class SshConnection;
class SshRemoteProcess; class SshRemoteProcess;
} }
namespace Utils { class PortList; } namespace Utils { class PortList; }
namespace Qt4ProjectManager { class Qt4BuildConfiguration; } namespace Qt4ProjectManager { class Qt4BuildConfiguration; }
namespace RemoteLinux { class RemoteLinuxUsedPortsGatherer; }
namespace RemoteLinux {
class LinuxDeviceConfiguration;
class RemoteLinuxUsedPortsGatherer;
}
namespace Madde { namespace Madde {
namespace Internal { namespace Internal {
@@ -69,7 +65,7 @@ public:
// Must already be connected. // Must already be connected.
void setConnection(QSsh::SshConnection *connection, void setConnection(QSsh::SshConnection *connection,
const QSharedPointer<const RemoteLinux::LinuxDeviceConfiguration> &devConf); const ProjectExplorer::IDevice::ConstPtr &devConf);
void setBuildConfiguration(const Qt4ProjectManager::Qt4BuildConfiguration *bc); void setBuildConfiguration(const Qt4ProjectManager::Qt4BuildConfiguration *bc);
void addMountSpecification(const MaemoMountSpecification &mountSpec, void addMountSpecification(const MaemoMountSpecification &mountSpec,
@@ -124,7 +120,7 @@ private:
}; };
QSsh::SshConnection *m_connection; QSsh::SshConnection *m_connection;
QSharedPointer<const RemoteLinux::LinuxDeviceConfiguration> m_devConf; ProjectExplorer::IDevice::ConstPtr m_devConf;
QList<MountInfo> m_mountSpecs; QList<MountInfo> m_mountSpecs;
QSharedPointer<QSsh::SshRemoteProcess> m_mountProcess; QSharedPointer<QSsh::SshRemoteProcess> m_mountProcess;
QSharedPointer<QSsh::SshRemoteProcess> m_unmountProcess; QSharedPointer<QSsh::SshRemoteProcess> m_unmountProcess;