diff options
author | hjk <hjk@qt.io> | 2020-02-20 17:31:28 +0100 |
---|---|---|
committer | hjk <hjk@qt.io> | 2020-02-21 11:48:08 +0000 |
commit | 1627850e8124f4c8e518bfbb6c5f9d79198ce8d8 (patch) | |
tree | 7e12a9c1d75a67bb668527be449422b9392551df | |
parent | 1714ecf8092533eaba196212d4f0feb581449ecf (diff) |
ProjectExplorer: Un-export ProcessStep
Not used outside.
Change-Id: Ibab561d2f49ffce5b2e1d2505ef0634c802221b0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r-- | src/plugins/nim/project/nimbletaskstep.cpp | 2 | ||||
-rw-r--r-- | src/plugins/nim/project/nimbletaskstep.h | 2 | ||||
-rw-r--r-- | src/plugins/projectexplorer/processstep.cpp | 29 | ||||
-rw-r--r-- | src/plugins/projectexplorer/processstep.h | 25 |
4 files changed, 28 insertions, 30 deletions
diff --git a/src/plugins/nim/project/nimbletaskstep.cpp b/src/plugins/nim/project/nimbletaskstep.cpp index b97df81b2e..fd45a1686d 100644 --- a/src/plugins/nim/project/nimbletaskstep.cpp +++ b/src/plugins/nim/project/nimbletaskstep.cpp @@ -31,6 +31,8 @@ #include <projectexplorer/buildstep.h> #include <projectexplorer/buildconfiguration.h> #include <projectexplorer/processparameters.h> +#include <projectexplorer/projectexplorerconstants.h> + #include <utils/fileutils.h> #include <QStandardPaths> diff --git a/src/plugins/nim/project/nimbletaskstep.h b/src/plugins/nim/project/nimbletaskstep.h index f8e7d375d4..15e67885cd 100644 --- a/src/plugins/nim/project/nimbletaskstep.h +++ b/src/plugins/nim/project/nimbletaskstep.h @@ -25,7 +25,7 @@ #pragma once -#include <projectexplorer/processstep.h> +#include <projectexplorer/abstractprocessstep.h> namespace Nim { diff --git a/src/plugins/projectexplorer/processstep.cpp b/src/plugins/projectexplorer/processstep.cpp index 176e6f0a86..02501150b5 100644 --- a/src/plugins/projectexplorer/processstep.cpp +++ b/src/plugins/projectexplorer/processstep.cpp @@ -24,28 +24,42 @@ ****************************************************************************/ #include "processstep.h" + +#include "abstractprocessstep.h" #include "buildconfiguration.h" -#include "buildstep.h" #include "kit.h" #include "processparameters.h" +#include "projectconfigurationaspects.h" #include "projectexplorerconstants.h" +#include "projectexplorer_export.h" #include "target.h" -#include <coreplugin/variablechooser.h> - #include <utils/fileutils.h> -#include <utils/macroexpander.h> - -#include <QFormLayout> using namespace Utils; namespace ProjectExplorer { +namespace Internal { const char PROCESS_COMMAND_KEY[] = "ProjectExplorer.ProcessStep.Command"; const char PROCESS_WORKINGDIRECTORY_KEY[] = "ProjectExplorer.ProcessStep.WorkingDirectory"; const char PROCESS_ARGUMENTS_KEY[] = "ProjectExplorer.ProcessStep.Arguments"; +class ProcessStep final : public AbstractProcessStep +{ + Q_DECLARE_TR_FUNCTIONS(ProjectExplorer::ProcessStep) + +public: + ProcessStep(BuildStepList *bsl, Core::Id id); + + bool init() final; + void setupProcessParameters(ProcessParameters *pp); + + BaseStringAspect *m_command; + BaseStringAspect *m_arguments; + BaseStringAspect *m_workingDirectory; +}; + ProcessStep::ProcessStep(BuildStepList *bsl, Core::Id id) : AbstractProcessStep(bsl, id) { @@ -103,9 +117,7 @@ void ProcessStep::setupProcessParameters(ProcessParameters *pp) pp->resolveAll(); } -//******* // ProcessStepFactory -//******* ProcessStepFactory::ProcessStepFactory() { @@ -113,4 +125,5 @@ ProcessStepFactory::ProcessStepFactory() setDisplayName(ProcessStep::tr("Custom Process Step", "item in combobox")); } +} // Internal } // ProjectExplorer diff --git a/src/plugins/projectexplorer/processstep.h b/src/plugins/projectexplorer/processstep.h index 95f0f49a22..964f0685db 100644 --- a/src/plugins/projectexplorer/processstep.h +++ b/src/plugins/projectexplorer/processstep.h @@ -25,33 +25,16 @@ #pragma once -#include "abstractprocessstep.h" -#include "projectconfigurationaspects.h" -#include "projectexplorer_export.h" +#include "buildstep.h" namespace ProjectExplorer { +namespace Internal { -class ProcessStepFactory : public BuildStepFactory +class ProcessStepFactory final : public BuildStepFactory { public: ProcessStepFactory(); }; -class PROJECTEXPLORER_EXPORT ProcessStep : public AbstractProcessStep -{ - Q_OBJECT - friend class ProcessStepFactory; - -public: - ProcessStep(BuildStepList *bsl, Core::Id id); - -private: - bool init() override; - void setupProcessParameters(ProcessParameters *pp); - - ProjectExplorer::BaseStringAspect *m_command; - ProjectExplorer::BaseStringAspect *m_arguments; - ProjectExplorer::BaseStringAspect *m_workingDirectory; -}; - +} // namespace Internal } // namespace ProjectExplorer |