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

Core: Use QtcProcess in SpotlightLocatorFilter

Browse Source 
After that, all Core::Reaper::reap are operating on QtcProcess
instances. That would allow for moving this into QtcProcess and
making some more widespread uses easier.

Change-Id: I7a8f3a0b63997ae4c883b723197d9f480a9506f8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2021-05-27 12:07:32 +02:00
parent 85613d662a
commit 523ae2c868
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/coreplugin/locator/spotlightlocatorfilter.cpp
View File

@@ -37,6 +37,7 @@
#include <utils/macroexpander.h> #include <utils/macroexpander.h>
#include <utils/pathchooser.h> #include <utils/pathchooser.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/qtcprocess.h>
#include <utils/stringutils.h> #include <utils/stringutils.h>
#include <utils/variablechooser.h> #include <utils/variablechooser.h>
@@ -73,7 +74,7 @@ public:
private: private:
void ensureNext(); void ensureNext();
std::unique_ptr<QProcess> m_process; std::unique_ptr<QtcProcess> m_process;
QMutex m_mutex; QMutex m_mutex;
QWaitCondition m_waitForItems; QWaitCondition m_waitForItems;
QList<FilePath> m_queue; QList<FilePath> m_queue;
@@ -87,11 +88,10 @@ SpotlightIterator::SpotlightIterator(const QStringList &command)
, m_finished(false) , m_finished(false)
{ {
QTC_ASSERT(!command.isEmpty(), return ); QTC_ASSERT(!command.isEmpty(), return );
m_process.reset(new QProcess); m_process.reset(new QtcProcess);
m_process->setProgram( m_process->setCommand({Environment::systemEnvironment().searchInPath(command.first()),
Utils::Environment::systemEnvironment().searchInPath(command.first()).toString()); command.mid(1)});
m_process->setArguments(command.mid(1)); m_process->setEnvironment(Utils::Environment::systemEnvironment());
m_process->setProcessEnvironment(Utils::Environment::systemEnvironment().toProcessEnvironment());
QObject::connect(m_process.get(), QObject::connect(m_process.get(),
QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
[this] { scheduleKillProcess(); }); [this] { scheduleKillProcess(); });
@@ -111,7 +111,8 @@ SpotlightIterator::SpotlightIterator(const QStringList &command)
scheduleKillProcess(); scheduleKillProcess();
m_waitForItems.wakeAll(); m_waitForItems.wakeAll();
}); });
m_process->start(QIODevice::ReadOnly); m_process->setOpenMode(QIODevice::ReadOnly);
m_process->start();
} }
SpotlightIterator::~SpotlightIterator() SpotlightIterator::~SpotlightIterator()