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

ProcessInterface: Hide m_setup in protected section

Browse Source 
Change-Id: I8931ae0eabbc1962a8cf104fbbb849149e0cf88b
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Jarek Kobus
2022-02-17 19:19:36 +01:00
parent fdc8193f13
commit e49f57b3ec
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -467,7 +467,6 @@ public:
void setProcessInterface(ProcessInterface *process) void setProcessInterface(ProcessInterface *process)
{ {
m_process.reset(process); m_process.reset(process);
m_process->m_setup = m_setup;
m_setup.m_errorString.clear(); m_setup.m_errorString.clear();
m_process->setParent(this); m_process->setParent(this);
@@ -700,6 +699,7 @@ QtcProcess::~QtcProcess()
void QtcProcess::setProcessInterface(ProcessInterface *interface) void QtcProcess::setProcessInterface(ProcessInterface *interface)
{ {
d->setProcessInterface(interface); d->setProcessInterface(interface);
d->m_process->m_setup = d->m_setup;
} }
void QtcProcess::setProcessImpl(ProcessImpl processImpl) void QtcProcess::setProcessImpl(ProcessImpl processImpl)

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

@@ -302,8 +302,6 @@ public:
virtual void interruptProcess() { QTC_CHECK(false); } virtual void interruptProcess() { QTC_CHECK(false); }
virtual qint64 applicationMainThreadID() const { QTC_CHECK(false); return -1; } virtual qint64 applicationMainThreadID() const { QTC_CHECK(false); return -1; }
ProcessSetupData m_setup;
signals: signals:
void started(); void started();
void finished(); void finished();
@@ -314,11 +312,14 @@ signals:
protected: protected:
void defaultStart(); void defaultStart();
ProcessSetupData m_setup;
private: private:
virtual void doDefaultStart(const QString &program, const QStringList &arguments) virtual void doDefaultStart(const QString &program, const QStringList &arguments)
{ Q_UNUSED(program) Q_UNUSED(arguments) QTC_CHECK(false); } { Q_UNUSED(program) Q_UNUSED(arguments) QTC_CHECK(false); }
bool dissolveCommand(QString *program, QStringList *arguments); bool dissolveCommand(QString *program, QStringList *arguments);
bool ensureProgramExists(const QString &program); bool ensureProgramExists(const QString &program);
friend class QtcProcess;
}; };