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

Utils: Move SynchronousProcess::normalizeNewlines to QtcProcess

Browse Source 
Change-Id: I5ba8ba1061b04b032aafd08382d34ccb62272829
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-04-30 17:21:43 +02:00
parent 196b7b0f24
commit dec9169efe
8 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/clangtools/clangtoolrunner.cpp
View File

@@ -155,7 +155,7 @@ void ClangToolRunner::onProcessFinished(int exitCode, QProcess::ExitStatus exitS
{
if (exitStatus == QProcess::NormalExit) {
if (exitCode == 0) {
qCDebug(LOG).noquote() << "Output:\n" << Utils::SynchronousProcess::normalizeNewlines(
qCDebug(LOG).noquote() << "Output:\n" << QtcProcess::normalizeNewlines(
QString::fromLocal8Bit(m_processOutput));
emit finishedWithSuccess(m_fileToAnalyze);
} else {
@@ -187,7 +187,7 @@ QString ClangToolRunner::commandlineAndOutput() const
"Output:\n%3")
.arg(m_commandLine.toUserOutput(),
QString::number(m_process->error()),
Utils::SynchronousProcess::normalizeNewlines(QString::fromLocal8Bit(m_processOutput)));
QtcProcess::normalizeNewlines(QString::fromLocal8Bit(m_processOutput)));
}
} // namespace Internal

4
src/plugins/cmakeprojectmanager/cmakeprocess.cpp
View File

@@ -35,8 +35,6 @@
#include <utils/stringutils.h>
#include <QDir>
namespace CMakeProjectManager {
namespace Internal {
@@ -44,7 +42,7 @@ using namespace ProjectExplorer;
static QString lineSplit(const QString &rest, const QByteArray &array, std::function<void(const QString &)> f)
{
QString tmp = rest + Utils::SynchronousProcess::normalizeNewlines(QString::fromLocal8Bit(array));
QString tmp = rest + Utils::QtcProcess::normalizeNewlines(QString::fromLocal8Bit(array));
int start = 0;
int end = tmp.indexOf(QLatin1Char('\n'), start);
while (end >= 0) {

3
src/plugins/vcsbase/vcsbaseclient.cpp
View File

@@ -35,6 +35,7 @@
#include <coreplugin/idocument.h>
#include <utils/qtcassert.h>
#include <utils/qtcprocess.h>
#include <utils/synchronousprocess.h>
#include <vcsbase/vcsbaseeditor.h>
#include <vcsbase/vcsoutputwindow.h>
@@ -127,7 +128,7 @@ QProcessEnvironment VcsBaseClientImpl::processEnvironment() const
QString VcsBaseClientImpl::commandOutputFromLocal8Bit(const QByteArray &a)
{
return SynchronousProcess::normalizeNewlines(QString::fromLocal8Bit(a));
return QtcProcess::normalizeNewlines(QString::fromLocal8Bit(a));
}
QStringList VcsBaseClientImpl::commandOutputLinesFromLocal8Bit(const QByteArray &a)