diff options
author | hjk <hjk@qt.io> | 2019-03-25 15:31:43 +0100 |
---|---|---|
committer | hjk <hjk@qt.io> | 2019-04-02 09:46:48 +0000 |
commit | 841bbfa7bf2575769d7dfec2d1f238cd65aacf5d (patch) | |
tree | 8dd8095ac57f9edbe7ffc81db33aa64aae44e1a4 | |
parent | 73fbaea03624f1ef05a576d19f66291cc92fbf3c (diff) | |
download | qt-creator-841bbfa7bf2575769d7dfec2d1f238cd65aacf5d.tar.gz |
ProjectExplorer: Switch order of template parameters
... of SimpleRunWorkerFactory.
This requires being explicit about the SimpleTargetRunner worker
default, but makes the template re-usable for current users of
RunWorker::registerWorker() which I would like to phase out now,
for less variations in the RunWorkerFactory setup.
Change-Id: I32638437e5bb29f143650f5fde706711ab25accf
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r-- | src/plugins/android/androidplugin.cpp | 8 | ||||
-rw-r--r-- | src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp | 2 | ||||
-rw-r--r-- | src/plugins/nim/nimplugin.cpp | 2 | ||||
-rw-r--r-- | src/plugins/projectexplorer/projectexplorer.cpp | 3 | ||||
-rw-r--r-- | src/plugins/projectexplorer/runcontrol.h | 2 | ||||
-rw-r--r-- | src/plugins/pythoneditor/pythoneditorplugin.cpp | 2 | ||||
-rw-r--r-- | src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp | 2 | ||||
-rw-r--r-- | src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp | 2 | ||||
-rw-r--r-- | src/plugins/qmlprojectmanager/qmlprojectplugin.cpp | 2 |
9 files changed, 13 insertions, 12 deletions
diff --git a/src/plugins/android/androidplugin.cpp b/src/plugins/android/androidplugin.cpp index 27b3ae99bc..29f4392712 100644 --- a/src/plugins/android/androidplugin.cpp +++ b/src/plugins/android/androidplugin.cpp @@ -151,12 +151,12 @@ public: AndroidManifestEditorFactory manifestEditorFactory; AndroidRunConfigurationFactory runConfigFactory; - SimpleRunWorkerFactory<AndroidRunConfiguration, AndroidRunSupport> runWorkerFactory; - SimpleRunWorkerFactory<AndroidRunConfiguration, AndroidDebugSupport> + SimpleRunWorkerFactory<AndroidRunSupport, AndroidRunConfiguration> runWorkerFactory; + SimpleRunWorkerFactory<AndroidDebugSupport, AndroidRunConfiguration> debugWorkerFactory{DEBUG_RUN_MODE}; - SimpleRunWorkerFactory<AndroidRunConfiguration, AndroidQmlToolingSupport> + SimpleRunWorkerFactory<AndroidQmlToolingSupport, AndroidRunConfiguration> profilerWorkerFactory{QML_PROFILER_RUN_MODE}; - SimpleRunWorkerFactory<AndroidRunConfiguration, AndroidQmlToolingSupport> + SimpleRunWorkerFactory<AndroidQmlToolingSupport, AndroidRunConfiguration> qmlPreviewWorkerFactory{QML_PREVIEW_RUN_MODE}; QmlPreviewRunWorkerFactory qmlPreviewWorkerFactory2; diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp index e703aefb31..a90b9be9a8 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp @@ -72,7 +72,7 @@ public: CMakeManager manager; CMakeBuildStepFactory buildStepFactory; CMakeRunConfigurationFactory runConfigFactory; - SimpleRunWorkerFactory<CMakeRunConfiguration> runWorkerFactory; + SimpleRunWorkerFactory<SimpleTargetRunner, CMakeRunConfiguration> runWorkerFactory; CMakeBuildConfigurationFactory buildConfigFactory; CMakeEditorFactory editorFactor; CMakeLocatorFilter locatorFiler; diff --git a/src/plugins/nim/nimplugin.cpp b/src/plugins/nim/nimplugin.cpp index 67b282e073..d9ff187179 100644 --- a/src/plugins/nim/nimplugin.cpp +++ b/src/plugins/nim/nimplugin.cpp @@ -67,7 +67,7 @@ public: NimEditorFactory editorFactory; NimBuildConfigurationFactory buildConfigFactory; NimRunConfigurationFactory runConfigFactory; - SimpleRunWorkerFactory<NimRunConfiguration> runWorkerFactory; + SimpleRunWorkerFactory<SimpleTargetRunner, NimRunConfiguration> runWorkerFactory; NimCompilerBuildStepFactory buildStepFactory; NimCompilerCleanStepFactory cleanStepFactory; NimCodeStyleSettingsPage codeStyleSettingsPage; diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index 51e9c02e73..58ae54a408 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -544,7 +544,8 @@ public: CurrentProjectFind m_curretProjectFind; CustomExecutableRunConfigurationFactory m_customExecutableRunConfigFactory; - SimpleRunWorkerFactory<CustomExecutableRunConfiguration> m_customExecutableRunWorkerFactory; + SimpleRunWorkerFactory<SimpleTargetRunner, CustomExecutableRunConfiguration> + m_customExecutableRunWorkerFactory; ProjectFileWizardExtension m_projectFileWizardExtension; diff --git a/src/plugins/projectexplorer/runcontrol.h b/src/plugins/projectexplorer/runcontrol.h index fa9b22cdf2..927bc1dfab 100644 --- a/src/plugins/projectexplorer/runcontrol.h +++ b/src/plugins/projectexplorer/runcontrol.h @@ -319,7 +319,7 @@ private: bool m_useTerminal = false; }; -template <class RunConfig, class RunWorker = SimpleTargetRunner> +template <class RunWorker, class RunConfig> class SimpleRunWorkerFactory : public RunWorkerFactory { public: diff --git a/src/plugins/pythoneditor/pythoneditorplugin.cpp b/src/plugins/pythoneditor/pythoneditorplugin.cpp index 2d21a073c8..a486fb837e 100644 --- a/src/plugins/pythoneditor/pythoneditorplugin.cpp +++ b/src/plugins/pythoneditor/pythoneditorplugin.cpp @@ -722,7 +722,7 @@ class PythonEditorPluginPrivate public: PythonEditorFactory editorFactory; PythonRunConfigurationFactory runConfigFactory; - SimpleRunWorkerFactory<PythonRunConfiguration> runWorkerFactory; + SimpleRunWorkerFactory<SimpleTargetRunner, PythonRunConfiguration> runWorkerFactory; }; PythonEditorPlugin::~PythonEditorPlugin() diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp index 464d3f9bee..61afb4fb26 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp +++ b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp @@ -92,7 +92,7 @@ public: QbsCleanStepFactory cleanStepFactory; QbsInstallStepFactory installStepFactory; QbsRunConfigurationFactory runConfigFactory; - SimpleRunWorkerFactory<QbsRunConfiguration> runWorkerFactory; + SimpleRunWorkerFactory<SimpleTargetRunner, QbsRunConfiguration> runWorkerFactory; QbsProfilesSettingsPage profilesSetttingsPage; QbsKitAspect qbsKitAspect; }; diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp index 4c039cfaf9..98a3adf8b9 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp @@ -100,7 +100,7 @@ public: QmakeBuildConfigurationFactory buildConfigFactory; DesktopQmakeRunConfigurationFactory runConfigFactory; - SimpleRunWorkerFactory<DesktopQmakeRunConfiguration, SimpleTargetRunner> + SimpleRunWorkerFactory<SimpleTargetRunner, DesktopQmakeRunConfiguration> runWorkerFactory; ProFileEditorFactory profileEditorFactory; diff --git a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp index b2079c9f31..d20f4caa43 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp @@ -44,7 +44,7 @@ class QmlProjectPluginPrivate { public: QmlProjectRunConfigurationFactory runConfigFactory; - SimpleRunWorkerFactory<QmlProjectRunConfiguration, SimpleTargetRunner> + SimpleRunWorkerFactory<SimpleTargetRunner, QmlProjectRunConfiguration> runWorkerFactory{ProjectExplorer::Constants::NORMAL_RUN_MODE}; }; |