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

cmakeprojectmanager: Rename CMakeValidator to CMakeTool

Browse Source 
Renamed CMakeValidator to CMakeTool and renamed files
to prepare for further refactoring

Change-Id: Id6e64e3a39ec36ca3aa8b08bf859ae1345f1a137
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Benjamin Zeller
2014-03-12 08:36:36 +01:00
parent 8ee451b94a
commit 7a6f40b88a
5 changed files with 52 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro
View File

@@ -16,7 +16,7 @@ HEADERS = cmakebuildinfo.h \
cmakehighlighterfactory.h \
cmakelocatorfilter.h \
cmakefilecompletionassist.h \
cmakevalidator.h \
cmaketool.h \
cmakeparser.h \
generatorinfo.h \
cmakesettingspage.h
@@ -35,7 +35,7 @@ SOURCES = cmakeproject.cpp \
cmakehighlighterfactory.cpp \
cmakelocatorfilter.cpp \
cmakefilecompletionassist.cpp \
cmakevalidator.cpp \
cmaketool.cpp \
cmakeparser.cpp \
generatorinfo.cpp \
cmakesettingspage.cpp

8
src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs
View File

@@ -52,9 +52,13 @@ QtcPlugin {
"cmakeprojectplugin.h",
"cmakerunconfiguration.cpp",
"cmakerunconfiguration.h",
"cmakevalidator.cpp",
"cmakevalidator.h",
"cmaketool.cpp",
"cmaketool.h",
"makestep.cpp",
"makestep.h",
"cmakesettingspage.h",
"cmakesettingspage.cpp",
"generatorinfo.h",
"generatorinfo.cpp"
]
}

6
src/plugins/cmakeprojectmanager/cmakesettingspage.h
View File

@@ -35,7 +35,7 @@
#include <QPointer>
#include "cmakevalidator.h"
#include "cmaketool.h"
QT_FORWARD_DECLARE_CLASS(QLabel)
QT_FORWARD_DECLARE_CLASS(QCheckBox)
@@ -71,8 +71,8 @@ private:
QPointer<QWidget> m_widget;
Utils::PathChooser *m_pathchooser;
QCheckBox *m_preferNinja;
CMakeValidator m_cmakeValidatorForUser;
CMakeValidator m_cmakeValidatorForSystem;
CMakeTool m_cmakeValidatorForUser;
CMakeTool m_cmakeValidatorForSystem;
};
} // namespace Internal

76
src/plugins/cmakeprojectmanager/cmakevalidator.cpp → src/plugins/cmakeprojectmanager/cmaketool.cpp
View File

