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

ProjectExplorer: use enum instead of QString for run mode

Browse Source 
Change-Id: Ia906944a489b09afdea59f74afbf759b4caebe37
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
hjk
2012-01-10 19:17:24 +01:00
committed by hjk
parent 2230f301ec
commit a6ff74c0d8
48 changed files with 198 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/qt4projectmanager/qt-s60/s60manager.cpp
View File

@@ -74,17 +74,17 @@ template <class RunControl, class RunConfiguration>
class RunControlFactory : public ProjectExplorer::IRunControlFactory
{
public:
explicit RunControlFactory(const QString &mode,
const QString &name,
QObject *parent = 0) :
RunControlFactory(ProjectExplorer::RunMode mode, const QString &name, QObject *parent = 0) :
IRunControlFactory(parent), m_mode(mode), m_name(name) {}
bool canRun(ProjectExplorer::RunConfiguration *runConfiguration, const QString &mode) const {
return (mode == m_mode)
&& (qobject_cast<RunConfiguration *>(runConfiguration) != 0);
bool canRun(ProjectExplorer::RunConfiguration *runConfiguration, ProjectExplorer::RunMode mode) const
{
return mode == m_mode && qobject_cast<RunConfiguration *>(runConfiguration);
}
ProjectExplorer::RunControl* create(ProjectExplorer::RunConfiguration *runConfiguration, const QString &mode) {
ProjectExplorer::RunControl* create(ProjectExplorer::RunConfiguration *runConfiguration,
ProjectExplorer::RunMode mode)
{
RunConfiguration *rc = qobject_cast<RunConfiguration *>(runConfiguration);
QTC_ASSERT(rc && mode == m_mode, return 0);
return new RunControl(rc, mode);
@@ -99,7 +99,7 @@ public:
}
private:
const QString m_mode;
const ProjectExplorer::RunMode m_mode;
const QString m_name;
};
@@ -117,10 +117,9 @@ S60Manager::S60Manager(QObject *parent) : QObject(parent)
addAutoReleasedObject(new S60EmulatorRunConfigurationFactory);
addAutoReleasedObject(new RunControlFactory<S60EmulatorRunControl, S60EmulatorRunConfiguration>
(QLatin1String(ProjectExplorer::Constants::RUNMODE),
tr("Run in Emulator"), parent));
(ProjectExplorer::NormalRunMode, tr("Run in Emulator"), parent));
addAutoReleasedObject(new S60DeviceRunConfigurationFactory);
addAutoReleasedObject(new S60RunControlFactory(QLatin1String(ProjectExplorer::Constants::RUNMODE),
addAutoReleasedObject(new S60RunControlFactory(ProjectExplorer::NormalRunMode,
tr("Run on Device"), parent));
addAutoReleasedObject(new S60CreatePackageStepFactory);
addAutoReleasedObject(new S60DeployStepFactory);