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

QtcProcess: Limit the inclusion of qtcprocess.h

Browse Source 
Move the rest of QtcProcess enums to processenums.h.
Move ExitCodeInterpreter into processenums.h.
Remove superfluous Utils:: prefix.

Change-Id: Iaa596f353d33d6930085a621b114cc15a35caa80
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-03-02 04:12:25 +01:00
parent 6ff1723c4c
commit 8e0ae8ba96
76 changed files with 335 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/android/androidavdmanager.cpp
View File

@@ -66,13 +66,13 @@ const int avdCreateTimeoutMs = 30000;
bool AndroidAvdManager::avdManagerCommand(const AndroidConfig &config, const QStringList &args, QString *output)
{
CommandLine cmd(config.avdManagerToolPath(), args);
Utils::QtcProcess proc;
QtcProcess proc;
Environment env = AndroidConfigurations::toolsEnvironment(config);
proc.setEnvironment(env);
qCDebug(avdManagerLog) << "Running AVD Manager command:" << cmd.toUserOutput();
proc.setCommand(cmd);
proc.runBlocking();
if (proc.result() == Utils::QtcProcess::FinishedWithSuccess) {
if (proc.result() == ProcessResult::FinishedWithSuccess) {
if (output)
*output = proc.allOutput();
return true;
@@ -196,7 +196,7 @@ AndroidAvdManager::~AndroidAvdManager() = default;
QFuture<CreateAvdInfo> AndroidAvdManager::createAvd(CreateAvdInfo info) const
{
return Utils::runAsync(&createAvdCommand, m_config, info);
return runAsync(&createAvdCommand, m_config, info);
}
bool AndroidAvdManager::removeAvd(const QString &name) const
@@ -208,12 +208,12 @@ bool AndroidAvdManager::removeAvd(const QString &name) const
proc.setEnvironment(AndroidConfigurations::toolsEnvironment(m_config));
proc.setCommand(command);
proc.runBlocking();
return proc.result() == QtcProcess::FinishedWithSuccess;
return proc.result() == ProcessResult::FinishedWithSuccess;
}
static void avdConfigEditManufacturerTag(const QString &avdPathStr, bool recoverMode = false)
{
const Utils::FilePath avdPath = Utils::FilePath::fromString(avdPathStr);
const FilePath avdPath = FilePath::fromString(avdPathStr);
if (avdPath.exists()) {
const QString configFilePath = avdPath.pathAppended("config.ini").toString();
QFile configFile(configFilePath);
@@ -273,7 +273,7 @@ static AndroidDeviceInfoList listVirtualDevices(const AndroidConfig &config)
QFuture<AndroidDeviceInfoList> AndroidAvdManager::avdList() const
{
return Utils::runAsync(listVirtualDevices, m_config);
return runAsync(listVirtualDevices, m_config);
}
QString AndroidAvdManager::startAvd(const QString &name) const
@@ -356,7 +356,7 @@ bool AndroidAvdManager::isAvdBooted(const QString &device) const
adbProc.setTimeoutS(10);
adbProc.setCommand(command);
adbProc.runBlocking();
if (adbProc.result() != QtcProcess::FinishedWithSuccess)
if (adbProc.result() != ProcessResult::FinishedWithSuccess)
return false;
QString value = adbProc.allOutput().trimmed();
return value == "stopped";