@@ -27,7 +27,7 @@
**
****************************************************************************/
#include "cmakevalidator.h"
#include "cmaketool.h"
#include <QProcess>
#include <QFileInfo>
@@ -36,20 +36,20 @@
using namespace CMakeProjectManager::Internal;
///////////////////////////
// CMakeValidator
// CMakeTool
///////////////////////////
CMakeValidator::CMakeValidator()
CMakeTool::CMakeTool()
: m_state(Invalid), m_process(0), m_hasCodeBlocksMsvcGenerator(false), m_hasCodeBlocksNinjaGenerator(false)
{
}
CMakeValidator::~CMakeValidator()
CMakeTool::~CMakeTool()
{
cancel();
}
void CMakeValidator::cancel()
void CMakeTool::cancel()
{
if (m_process) {
disconnect(m_process, SIGNAL(finished(int)));
@@ -59,7 +59,7 @@ void CMakeValidator::cancel()
}
}
void CMakeValidator::setCMakeExecutable(const QString &executable)
void CMakeTool::setCMakeExecutable(const QString &executable)
{
cancel();
m_process = new QProcess();
@@ -70,96 +70,96 @@ void CMakeValidator::setCMakeExecutable(const QString &executable)
QFileInfo fi(m_executable);
if (fi.exists() && fi.isExecutable()) {
// Run it to find out more
m_state = CMakeValidator::RunningBasic;
m_state = CMakeTool::RunningBasic;
if (!startProcess(QStringList(QLatin1String("--help"))))
m_state = CMakeValidator::Invalid;
m_state = CMakeTool::Invalid;
} else {
m_state = CMakeValidator::Invalid;
m_state = CMakeTool::Invalid;
}
}
void CMakeValidator::finished(int exitCode)
void CMakeTool::finished(int exitCode)
{
if (exitCode) {
m_state = CMakeValidator::Invalid;
m_state = CMakeTool::Invalid;
return;
}
if (m_state == CMakeValidator::RunningBasic) {
if (m_state == CMakeTool::RunningBasic) {
QByteArray response = m_process->readAll();
m_hasCodeBlocksMsvcGenerator = response.contains("CodeBlocks - NMake Makefiles");
m_hasCodeBlocksNinjaGenerator = response.contains("CodeBlocks - Ninja");
if (response.isEmpty()) {
m_state = CMakeValidator::Invalid;
m_state = CMakeTool::Invalid;
} else {
m_state = CMakeValidator::RunningFunctionList;
m_state = CMakeTool::RunningFunctionList;
if (!startProcess(QStringList(QLatin1String("--help-command-list"))))
finished(0); // should never happen, just continue
}
} else if (m_state == CMakeValidator::RunningFunctionList) {
} else if (m_state == CMakeTool::RunningFunctionList) {
parseFunctionOutput(m_process->readAll());
m_state = CMakeValidator::RunningFunctionDetails;
m_state = CMakeTool::RunningFunctionDetails;
if (!startProcess(QStringList(QLatin1String("--help-commands"))))
finished(0); // should never happen, just continue
} else if (m_state == CMakeValidator::RunningFunctionDetails) {
} else if (m_state == CMakeTool::RunningFunctionDetails) {
parseFunctionDetailsOutput(m_process->readAll());
m_state = CMakeValidator::RunningPropertyList;
m_state = CMakeTool::RunningPropertyList;
if (!startProcess(QStringList(QLatin1String("--help-property-list"))))
finished(0); // should never happen, just continue
} else if (m_state == CMakeValidator::RunningPropertyList) {
} else if (m_state == CMakeTool::RunningPropertyList) {
parseVariableOutput(m_process->readAll());
m_state = CMakeValidator::RunningVariableList;
m_state = CMakeTool::RunningVariableList;
if (!startProcess(QStringList(QLatin1String("--help-variable-list"))))
finished(0); // should never happen, just continue
} else if (m_state == CMakeValidator::RunningVariableList) {
} else if (m_state == CMakeTool::RunningVariableList) {
parseVariableOutput(m_process->readAll());
parseDone();
m_state = CMakeValidator::RunningDone;
m_state = CMakeTool::RunningDone;
}
}
bool CMakeValidator::isValid() const
bool CMakeTool::isValid() const
{
if (m_state == CMakeValidator::Invalid)
if (m_state == CMakeTool::Invalid)
return false;
if (m_state == CMakeValidator::RunningBasic)
if (m_state == CMakeTool::RunningBasic)
m_process->waitForFinished();
return (m_state != CMakeValidator::Invalid);
return (m_state != CMakeTool::Invalid);
}
bool CMakeValidator::startProcess(const QStringList &args)
bool CMakeTool::startProcess(const QStringList &args)
{
m_process->start(m_executable, args);
return m_process->waitForStarted(2000);
}
QString CMakeValidator::cmakeExecutable() const
QString CMakeTool::cmakeExecutable() const
{
return m_executable;
}
bool CMakeValidator::hasCodeBlocksMsvcGenerator() const
bool CMakeTool::hasCodeBlocksMsvcGenerator() const
{
if (!isValid())
return false;
return m_hasCodeBlocksMsvcGenerator;
}
bool CMakeValidator::hasCodeBlocksNinjaGenerator() const
bool CMakeTool::hasCodeBlocksNinjaGenerator() const
{
if (!isValid())
return false;
return m_hasCodeBlocksNinjaGenerator;
}
TextEditor::Keywords CMakeValidator::keywords()
TextEditor::Keywords CMakeTool::keywords()
{
while (m_state != RunningDone && m_state != CMakeValidator::Invalid) {
while (m_state != RunningDone && m_state != CMakeTool::Invalid) {
m_process->waitForFinished();
}
if (m_state == CMakeValidator::Invalid)
if (m_state == CMakeTool::Invalid)
return TextEditor::Keywords(QStringList(), QStringList(), QMap<QString, QStringList>());
return TextEditor::Keywords(m_variables, m_functions, m_functionArgs);
@@ -195,7 +195,7 @@ static void extractKeywords(const QByteArray &input, QStringList *destination)
*destination << keyword;
}
void CMakeValidator::parseFunctionOutput(const QByteArray &output)
void CMakeTool::parseFunctionOutput(const QByteArray &output)
{
QList<QByteArray> cmakeFunctionsList = output.split('\n');
m_functions.clear();
@@ -206,13 +206,13 @@ void CMakeValidator::parseFunctionOutput(const QByteArray &output)
}
}
QString CMakeValidator::formatFunctionDetails(const QString &command, const QString &args)
QString CMakeTool::formatFunctionDetails(const QString &command, const QString &args)
{
return QString::fromLatin1("<table><tr><td><b>%1</b></td><td>%2</td></tr>")
.arg(Qt::escape(command)).arg(Qt::escape(args));
}
void CMakeValidator::parseFunctionDetailsOutput(const QByteArray &output)
void CMakeTool::parseFunctionDetailsOutput(const QByteArray &output)
{
QStringList cmakeFunctionsList = m_functions;
QList<QByteArray> cmakeCommandsHelp = output.split('\n');
@@ -261,7 +261,7 @@ void CMakeValidator::parseFunctionDetailsOutput(const QByteArray &output)
m_functions = m_functionArgs.keys();
}
void CMakeValidator::parseVariableOutput(const QByteArray &output)
void CMakeTool::parseVariableOutput(const QByteArray &output)
{
QList<QByteArray> variableList = output.split('\n');
if (!variableList.isEmpty()) {
@@ -282,7 +282,7 @@ void CMakeValidator::parseVariableOutput(const QByteArray &output)
}
}
void CMakeValidator::parseDone()
void CMakeTool::parseDone()
{
m_variables.sort();
m_variables.removeDuplicates();

6
src/plugins/cmakeprojectmanager/cmakevalidator.h → src/plugins/cmakeprojectmanager/cmaketool.h
View File

@@ -40,12 +40,12 @@ QT_FORWARD_DECLARE_CLASS(QProcess)
namespace CMakeProjectManager {
namespace Internal {
class CMakeValidator : public QObject
class CMakeTool : public QObject
{
Q_OBJECT
public:
CMakeValidator();
~CMakeValidator();
CMakeTool();
~CMakeTool();
enum State { Invalid, RunningBasic, RunningFunctionList, RunningFunctionDetails,
RunningPropertyList, RunningVariableList, RunningDone };