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

Qnx: Avoid use of QtcProcess::ioDevice()

Browse Source 
And drop the function from the QtcProcess interface, as this was the
only user.

Change-Id: I5a21cdaacb3f91f78058e80cbe1cb1572e9bf331
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
hjk
2021-05-28 13:04:22 +02:00
parent 8856066b87
commit 27a3bf3ae6
3 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libs/utils/qtcprocess.cpp
View File

@@ -779,11 +779,6 @@ QString QtcProcess::exitMessage()
return QString(); return QString();
} }
QIODevice *QtcProcess::ioDevice()
{
return d->m_process;
}
QByteArray QtcProcess::allRawOutput() const QByteArray QtcProcess::allRawOutput() const
{ {
if (!d->m_stdOut.rawData.isEmpty() && !d->m_stdErr.rawData.isEmpty()) { if (!d->m_stdOut.rawData.isEmpty() && !d->m_stdErr.rawData.isEmpty()) {

2
src/libs/utils/qtcprocess.h
View File

@@ -170,8 +170,6 @@ public:
void closeWriteChannel(); void closeWriteChannel();
void close(); void close();
QIODevice *ioDevice(); // FIXME: Remove.
signals: signals:
void started(); void started();
void finished(int exitCode, QProcess::ExitStatus exitStatus); void finished(int exitCode, QProcess::ExitStatus exitStatus);

7
src/plugins/qnx/qnxutils.cpp
View File

@@ -127,10 +127,9 @@ EnvironmentItems QnxUtils::qnxEnvironmentFromEnvFile(const QString &fileName)
return items; return items;
// parsing process output // parsing process output
QTextStream str(process.ioDevice()); const QString output = process.stdOut();
while (!str.atEnd()) { for (const QString &line : output.split('\n')) {
QString line = str.readLine(); int equalIndex = line.indexOf('=');
int equalIndex = line.indexOf(QLatin1Char('='));
if (equalIndex < 0) if (equalIndex < 0)
continue; continue;
QString var = line.left(equalIndex); QString var = line.left(equalIndex);