From 361afb401b5d59c6435b2a67a86980d66c60c9ee Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Thu, 28 Jun 2018 15:55:14 +0800 Subject: [PATCH] Replace less-efficient QProcess::setEnvironment Also small refactor --- src/base/search/searchpluginmanager.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/base/search/searchpluginmanager.cpp b/src/base/search/searchpluginmanager.cpp index c00bc80f6..71bc33938 100644 --- a/src/base/search/searchpluginmanager.cpp +++ b/src/base/search/searchpluginmanager.cpp @@ -433,15 +433,13 @@ void SearchPluginManager::updateNova() void SearchPluginManager::update() { QProcess nova; - nova.setEnvironment(QProcess::systemEnvironment()); - QStringList params; - params << Utils::Fs::toNativePath(engineLocation() + "/nova2.py"); - params << "--capabilities"; + nova.setProcessEnvironment(QProcessEnvironment::systemEnvironment()); + + const QStringList params {Utils::Fs::toNativePath(engineLocation() + "/nova2.py"), "--capabilities"}; nova.start(Utils::ForeignApps::pythonInfo().executableName, params, QIODevice::ReadOnly); - nova.waitForStarted(); nova.waitForFinished(); - QString capabilities = QString(nova.readAll()); + QString capabilities = nova.readAll(); QDomDocument xmlDoc; if (!xmlDoc.setContent(capabilities)) { qWarning() << "Could not parse Nova search engine capabilities, msg: " << capabilities.toLocal8Bit().data(); @@ -466,7 +464,8 @@ void SearchPluginManager::update() plugin->fullName = engineElem.elementsByTagName("name").at(0).toElement().text(); plugin->url = engineElem.elementsByTagName("url").at(0).toElement().text(); - foreach (QString cat, engineElem.elementsByTagName("categories").at(0).toElement().text().split(" ")) { + const auto categories = engineElem.elementsByTagName("categories").at(0).toElement().text().split(' '); + for (QString cat : categories) { cat = cat.trimmed(); if (!cat.isEmpty()) plugin->supportedCategories << cat;