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

projectexplorer: move kill/list to IDevice

Browse Source 
Change-Id: Ic4cbf62a61f7d0bf72e700a77c08788850cde85b
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
This commit is contained in:
hjk
2012-07-26 17:41:52 +02:00
committed by Christian Kandeler
parent 4c1dd686cb
commit 5c94f8114f
13 changed files with 216 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/plugins/android/androiddevice.cpp
View File

@@ -33,11 +33,13 @@
#include <QCoreApplication>
using namespace ProjectExplorer;
namespace Android {
namespace Internal {
AndroidDevice::AndroidDevice():
ProjectExplorer::IDevice(Core::Id(Constants::ANDROID_DEVICE_TYPE),
AndroidDevice::AndroidDevice()
: IDevice(Core::Id(Constants::ANDROID_DEVICE_TYPE),
IDevice::AutoDetected,
IDevice::Hardware,
Core::Id(Constants::ANDROID_DEVICE_ID))
@@ -46,14 +48,14 @@ AndroidDevice::AndroidDevice():
setDeviceState(DeviceReadyToUse);
}
AndroidDevice::AndroidDevice(const AndroidDevice &other):
ProjectExplorer::IDevice(other)
AndroidDevice::AndroidDevice(const AndroidDevice &other)
: ProjectExplorer::IDevice(other)
{ }
ProjectExplorer::IDevice::DeviceInfo AndroidDevice::deviceInformation() const
IDevice::DeviceInfo AndroidDevice::deviceInformation() const
{
return ProjectExplorer::IDevice::DeviceInfo();
return IDevice::DeviceInfo();
}
QString AndroidDevice::displayType() const
@@ -61,7 +63,7 @@ QString AndroidDevice::displayType() const
return QCoreApplication::translate("ProjectExplorer::AndroidDevice", "Android");
}
ProjectExplorer::IDeviceWidget *AndroidDevice::createWidget()
IDeviceWidget *AndroidDevice::createWidget()
{
return 0;
}
@@ -83,9 +85,26 @@ void AndroidDevice::executeAction(Core::Id actionId, QWidget *parent) const
Q_UNUSED(parent)
}
ProjectExplorer::IDevice::Ptr AndroidDevice::clone() const
IDevice::Ptr AndroidDevice::clone() const
{
return ProjectExplorer::IDevice::Ptr(new AndroidDevice(*this));
return IDevice::Ptr(new AndroidDevice(*this));
}
QString AndroidDevice::listProcessesCommandLine() const
{
return QString();
}
QString AndroidDevice::killProcessCommandLine(const DeviceProcess &process) const
{
Q_UNUSED(process);
return QString();
}
QList<DeviceProcess> AndroidDevice::buildProcessList(const QString &listProcessesReply) const
{
Q_UNUSED(listProcessesReply);
return QList<DeviceProcess>();
}
} // namespace Internal