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

Introduce ProcessResultData

Browse Source 
It should be useful when reimplementing ProcessInterface.
It replaces 4 virtual methods with just 1.

Task-number: QTCREATORBUG-27358
Change-Id: I2dafbfbc25f8f016ff2aa19c1a176335a4a7498c
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2022-04-08 17:24:59 +02:00
parent 104bbfc713
commit 936c44f367
11 changed files with 126 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libs/ssh/sshremoteprocess.cpp
View File

@@ -29,6 +29,7 @@
#include "sshsettings.h"
#include <utils/commandline.h>
#include <utils/processinterface.h>
#include <utils/qtcassert.h>
#include <QTimer>
@@ -80,11 +81,12 @@ void SshRemoteProcess::start()
QtcProcess::start();
}
QString SshRemoteProcess::errorString() const
ProcessResultData SshRemoteProcess::resultData() const
{
ProcessResultData result = QtcProcess::resultData();
if (!m_errorString.isEmpty())
return m_errorString;
return QtcProcess::errorString();
result.m_errorString = m_errorString;
return result;
}
void SshRemoteProcess::requestX11Forwarding(const QString &displayName)

2
src/libs/ssh/sshremoteprocess.h
View File

@@ -42,7 +42,7 @@ public:
void requestX11Forwarding(const QString &displayName);
void start() override;
QString errorString() const override;
Utils::ProcessResultData resultData() const override;
Utils::CommandLine fullLocalCommandLine(bool inTerminal = false) const;