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

CMake: Move CMakeBuildStepConfigWidget definition to .cpp

Browse Source 
Slimmer interface.

Change-Id: I34b8c172864456f67216efce7a09967c0ffec8be
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2020-02-20 18:04:36 +01:00
parent b6cd57b4f9
commit be899de35c
2 changed files with 29 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
View File

@@ -60,16 +60,36 @@
#include <QListWidget> #include <QListWidget>
#include <QRadioButton> #include <QRadioButton>
using namespace CMakeProjectManager;
using namespace CMakeProjectManager::Internal;
using namespace ProjectExplorer; using namespace ProjectExplorer;
namespace { namespace CMakeProjectManager {
namespace Internal {
const char BUILD_TARGETS_KEY[] = "CMakeProjectManager.MakeStep.BuildTargets"; const char BUILD_TARGETS_KEY[] = "CMakeProjectManager.MakeStep.BuildTargets";
const char TOOL_ARGUMENTS_KEY[] = "CMakeProjectManager.MakeStep.AdditionalArguments"; const char TOOL_ARGUMENTS_KEY[] = "CMakeProjectManager.MakeStep.AdditionalArguments";
const char ADD_RUNCONFIGURATION_ARGUMENT_KEY[] = "CMakeProjectManager.MakeStep.AddRunConfigurationArgument"; const char ADD_RUNCONFIGURATION_ARGUMENT_KEY[] = "CMakeProjectManager.MakeStep.AddRunConfigurationArgument";
const char ADD_RUNCONFIGURATION_TEXT[] = "Current executable"; const char ADD_RUNCONFIGURATION_TEXT[] = "Current executable";
}
class CMakeBuildStepConfigWidget : public BuildStepConfigWidget
{
Q_DECLARE_TR_FUNCTIONS(CMakeProjectManager::Internal::CMakeBuildStepConfigWidget)
public:
explicit CMakeBuildStepConfigWidget(CMakeBuildStep *buildStep);
private:
void itemChanged(QListWidgetItem *);
void toolArgumentsEdited();
void updateDetails();
void buildTargetsChanged();
void updateBuildTarget();
QRadioButton *itemWidget(QListWidgetItem *item);
CMakeBuildStep *m_buildStep;
QLineEdit *m_toolArguments;
QListWidget *m_buildTargetsList;
};
static bool isCurrentExecutableTarget(const QString &target) static bool isCurrentExecutableTarget(const QString &target)
{ {
@@ -554,3 +574,6 @@ void CMakeBuildStep::processFinished(int exitCode, QProcess::ExitStatus status)
AbstractProcessStep::processFinished(exitCode, status); AbstractProcessStep::processFinished(exitCode, status);
emit progress(100, QString()); emit progress(100, QString());
} }
} // Internal
} // CMakeProjectManager

37
src/plugins/cmakeprojectmanager/cmakebuildstep.h
View File

@@ -27,22 +27,9 @@
#include <projectexplorer/abstractprocessstep.h> #include <projectexplorer/abstractprocessstep.h>
#include <QRegExp> namespace Utils { class CommandLine; }
QT_BEGIN_NAMESPACE namespace ProjectExplorer { class RunConfiguration; }
class QLineEdit;
class QListWidget;
class QListWidgetItem;
class QRadioButton;
QT_END_NAMESPACE
namespace Utils {
class CommandLine;
} // Utils
namespace ProjectExplorer {
class RunConfiguration;
} // ProjectManager
namespace CMakeProjectManager { namespace CMakeProjectManager {
namespace Internal { namespace Internal {
@@ -117,26 +104,6 @@ private:
bool m_waiting = false; bool m_waiting = false;
}; };
class CMakeBuildStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
{
Q_OBJECT
public:
CMakeBuildStepConfigWidget(CMakeBuildStep *buildStep);
private:
void itemChanged(QListWidgetItem*);
void toolArgumentsEdited();
void updateDetails();
void buildTargetsChanged();
void updateBuildTarget();
QRadioButton *itemWidget(QListWidgetItem *item);
CMakeBuildStep *m_buildStep;
QLineEdit *m_toolArguments;
QListWidget *m_buildTargetsList;
};
class CMakeBuildStepFactory : public ProjectExplorer::BuildStepFactory class CMakeBuildStepFactory : public ProjectExplorer::BuildStepFactory
{ {
public: public: