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

ProjectExplorer: Re-organize RunConfiguration constructors

Browse Source 
The idea is to massage the setup in a way to make implementation
of new configurations less error prone by identifying recurring patterns
and sharing repetitive code that tends to be forgotten (see Android cloning).

The former two lines of constructors (owner-and-id, owner-and-source)
are split into a simple, shared, constructor and new setId() and
copyFrom() functions.

The change is mostly mechanical, some multiple calls to fromMap
have been removed, though, some consts added.

Otherwise, to keep the patch small it temporarily introduces two
helper templates in IRunConfigurationFactory. Also, setId() signatures
have not been unified yet. These won't be needed in the final setup.

Change-Id: I8c0734496caae744a9883fe6d92c1d8f8e0234ea
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
hjk
2017-09-01 13:23:02 +02:00
parent 4710e6b4b2
commit 890c1906e6
52 changed files with 510 additions and 506 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
View File

@@ -51,13 +51,43 @@ namespace QmlProjectManager {
const char M_CURRENT_FILE[] = "CurrentFile";
QmlProjectRunConfiguration::QmlProjectRunConfiguration(Target *parent, Id id) :
RunConfiguration(parent, id),
m_scriptFile(QLatin1String(M_CURRENT_FILE))
QmlProjectRunConfiguration::QmlProjectRunConfiguration(Target *target)
: RunConfiguration(target)
{
addExtraAspect(new QmlProjectEnvironmentAspect(this));
ctor();
// reset default settings in constructor
connect(EditorManager::instance(), &EditorManager::currentEditorChanged,
this, &QmlProjectRunConfiguration::changeCurrentFile);
connect(EditorManager::instance(), &EditorManager::currentDocumentStateChanged,
this, [this] { changeCurrentFile(); });
connect(target, &Target::kitChanged,
this, &QmlProjectRunConfiguration::updateEnabledState);
}
void QmlProjectRunConfiguration::initialize(Id id)
{
RunConfiguration::initialize(id);
m_scriptFile = M_CURRENT_FILE;
if (id == Constants::QML_SCENE_RC_ID)
setDisplayName(tr("QML Scene", "QMLRunConfiguration display name."));
else
setDisplayName(tr("QML Viewer", "QMLRunConfiguration display name."));
updateEnabledState();
}
void QmlProjectRunConfiguration::copyFrom(const QmlProjectRunConfiguration *source)
{
RunConfiguration::copyFrom(source);
m_currentFileFilename = source->m_currentFileFilename;
m_mainScriptFilename = source->m_mainScriptFilename;
m_scriptFile = source->m_scriptFile;
m_qmlViewerArgs = source->m_qmlViewerArgs;
updateEnabledState();
}
Runnable QmlProjectRunConfiguration::runnable() const
@@ -72,17 +102,6 @@ Runnable QmlProjectRunConfiguration::runnable() const
return r;
}
QmlProjectRunConfiguration::QmlProjectRunConfiguration(Target *parent,
QmlProjectRunConfiguration *source) :
RunConfiguration(parent, source),
m_currentFileFilename(source->m_currentFileFilename),
m_mainScriptFilename(source->m_mainScriptFilename),
m_scriptFile(source->m_scriptFile),
m_qmlViewerArgs(source->m_qmlViewerArgs)
{
ctor();
}
QString QmlProjectRunConfiguration::disabledReason() const
{
if (mainScript().isEmpty())
@@ -92,24 +111,6 @@ QString QmlProjectRunConfiguration::disabledReason() const
return RunConfiguration::disabledReason();
}
void QmlProjectRunConfiguration::ctor()
{
// reset default settings in constructor
connect(EditorManager::instance(), &EditorManager::currentEditorChanged,
this, &QmlProjectRunConfiguration::changeCurrentFile);
connect(EditorManager::instance(), &EditorManager::currentDocumentStateChanged,
this, [this] { changeCurrentFile(); });
connect(target(), &Target::kitChanged,
this, &QmlProjectRunConfiguration::updateEnabledState);
if (id() == Constants::QML_SCENE_RC_ID)
setDisplayName(tr("QML Scene", "QMLRunConfiguration display name."));
else
setDisplayName(tr("QML Viewer", "QMLRunConfiguration display name."));
updateEnabledState();
}
QString QmlProjectRunConfiguration::executable() const
{
QtSupport::BaseQtVersion *version = qtVersion();