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

Utils: Copy some SynchronousProcess function to QtcProcess

Browse Source 
Start using it in Utils::Archive.

The idea is to merge SynchronousProcess into QtcProcess (or avoid its
use) to have fewer classes to make "remote-aware".

Change-Id: Ieb08f6f66eab63fd058b75e3bafa79bfbf140387
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-04-29 17:15:48 +02:00
parent fe8fbf1a4a
commit dcba96d16e
4 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libs/utils/archive.cpp
View File

@@ -30,7 +30,7 @@
#include "environment.h"
#include "mimetypes/mimedatabase.h"
#include "qtcassert.h"
#include "synchronousprocess.h"
#include "qtcprocess.h"
#include <QDir>
#include <QPushButton>
@@ -208,7 +208,7 @@ Archive *Archive::unarchive(const FilePath &src, const FilePath &dest)
const QString workingDirectory = dest.toFileInfo().absoluteFilePath();
QDir(workingDirectory).mkpath(".");
archive->m_process = new QProcess;
archive->m_process = new QtcProcess;
archive->m_process->setProcessChannelMode(QProcess::MergedChannels);
QObject::connect(
archive->m_process,
@@ -265,15 +265,15 @@ Archive *Archive::unarchive(const FilePath &src, const FilePath &dest)
archive->m_process->setArguments(tool->arguments);
#endif
archive->m_process->setWorkingDirectory(workingDirectory);
archive->m_process->start(QProcess::ReadOnly);
archive->m_process->setOpenMode(QProcess::ReadOnly);
archive->m_process->start();
return archive;
}
void Archive::cancel()
{
if (!m_process)
return;
SynchronousProcess::stopProcess(*m_process);
if (m_process)
m_process->stopProcess();
}
} // namespace Utils