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

Utils: Use std::function instead of signal SynchronousProcess callback

Browse Source 
Simpler interface and use.

Change-Id: I8db448b7ccd12927b8f8fd347b0a92c3f76f7114
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
hjk
2021-05-06 08:56:42 +02:00
parent 3229903e8a
commit d825805c39
6 changed files with 31 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1862,12 +1862,8 @@ QString QtcProcess::locateBinary(const QString &binary)
event loop that blocks only user input events. Thus, it allows for the GUI to
repaint and append output to log windows.
The stdOut(), stdErr() signals are emitted unbuffered as the process
writes them.
The stdOutBuffered(), stdErrBuffered() signals are emitted with complete
lines based on the '\\n' marker if they are enabled using
stdOutBufferedSignalsEnabled()/setStdErrBufferedSignalsEnabled().
The callbacks set with setStdOutCallBack(), setStdErrCallback() are called
with complete lines based on the '\\n' marker.
They would typically be used for log windows.
There is a timeout handling that takes effect after the last data have been
@@ -1974,8 +1970,6 @@ SynchronousProcessResponse::Result defaultExitCodeInterpreter(int code)
// Data for one channel buffer (stderr/stdout)
class ChannelBuffer : public QObject
{
Q_OBJECT
public:
void clearForRun();
@@ -1987,16 +1981,11 @@ public:
QTextCodec *codec = nullptr; // Not owner
std::unique_ptr<QTextCodec::ConverterState> codecState;
int rawDataPos = 0;
bool bufferedSignalsEnabled = false;
bool firstBuffer = true;
signals:
void outputBuffered(const QString &text, bool firstTime);
std::function<void(const QString &lines)> outputCallback;
};
void ChannelBuffer::clearForRun()
{
firstBuffer = true;
rawDataPos = 0;
rawData.clear();
codecState.reset(new QTextCodec::ConverterState);
@@ -2035,12 +2024,10 @@ void ChannelBuffer::append(const QByteArray &text, bool emitSignals)
return;
// Buffered. Emit complete lines?
if (bufferedSignalsEnabled) {
if (outputCallback) {
const QString lines = linesRead();
if (!lines.isEmpty()) {
emit outputBuffered(lines, firstBuffer);
firstBuffer = false;
}
if (!lines.isEmpty())
outputCallback(lines);
}
}
@@ -2098,8 +2085,6 @@ SynchronousProcess::SynchronousProcess() :
d->m_hangTimerCount = 0;
processStdErr(true);
});
connect(&d->m_stdOut, &ChannelBuffer::outputBuffered, this, &SynchronousProcess::stdOutBuffered);
connect(&d->m_stdErr, &ChannelBuffer::outputBuffered, this, &SynchronousProcess::stdErrBuffered);
}
SynchronousProcess::~SynchronousProcess()
@@ -2133,26 +2118,6 @@ QTextCodec *SynchronousProcess::codec() const
return d->m_codec;
}
bool SynchronousProcess::stdOutBufferedSignalsEnabled() const
{
return d->m_stdOut.bufferedSignalsEnabled;
}
void SynchronousProcess::setStdOutBufferedSignalsEnabled(bool v)
{
d->m_stdOut.bufferedSignalsEnabled = v;
}
bool SynchronousProcess::stdErrBufferedSignalsEnabled() const
{
return d->m_stdErr.bufferedSignalsEnabled;
}
void SynchronousProcess::setStdErrBufferedSignalsEnabled(bool v)
{
d->m_stdErr.bufferedSignalsEnabled = v;
}
Environment SynchronousProcess::environment() const
{
return d->m_process.environment();
@@ -2352,6 +2317,16 @@ SynchronousProcessResponse SynchronousProcess::runBlocking(const CommandLine &cm
return d->m_result;
}
void SynchronousProcess::setStdOutCallback(const std::function<void (const QString &)> &callback)
{
d->m_stdOut.outputCallback = callback;
}
void SynchronousProcess::setStdErrCallback(const std::function<void (const QString &)> &callback)
{
d->m_stdErr.outputCallback = callback;
}
bool SynchronousProcess::terminate()
{
return d->m_process.stopProcess();
@@ -2423,6 +2398,3 @@ void SynchronousProcess::processStdErr(bool emitSignals)
}
} // namespace Utils
#include "qtcprocess.moc"