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

Finish merging Runnable and StandardRunnable

Browse Source 
As all Runnables are known to be StandardRunnables, this here
essentially replaces all .is<StandardRunnable> by 'true'.
.as<StandardRunnable> by no-op, and fixes the fallout.

Change-Id: I1632f8e164fa0a9dff063df47a9e191fdf7bbb2e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2018-05-16 15:42:03 +02:00
parent fdccc54275
commit 36b835ff0a
73 changed files with 147 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/debugger/unstartedappwatcherdialog.cpp
View File

@@ -38,7 +38,6 @@
#include <projectexplorer/projecttree.h>
#include <projectexplorer/runconfiguration.h>
#include <projectexplorer/buildconfiguration.h>
#include <projectexplorer/runnables.h>
#include <QVBoxLayout>
#include <QHBoxLayout>
@@ -116,11 +115,10 @@ UnstartedAppWatcherDialog::UnstartedAppWatcherDialog(QWidget *parent)
if (activeTarget) {
if (RunConfiguration *runConfig = activeTarget->activeRunConfiguration()) {
const Runnable runnable = runConfig->runnable();
if (runnable.is<StandardRunnable>() && isLocal(runConfig)) {
if (isLocal(runConfig)) {
resetExecutable->setEnabled(true);
connect(resetExecutable, &QPushButton::clicked,
this, [this, runnable]() {
m_pathChooser->setPath(runnable.as<StandardRunnable>().executable);
connect(resetExecutable, &QPushButton::clicked, this, [this, runnable] {
m_pathChooser->setPath(runnable.executable);
});
}
}
@@ -198,8 +196,8 @@ void UnstartedAppWatcherDialog::selectExecutable()
if (activeTarget) {
if (RunConfiguration *runConfig = activeTarget->activeRunConfiguration()) {
const Runnable runnable = runConfig->runnable();
if (runnable.is<StandardRunnable>() && isLocal(runConfig))
path = QFileInfo(runnable.as<StandardRunnable>().executable).path();
if (isLocal(runConfig))
path = QFileInfo(runnable.executable).path();
}
}