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

Use QtcProcess for reading version number in uncrustify

Browse Source 
Change-Id: I0c39342c692d1b4a5dfcf8fa562f5f300f6fc295
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2021-08-31 12:05:39 +02:00
parent bf2954ffbf
commit 0c8e196cb2
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/beautifier/uncrustify/uncrustifysettings.cpp
View File

@@ -54,7 +54,7 @@ const char SETTINGS_NAME[] = "uncrustify";
UncrustifySettings::UncrustifySettings() : UncrustifySettings::UncrustifySettings() :
AbstractSettings(SETTINGS_NAME, ".cfg") AbstractSettings(SETTINGS_NAME, ".cfg")
{ {
connect(&m_versionProcess, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), connect(&m_versionProcess, &Utils::QtcProcess::finished,
this, &UncrustifySettings::parseVersionProcessResult); this, &UncrustifySettings::parseVersionProcessResult);
setCommand("uncrustify"); setCommand("uncrustify");
@@ -229,13 +229,13 @@ void UncrustifySettings::updateVersion()
m_versionProcess.kill(); m_versionProcess.kill();
m_versionProcess.waitForFinished(); m_versionProcess.waitForFinished();
} }
m_versionProcess.start(command().toString(), {"--version"}); m_versionProcess.setCommand({ command(), { "--version" } });
m_versionProcess.start();
} }
void UncrustifySettings::parseVersionProcessResult(int exitCode, QProcess::ExitStatus exitStatus) void UncrustifySettings::parseVersionProcessResult()
{ {
Q_UNUSED(exitCode) if (m_versionProcess.exitStatus() != QProcess::NormalExit)
if (exitStatus != QProcess::NormalExit)
return; return;
if (!parseVersion(QString::fromUtf8(m_versionProcess.readAllStandardOutput()), m_version)) if (!parseVersion(QString::fromUtf8(m_versionProcess.readAllStandardOutput()), m_version))

6
src/plugins/beautifier/uncrustify/uncrustifysettings.h
View File

@@ -27,7 +27,7 @@
#include "../abstractsettings.h" #include "../abstractsettings.h"
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <QProcess> #include <utils/qtcprocess.h>
namespace Beautifier { namespace Beautifier {
namespace Internal { namespace Internal {
@@ -66,8 +66,8 @@ public:
void setUseSpecificConfigFile(bool useConfigFile); void setUseSpecificConfigFile(bool useConfigFile);
private: private:
QProcess m_versionProcess; Utils::QtcProcess m_versionProcess;
void parseVersionProcessResult(int exitCode, QProcess::ExitStatus exitStatus); void parseVersionProcessResult();
}; };
} // namespace Internal } // namespace Internal