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

16
src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
View File

@@ -54,13 +54,13 @@ namespace QmlProjectManager {
namespace Internal {
QmlProjectRunControl::QmlProjectRunControl(QmlProjectRunConfiguration *runConfiguration, QString mode)
QmlProjectRunControl::QmlProjectRunControl(QmlProjectRunConfiguration *runConfiguration, RunMode mode)
: RunControl(runConfiguration, mode)
{
m_applicationLauncher.setEnvironment(runConfiguration->environment());
m_applicationLauncher.setWorkingDirectory(runConfiguration->workingDirectory());
if (mode == ProjectExplorer::Constants::RUNMODE) {
if (mode == NormalRunMode) {
m_executable = runConfiguration->viewerPath();
} else {
m_executable = runConfiguration->observerPath();
@@ -141,15 +141,15 @@ QmlProjectRunControlFactory::~QmlProjectRunControlFactory()
}
bool QmlProjectRunControlFactory::canRun(RunConfiguration *runConfiguration,
const QString &mode) const
RunMode mode) const
{
QmlProjectRunConfiguration *config =
qobject_cast<QmlProjectRunConfiguration*>(runConfiguration);
if (!config)
return false;
if (mode == ProjectExplorer::Constants::RUNMODE)
if (mode == NormalRunMode)
return !config->viewerPath().isEmpty();
if (mode != Debugger::Constants::DEBUGMODE)
if (mode != DebugRunMode)
return false;
if (!Debugger::DebuggerPlugin::isActiveDebugLanguage(Debugger::QmlLanguage))
@@ -167,7 +167,7 @@ bool QmlProjectRunControlFactory::canRun(RunConfiguration *runConfiguration,
}
RunControl *QmlProjectRunControlFactory::create(RunConfiguration *runConfiguration,
const QString &mode)
RunMode mode)
{
QTC_ASSERT(canRun(runConfiguration, mode), return 0);
QmlProjectRunConfiguration *config = qobject_cast<QmlProjectRunConfiguration *>(runConfiguration);
@@ -184,9 +184,9 @@ RunControl *QmlProjectRunControlFactory::create(RunConfiguration *runConfigurati
}
RunControl *runControl = 0;
if (mode == ProjectExplorer::Constants::RUNMODE)
if (mode == NormalRunMode)
runControl = new QmlProjectRunControl(config, mode);
else if (mode == Debugger::Constants::DEBUGMODE)
else if (mode == DebugRunMode)
runControl = createDebugRunControl(config);
return runControl;
}

7
src/plugins/qmlprojectmanager/qmlprojectruncontrol.h
View File

@@ -46,7 +46,8 @@ class QmlProjectRunControl : public ProjectExplorer::RunControl
{
Q_OBJECT
public:
explicit QmlProjectRunControl(QmlProjectRunConfiguration *runConfiguration, QString mode);
QmlProjectRunControl(QmlProjectRunConfiguration *runConfiguration,
ProjectExplorer::RunMode mode);
virtual ~QmlProjectRunControl ();
// RunControl
@@ -77,8 +78,8 @@ public:
virtual ~QmlProjectRunControlFactory();
// IRunControlFactory
virtual bool canRun(ProjectExplorer::RunConfiguration *runConfiguration, const QString &mode) const;
virtual ProjectExplorer::RunControl *create(ProjectExplorer::RunConfiguration *runConfiguration, const QString &mode);
virtual bool canRun(ProjectExplorer::RunConfiguration *runConfiguration, ProjectExplorer::RunMode mode) const;
virtual ProjectExplorer::RunControl *create(ProjectExplorer::RunConfiguration *runConfiguration, ProjectExplorer::RunMode mode);
virtual QString displayName() const;
virtual ProjectExplorer::RunConfigWidget *createConfigurationWidget(ProjectExplorer::RunConfiguration
*runConfiguration);