diff --git a/src/runnercontext.cpp b/src/runnercontext.cpp
index fc97398..de0885b 100644
--- a/src/runnercontext.cpp
+++ b/src/runnercontext.cpp
@@ -1,604 +1,608 @@
 /*
  *   Copyright 2006-2007 Aaron Seigo <aseigo@kde.org>
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
  *   published by the Free Software Foundation; either version 2, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *   GNU General Public License for more details
  *
  *   You should have received a copy of the GNU Library General Public
  *   License along with this program; if not, write to the
  *   Free Software Foundation, Inc.,
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
 #include "runnercontext.h"
 
 #include <cmath>
 
 #include <QReadWriteLock>
 
 #include <QDir>
 #include <QFile>
 #include <QFileInfo>
+#include <QRegularExpression>
 #include <QSharedData>
 
 #include <kconfiggroup.h>
 #include "krunner_debug.h"
 #include <qmimedatabase.h>
 #include <kshell.h>
 #include <qstandardpaths.h>
 #include <qurl.h>
 #include <kprotocolinfo.h>
 
 #include "abstractrunner.h"
 #include "querymatch.h"
 
 //#define LOCK_FOR_READ(d) if (d->policy == Shared) { d->lock.lockForRead(); }
 //#define LOCK_FOR_WRITE(d) if (d->policy == Shared) { d->lock.lockForWrite(); }
 //#define UNLOCK(d) if (d->policy == Shared) { d->lock.unlock(); }
 
 #define LOCK_FOR_READ(d) d->lock.lockForRead();
 #define LOCK_FOR_WRITE(d) d->lock.lockForWrite();
 #define UNLOCK(d) d->lock.unlock();
 
 namespace Plasma
 {
 
 /*
 Corrects the case of the last component in a path (e.g. /usr/liB -> /usr/lib)
 path: The path to be processed.
 correctCasePath: The corrected-case path
 mustBeDir: Tells whether the last component is a folder or doesn't matter
 Returns true on success and false on error, in case of error, correctCasePath is not modified
 */
 bool correctLastComponentCase(const QString &path, QString &correctCasePath, const bool mustBeDir)
 {
     //qCDebug(KRUNNER) << "Correcting " << path;
 
     // If the file already exists then no need to search for it.
     if (QFile::exists(path)) {
         correctCasePath = path;
         //qCDebug(KRUNNER) << "Correct path is" << correctCasePath;
         return true;
     }
 
     const QFileInfo pathInfo(path);
 
     const QDir fileDir = pathInfo.dir();
     //qCDebug(KRUNNER) << "Directory is" << fileDir;
 
     const QString filename = pathInfo.fileName();
     //qCDebug(KRUNNER) << "Filename is" << filename;
 
     //qCDebug(KRUNNER) << "searching for a" << (mustBeDir ? "directory" : "directory/file");
 
     const QStringList matchingFilenames = fileDir.entryList(QStringList(filename),
                                           mustBeDir ? QDir::Dirs : QDir::NoFilter);
 
     if (matchingFilenames.empty()) {
         //qCDebug(KRUNNER) << "No matches found!!\n";
         return false;
     } else {
         /*if (matchingFilenames.size() > 1) {
 #ifndef NDEBUG
             // qCDebug(KRUNNER) << "Found multiple matches!!\n";
 #endif
         }*/
 
         if (fileDir.path().endsWith(QDir::separator())) {
             correctCasePath = fileDir.path() + matchingFilenames[0];
         } else {
             correctCasePath = fileDir.path() + QDir::separator() + matchingFilenames[0];
         }
 
         //qCDebug(KRUNNER) << "Correct path is" << correctCasePath;
         return true;
     }
 }
 
 /*
 Corrects the case of a path (e.g. /uSr/loCAL/bIN -> /usr/local/bin)
 path: The path to be processed.
 corrected: The corrected-case path
 Returns true on success and false on error, in case of error, corrected is not modified
 */
 bool correctPathCase(const QString& path, QString &corrected)
 {
     // early exit check
     if (QFile::exists(path)) {
         corrected = path;
         return true;
     }
 
     // path components
     QStringList components = QString(path).split(QDir::separator());
 
     if (components.size() < 1) {
         return false;
     }
 
     const bool mustBeDir = components.back().isEmpty();
 
     //qCDebug(KRUNNER) << "Components are" << components;
 
     if (mustBeDir) {
         components.pop_back();
     }
 
     if (components.isEmpty()) {
         return true;
     }
 
     QString correctPath;
     const int initialComponents = components.size();
     for (int i = 0; i < initialComponents - 1; i++) {
         const QString tmp = components[0] + QDir::separator() + components[1];
 
         if (!correctLastComponentCase(tmp, correctPath, components.size() > 2 || mustBeDir)) {
             //qCDebug(KRUNNER) << "search was not successful";
             return false;
         }
 
         components.removeFirst();
         components[0] = correctPath;
     }
 
     corrected = correctPath;
     return true;
 }
 
 class RunnerContextPrivate : public QSharedData
 {
     public:
         RunnerContextPrivate(RunnerContext *context)
             : QSharedData(),
               type(RunnerContext::UnknownType),
               q(context),
               singleRunnerQueryMode(false)
         {
         }
 
         RunnerContextPrivate(const RunnerContextPrivate &p)
             : QSharedData(),
               launchCounts(p.launchCounts),
               type(RunnerContext::None),
               q(p.q),
               singleRunnerQueryMode(false)
         {
             //qCDebug(KRUNNER) << "¿¿¿¿¿¿¿¿¿¿¿¿¿¿¿¿¿boo yeah" << type;
         }
 
         ~RunnerContextPrivate()
         {
         }
 
         /**
          * Determines type of query
                     &&
          */
         void determineType()
         {
             // NOTE! this method must NEVER be called from
             // code that may be running in multiple threads
             // with the same data.
             type = RunnerContext::UnknownType;
             QString path = QDir::cleanPath(KShell::tildeExpand(term));
 
             int space = path.indexOf(QLatin1Char(' '));
             if (!QStandardPaths::findExecutable(path.left(space)).isEmpty()) {
                 // it's a shell command if there's a space because that implies
                 // that it has arguments!
                 type = (space > 0) ? RunnerContext::ShellCommand :
                                      RunnerContext::Executable;
             } else {
                 QUrl url = QUrl::fromUserInput(term);
                 // QUrl::fromUserInput assigns http to everything if it cannot match it to
                 // anything else. We do not want that.
                 if (url.scheme() == QLatin1String("http")) {
                     if (!term.startsWith(QLatin1String("http"))) {
                         url.setScheme(QString());
                     }
                 }
                 const bool hasProtocol = !url.scheme().isEmpty();
                 const bool isLocalProtocol = hasProtocol && KProtocolInfo::protocolClass(url.scheme()) == QLatin1String(":local");
                 if ((hasProtocol &&
                     ((!isLocalProtocol && !url.host().isEmpty()) ||
                      (isLocalProtocol && url.scheme() != QLatin1String("file"))))
                         || term.startsWith(QLatin1String("\\\\"))) {
                     // we either have a network protocol with a host, so we can show matches for it
                     // or we have a non-file url that may be local so a host isn't required
                     // or we have an UNC path (\\foo\bar)
                     type = RunnerContext::NetworkLocation;
                 } else if (isLocalProtocol) {
                     // at this point in the game, we assume we have a path,
                     // but if a path doesn't have any slashes
                     // it's too ambiguous to be sure we're in a filesystem context
                     path = QDir::cleanPath(url.toLocalFile());
                     //qCDebug(KRUNNER)<< "slash check" << path;
                     if (hasProtocol || ((path.indexOf(QLatin1Char('/')) != -1 || path.indexOf(QLatin1Char('\\')) != -1))) {
                         QString correctCasePath;
                         if (correctPathCase(path, correctCasePath)) {
                             path = correctCasePath;
                             QFileInfo info(path);
                             //qCDebug(KRUNNER)<< "correct cas epath is" << correctCasePath << info.isSymLink() <<
                             //    info.isDir() << info.isFile();
 
                             if (info.isSymLink()) {
                                 path = info.canonicalFilePath();
                                 info = QFileInfo(path);
                             }
                             if (info.isDir()) {
                                 type = RunnerContext::Directory;
                                 mimeType = QStringLiteral("inode/folder");
                             } else if (info.isFile()) {
                                 type = RunnerContext::File;
                                 QMimeDatabase db;
                                 QMimeType mime = db.mimeTypeForFile(path);
                                 if (!mime.isDefault()) {
                                     mimeType = mime.name();
                                 }
                             }
                         }
                     }
                 }
             }
 
             //qCDebug(KRUNNER) << "term2type" << term << type;
         }
 
         void invalidate()
         {
             q = &s_dummyContext;
         }
 
         QReadWriteLock lock;
         QList<QueryMatch> matches;
         QMap<QString, const QueryMatch*> matchesById;
         QHash<QString, int> launchCounts;
         QString term;
         QString mimeType;
         QStringList enabledCategories;
         RunnerContext::Type type;
         RunnerContext * q;
         static RunnerContext s_dummyContext;
         bool singleRunnerQueryMode;
 };
 
 RunnerContext RunnerContextPrivate::s_dummyContext;
 
 RunnerContext::RunnerContext(QObject *parent)
     : QObject(parent),
       d(new RunnerContextPrivate(this))
 {
 }
 
 //copy ctor
 RunnerContext::RunnerContext(RunnerContext &other, QObject *parent)
     : QObject(parent)
 {
     LOCK_FOR_READ(other.d)
     d = other.d;
     UNLOCK(other.d)
 }
 
 RunnerContext::~RunnerContext()
 {
 }
 
 RunnerContext &RunnerContext::operator=(const RunnerContext &other)
 {
     if (this->d == other.d) {
         return *this;
     }
 
     QExplicitlySharedDataPointer<Plasma::RunnerContextPrivate> oldD = d;
     LOCK_FOR_WRITE(d)
     LOCK_FOR_READ(other.d)
     d = other.d;
     UNLOCK(other.d)
     UNLOCK(oldD)
     return *this;
 }
 
 void RunnerContext::reset()
 {
     LOCK_FOR_WRITE(d);
     // We will detach if we are a copy of someone. But we will reset
     // if we are the 'main' context others copied from. Resetting
     // one RunnerContext makes all the copies obsolete.
 
     // We need to mark the q pointer of the detached RunnerContextPrivate
     // as dirty on detach to avoid receiving results for old queries
     d->invalidate();
     UNLOCK(d);
 
     d.detach();
 
     // Now that we detached the d pointer we need to reset its q pointer
 
     d->q = this;
 
     // we still have to remove all the matches, since if the
     // ref count was 1 (e.g. only the RunnerContext is using
     // the dptr) then we won't get a copy made
     if (!d->matches.isEmpty()) {
         d->matchesById.clear();
         d->matches.clear();
         emit matchesChanged();
     }
 
     d->term.clear();
     d->mimeType.clear();
     d->type = UnknownType;
     d->singleRunnerQueryMode = false;
     //qCDebug(KRUNNER) << "match count" << d->matches.count();
 }
 
 void RunnerContext::setQuery(const QString &term)
 {
     reset();
 
     if (term.isEmpty()) {
         return;
     }
 
     d->term = term;
     d->determineType();
 }
 
 QString RunnerContext::query() const
 {
     // the query term should never be set after
     // a search starts. in fact, reset() ensures this
     // and setQuery(QString) calls reset()
     return d->term;
 }
 
 void RunnerContext::setEnabledCategories(const QStringList& categories)
 {
     d->enabledCategories = categories;
 }
 
 QStringList RunnerContext::enabledCategories() const
 {
     return d->enabledCategories;
 }
 
 RunnerContext::Type RunnerContext::type() const
 {
     return d->type;
 }
 
 QString RunnerContext::mimeType() const
 {
     return d->mimeType;
 }
 
 bool RunnerContext::isValid() const
 {
     // if our qptr is dirty, we aren't useful anymore
     LOCK_FOR_READ(d)
     const bool valid = (d->q != &(d->s_dummyContext));
     UNLOCK(d)
     return valid;
 }
 
 bool RunnerContext::addMatches(const QList<QueryMatch> &matches)
 {
     if (matches.isEmpty() || !isValid()) {
        //Bail out if the query is empty or the qptr is dirty
         return false;
     }
 
     LOCK_FOR_WRITE(d)
     for (QueryMatch match : matches) {
         // Give previously launched matches a slight boost in relevance
         // The boost smoothly saturates to 0.5;
         if (int count = d->launchCounts.value(match.id())) {
             match.setRelevance(match.relevance() + 0.5 * (1-exp(-count*0.3)));
         }
 
         d->matches.append(match);
 #ifndef NDEBUG
         if (d->matchesById.contains(match.id())) {
             // qCDebug(KRUNNER) << "Duplicate match id " << match.id() << "from" << match.runner()->name();
         }
 #endif
         d->matchesById.insert(match.id(), &d->matches.at(d->matches.size() - 1));
     }
     UNLOCK(d);
     //qCDebug(KRUNNER)<< "add matches";
     // A copied searchContext may share the d pointer,
     // we always want to sent the signal of the object that created
     // the d pointer
     emit d->q->matchesChanged();
 
     return true;
 }
 
 bool RunnerContext::addMatch(const QueryMatch &match)
 {
     if (!isValid()) {
         // Bail out if the qptr is dirty
         return false;
     }
 
     QueryMatch m(match); // match must be non-const to modify relevance
 
     LOCK_FOR_WRITE(d)
 
     if (int count = d->launchCounts.value(m.id())) {
         m.setRelevance(m.relevance() + 0.05 * count);
     }
 
     d->matches.append(m);
     d->matchesById.insert(m.id(), &d->matches.at(d->matches.size() - 1));
     UNLOCK(d);
     //qCDebug(KRUNNER)<< "added match" << match->text();
     emit d->q->matchesChanged();
 
     return true;
 }
 
 bool RunnerContext::removeMatches(const QStringList matchIdList)
 {
     if (!isValid()) {
         return false;
     }
 
     QStringList presentMatchIdList;
     QList<const QueryMatch*> presentMatchList;
 
     LOCK_FOR_READ(d)
     for (const QString &matchId : matchIdList) {
         const QueryMatch* match = d->matchesById.value(matchId, nullptr);
         if (match) {
             presentMatchList << match;
             presentMatchIdList << matchId;
         }
     }
     UNLOCK(d)
 
     if (presentMatchIdList.isEmpty()) {
         return false;
     }
 
     LOCK_FOR_WRITE(d)
     for (const QueryMatch *match : qAsConst(presentMatchList)) {
         d->matches.removeAll(*match);
     }
     for (const QString &matchId : qAsConst(presentMatchIdList)) {
         d->matchesById.remove(matchId);
     }
     UNLOCK(d)
 
     emit d->q->matchesChanged();
 
     return true;
 }
 
 bool RunnerContext::removeMatch(const QString matchId)
 {
     if (!isValid()) {
         return false;
     }
     LOCK_FOR_READ(d)
     const QueryMatch* match = d->matchesById.value(matchId, nullptr);
     UNLOCK(d)
     if (!match) {
         return false;
     }
     LOCK_FOR_WRITE(d)
     d->matches.removeAll(*match);
     d->matchesById.remove(matchId);
     UNLOCK(d)
     emit d->q->matchesChanged();
 
     return true;
 }
 
 bool RunnerContext::removeMatches(Plasma::AbstractRunner *runner)
 {
     if (!isValid()) {
         return false;
     }
 
     QList<QueryMatch> presentMatchList;
 
     LOCK_FOR_READ(d)
     for(const QueryMatch &match : qAsConst(d->matches)) {
         if (match.runner() == runner) {
             presentMatchList << match;
         }
     }
     UNLOCK(d)
 
     if (presentMatchList.isEmpty()) {
         return false;
     }
 
     LOCK_FOR_WRITE(d)
     for (const QueryMatch &match : qAsConst(presentMatchList)) {
         d->matchesById.remove(match.id());
         d->matches.removeAll(match);
     }
     UNLOCK(d)
 
     emit d->q->matchesChanged();
     return true;
 }
 
 QList<QueryMatch> RunnerContext::matches() const
 {
     LOCK_FOR_READ(d)
     QList<QueryMatch> matches = d->matches;
     UNLOCK(d);
     return matches;
 }
 
 QueryMatch RunnerContext::match(const QString &id) const
 {
     LOCK_FOR_READ(d)
     const QueryMatch *match = d->matchesById.value(id, nullptr);
     UNLOCK(d)
 
     if (match) {
         return *match;
     }
 
     return QueryMatch(nullptr);
 }
 
 void RunnerContext::setSingleRunnerQueryMode(bool enabled)
 {
     d->singleRunnerQueryMode = enabled;
 }
 
 bool RunnerContext::singleRunnerQueryMode() const
 {
     return d->singleRunnerQueryMode;
 }
 
 void RunnerContext::restore(const KConfigGroup &config)
 {
     const QStringList cfgList = config.readEntry("LaunchCounts", QStringList());
 
-    const QRegExp r(QStringLiteral("(\\d*) (.*)"));
+    const QRegularExpression re(QStringLiteral("(\\d*) (.+)"));
     for (const QString& entry : cfgList) {
-        r.indexIn(entry);
-        int count = r.cap(1).toInt();
-        QString id = r.cap(2);
+        const QRegularExpressionMatch match = re.match(entry);
+        if (!match.hasMatch()) {
+            continue;
+        }
+        const int count = match.captured(1).toInt();
+        const QString id = match.captured(2);
         d->launchCounts[id] = count;
     }
 }
 
 void RunnerContext::save(KConfigGroup &config)
 {
     QStringList countList;
 
     typedef QHash<QString, int>::const_iterator Iterator;
     Iterator end = d->launchCounts.constEnd();
     for (Iterator i = d->launchCounts.constBegin(); i != end; ++i) {
         countList << QStringLiteral("%2 %1").arg(i.key()).arg(i.value());
     }
 
     config.writeEntry("LaunchCounts", countList);
     config.sync();
 }
 
 void RunnerContext::run(const QueryMatch &match)
 {
     ++d->launchCounts[match.id()];
     match.run(*this);
 }
 
 } // Plasma namespace
 
 
 #include "moc_runnercontext.cpp"
diff --git a/src/runnermanager.cpp b/src/runnermanager.cpp
index 665a86d..6cfafe6 100644
--- a/src/runnermanager.cpp
+++ b/src/runnermanager.cpp
@@ -1,853 +1,853 @@
 /*
  *   Copyright (C) 2006 Aaron Seigo <aseigo@kde.org>
  *   Copyright (C) 2007, 2009 Ryan P. Bitanga <ryan.bitanga@gmail.com>
  *   Copyright (C) 2008 Jordi Polo <mumismo@gmail.com>
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
  *   published by the Free Software Foundation; either version 2, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *   GNU General Public License for more details
  *
  *   You should have received a copy of the GNU Library General Public
  *   License along with this program; if not, write to the
  *   Free Software Foundation, Inc.,
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
 #include "runnermanager.h"
 
 #include <QElapsedTimer>
 #include <QTimer>
 #include <QCoreApplication>
 #include <qstandardpaths.h>
 #include "krunner_debug.h"
 
 #include <ksharedconfig.h>
 #include <kplugininfo.h>
 #include <kservicetypetrader.h>
 
 #include <ThreadWeaver/DebuggingAids>
 #include <ThreadWeaver/Queue>
 #include <ThreadWeaver/Thread>
 
 #include "dbusrunner_p.h"
 #include "runnerjobs_p.h"
 #include "plasma/pluginloader.h"
 #include <plasma/version.h>
 #include "querymatch.h"
 
 using ThreadWeaver::Queue;
 using ThreadWeaver::Job;
 
 //#define MEASURE_PREPTIME
 
 namespace Plasma
 {
 
 /*****************************************************
 *  RunnerManager::Private class
 *
 *****************************************************/
 class RunnerManagerPrivate
 {
 public:
 
     RunnerManagerPrivate(RunnerManager *parent)
       : q(parent),
         deferredRun(nullptr),
         currentSingleRunner(nullptr),
         prepped(false),
         allRunnersPrepped(false),
         singleRunnerPrepped(false),
         teardownRequested(false),
         singleMode(false),
         singleRunnerWasLoaded(false)
     {
         matchChangeTimer.setSingleShot(true);
         delayTimer.setSingleShot(true);
 
         QObject::connect(&matchChangeTimer, SIGNAL(timeout()), q, SLOT(matchesChanged()));
         QObject::connect(&context, SIGNAL(matchesChanged()), q, SLOT(scheduleMatchesChanged()));
         QObject::connect(&delayTimer, SIGNAL(timeout()), q, SLOT(unblockJobs()));
 
         // Set up tracking of the last time matchesChanged was signalled
         lastMatchChangeSignalled.start();
         QObject::connect(q, &RunnerManager::matchesChanged, q, [&] { lastMatchChangeSignalled.restart(); });
     }
 
     ~RunnerManagerPrivate()
     {
         KConfigGroup config = configGroup();
         context.save(config);
     }
 
     void scheduleMatchesChanged()
     {
         if(lastMatchChangeSignalled.hasExpired(250)) {
             matchChangeTimer.stop();
             emit q->matchesChanged(context.matches());
         } else {
             matchChangeTimer.start(250 - lastMatchChangeSignalled.elapsed());
         }
     }
 
     void matchesChanged()
     {
         emit q->matchesChanged(context.matches());
     }
 
     void loadConfiguration()
     {
         KConfigGroup config = configGroup();
 
         // Limit the number of instances of a single normal speed runner and all of the slow runners
         // to half the number of threads
         DefaultRunnerPolicy::instance().setCap(qMax(2, Queue::instance()->maximumNumberOfThreads() / 2));
 
         enabledCategories = config.readEntry("enabledCategories", QStringList());
         context.restore(config);
     }
 
     KConfigGroup configGroup()
     {
         return conf.isValid() ? conf : KConfigGroup(KSharedConfig::openConfig(), "PlasmaRunnerManager");
     }
 
     void clearSingleRunner()
     {
         if (singleRunnerWasLoaded) {
             delete currentSingleRunner;
         }
 
         currentSingleRunner = nullptr;
     }
 
     void loadSingleRunner()
     {
         if (!singleMode || singleModeRunnerId.isEmpty()) {
             clearSingleRunner();
             return;
         }
 
         if (currentSingleRunner) {
             if (currentSingleRunner->id() == singleModeRunnerId) {
                 return;
             }
 
             clearSingleRunner();
         }
 
         AbstractRunner *loadedRunner = q->runner(singleModeRunnerId);
         if (loadedRunner) {
             singleRunnerWasLoaded = false;
             currentSingleRunner = loadedRunner;
             return;
         }
 
         KService::List offers = KServiceTypeTrader::self()->query(QStringLiteral("Plasma/Runner"), QStringLiteral("[X-KDE-PluginInfo-Name] == '%1'").arg(singleModeRunnerId));
         if (!offers.isEmpty()) {
             const KService::Ptr &service = offers[0];
             currentSingleRunner = loadInstalledRunner(service);
 
             if (currentSingleRunner) {
                 emit currentSingleRunner->prepare();
                 singleRunnerWasLoaded = true;
             }
         }
     }
 
     void loadRunners()
     {
         KConfigGroup config = configGroup();
         KPluginInfo::List offers = RunnerManager::listRunnerInfo();
 
         const bool loadAll = config.readEntry("loadAll", false);
         const QStringList whiteList = config.readEntry("pluginWhiteList", QStringList());
         const bool noWhiteList = whiteList.isEmpty();
         KConfigGroup pluginConf;
         if (conf.isValid()) {
             pluginConf = KConfigGroup(&conf, "Plugins");
         } else {
             pluginConf = KConfigGroup(KSharedConfig::openConfig(), "Plugins");
         }
 
         advertiseSingleRunnerIds.clear();
 
         QStringList allCategories;
         QSet<AbstractRunner *> deadRunners;
         QMutableListIterator<KPluginInfo> it(offers);
         while (it.hasNext()) {
             KPluginInfo &description = it.next();
             qCDebug(KRUNNER) << "Loading runner: " << description.pluginName();
 
             QString tryExec = description.property(QStringLiteral("TryExec")).toString();
             if (!tryExec.isEmpty() && QStandardPaths::findExecutable(tryExec).isEmpty()) {
                 // we don't actually have this application!
                 continue;
             }
 
             const QString runnerName = description.pluginName();
             description.load(pluginConf);
 
             const bool loaded = runners.contains(runnerName);
             const bool selected = loadAll || (description.isPluginEnabled() && (noWhiteList || whiteList.contains(runnerName)));
 
             const bool singleQueryModeEnabled = description.property(QStringLiteral("X-Plasma-AdvertiseSingleRunnerQueryMode")).toBool();
 
             if (singleQueryModeEnabled) {
                 advertiseSingleRunnerIds.insert(runnerName, description.name());
             }
 
             if (selected) {
                 AbstractRunner *runner = nullptr;
                 if (!loaded) {
                     runner = loadInstalledRunner(description.service());
                 } else {
                     runner = runners.value(runnerName);
                     runner->reloadConfiguration();
                 }
 
                 if (runner) {
                     const QStringList categories = runner->categories();
                     allCategories << categories;
 
                     bool allCategoriesDisabled = true;
                     for (const QString &cat : categories) {
                         if (enabledCategories.contains(cat)) {
                             allCategoriesDisabled = false;
                             break;
                         }
                     }
 
                     if (enabledCategories.isEmpty() || !allCategoriesDisabled) {
                         qCDebug(KRUNNER) << "Loaded:" << runnerName;
                         runners.insert(runnerName, runner);
                     } else {
                         runners.remove(runnerName);
                         deadRunners.insert(runner);
                         qCDebug(KRUNNER) << "Categories not enabled. Removing runner: " << runnerName;
                     }
                 }
             } else if (loaded) {
                 //Remove runner
                 deadRunners.insert(runners.take(runnerName));
                 qCDebug(KRUNNER) << "Plugin disabled. Removing runner: " << runnerName;
             }
         }
 
         if (enabledCategories.isEmpty()) {
             enabledCategories = allCategories;
         }
 
         if (!deadRunners.isEmpty()) {
                 QSet<QSharedPointer<FindMatchesJob> > deadJobs;
                 auto it = searchJobs.begin();
                 while (it != searchJobs.end()) {
                     auto &job = (*it);
                     if (deadRunners.contains(job->runner())) {
                         QObject::disconnect(job.data(), SIGNAL(done(ThreadWeaver::JobPointer)), q, SLOT(jobDone(ThreadWeaver::JobPointer)));
                         it = searchJobs.erase(it);
                         deadJobs.insert(job);
                     } else {
                         it++;
                     }
                 }
 
                 it = oldSearchJobs.begin();
                 while (it != oldSearchJobs.end()) {
                     auto &job = (*it);
                     if (deadRunners.contains(job->runner())) {
                         it = oldSearchJobs.erase(it);
                         deadJobs.insert(job);
                     } else {
                         it++;
                     }
                 }
 
             if (deadJobs.isEmpty()) {
                 qDeleteAll(deadRunners);
             } else {
                 new DelayedJobCleaner(deadJobs, deadRunners);
             }
         }
 
         if (!singleRunnerWasLoaded) {
             // in case we deleted it up above
             clearSingleRunner();
         }
 
 #ifndef NDEBUG
         // qCDebug(KRUNNER) << "All runners loaded, total:" << runners.count();
 #endif
     }
 
     AbstractRunner *loadInstalledRunner(const KService::Ptr service)
     {
         if (!service) {
             return nullptr;
         }
 
         AbstractRunner *runner = nullptr;
 
         const QString api = service->property(QStringLiteral("X-Plasma-API")).toString();
 
         if (api.isEmpty()) {
             QVariantList args;
             args << service->storageId();
             if (Plasma::isPluginVersionCompatible(KPluginLoader(*service).pluginVersion())) {
                 QString error;
                 runner = service->createInstance<AbstractRunner>(q, args, &error);
                 if (!runner) {
 #ifndef NDEBUG
                     // qCDebug(KRUNNER) << "Failed to load runner:" << service->name() << ". error reported:" << error;
 #endif
                 }
             }
         } else if (api == QLatin1String("DBus")){
             runner = new DBusRunner(service, q);
         } else {
             //qCDebug(KRUNNER) << "got a script runner known as" << api;
             runner = new AbstractRunner(service, q);
         }
 
         if (runner) {
 #ifndef NDEBUG
             // qCDebug(KRUNNER) << "================= loading runner:" << service->name() << "=================";
 #endif
             QObject::connect(runner, SIGNAL(matchingSuspended(bool)), q, SLOT(runnerMatchingSuspended(bool)));
             runner->init();
             if (prepped) {
                 emit runner->prepare();
             }
         }
 
         return runner;
     }
 
     void jobDone(ThreadWeaver::JobPointer job)
     {
         auto runJob = job.dynamicCast<FindMatchesJob>();
 
         if (!runJob) {
             return;
         }
 
         if (deferredRun.isEnabled() && runJob->runner() == deferredRun.runner()) {
             //qCDebug(KRUNNER) << "job actually done, running now **************";
             QueryMatch tmpRun = deferredRun;
             deferredRun = QueryMatch(nullptr);
             tmpRun.run(context);
         }
 
         searchJobs.remove(runJob);
         oldSearchJobs.remove(runJob);
 
         if (searchJobs.isEmpty() && context.matches().isEmpty()) {
             // we finished our run, and there are no valid matches, and so no
             // signal will have been sent out. so we need to emit the signal
             // ourselves here
             emit q->matchesChanged(context.matches());
         }
 
         teardownRequested = true;
         checkTearDown();
     }
 
     void checkTearDown()
     {
         //qCDebug(KRUNNER) << prepped << teardownRequested << searchJobs.count() << oldSearchJobs.count();
 
         if (!prepped || !teardownRequested) {
             return;
         }
 
         if (Queue::instance()->isIdle()) {
             searchJobs.clear();
             oldSearchJobs.clear();
         }
 
         if (searchJobs.isEmpty() && oldSearchJobs.isEmpty()) {
             if (allRunnersPrepped) {
                 for (AbstractRunner *runner : qAsConst(runners)) {
                     emit runner->teardown();
                 }
 
                 allRunnersPrepped = false;
             }
 
             if (singleRunnerPrepped) {
                 if (currentSingleRunner) {
                     emit currentSingleRunner->teardown();
                 }
 
                 singleRunnerPrepped = false;
             }
 
             emit q->queryFinished();
 
             prepped = false;
             teardownRequested = false;
         }
     }
 
     void unblockJobs()
     {
         if (searchJobs.isEmpty() && Queue::instance()->isIdle()) {
             oldSearchJobs.clear();
             checkTearDown();
             return;
         }
 
         Queue::instance()->reschedule();
     }
 
     void runnerMatchingSuspended(bool suspended)
     {
         if (suspended || !prepped || teardownRequested) {
             return;
         }
 
         AbstractRunner *runner = qobject_cast<AbstractRunner *>(q->sender());
 
         if (runner) {
             startJob(runner);
         }
     }
 
     void startJob(AbstractRunner *runner)
     {
         if ((runner->ignoredTypes() & context.type()) == 0) {
             QSharedPointer<FindMatchesJob> job(new FindMatchesJob(runner, &context, Queue::instance()));
             QObject::connect(job.data(), SIGNAL(done(ThreadWeaver::JobPointer)), q, SLOT(jobDone(ThreadWeaver::JobPointer)));
             if (runner->speed() == AbstractRunner::SlowSpeed) {
                 job->setDelayTimer(&delayTimer);
             }
             Queue::instance()->enqueue(job);
             searchJobs.insert(job);
         }
     }
 
     // Delay in ms before slow runners are allowed to run
     static const int slowRunDelay = 400;
 
     RunnerManager *q;
     QueryMatch deferredRun;
     RunnerContext context;
     QTimer matchChangeTimer;
     QTimer delayTimer; // Timer to control when to run slow runners
     QElapsedTimer lastMatchChangeSignalled;
     QHash<QString, AbstractRunner*> runners;
     QHash<QString, QString> advertiseSingleRunnerIds;
     AbstractRunner* currentSingleRunner;
     QSet<QSharedPointer<FindMatchesJob> > searchJobs;
     QSet<QSharedPointer<FindMatchesJob> > oldSearchJobs;
     KConfigGroup conf;
     QStringList enabledCategories;
     QString singleModeRunnerId;
     bool prepped : 1;
     bool allRunnersPrepped : 1;
     bool singleRunnerPrepped : 1;
     bool teardownRequested : 1;
     bool singleMode : 1;
     bool singleRunnerWasLoaded : 1;
 };
 
 /*****************************************************
 *  RunnerManager::Public class
 *
 *****************************************************/
 RunnerManager::RunnerManager(QObject *parent)
     : QObject(parent),
       d(new RunnerManagerPrivate(this))
 {
     d->loadConfiguration();
     //ThreadWeaver::setDebugLevel(true, 4);
 }
 
 RunnerManager::RunnerManager(KConfigGroup &c, QObject *parent)
     : QObject(parent),
       d(new RunnerManagerPrivate(this))
 {
     // Should this be really needed? Maybe d->loadConfiguration(c) would make
     // more sense.
     d->conf = KConfigGroup(&c, "PlasmaRunnerManager");
     d->loadConfiguration();
     //ThreadWeaver::setDebugLevel(true, 4);
 }
 
 RunnerManager::~RunnerManager()
 {
     if (!qApp->closingDown() && (!d->searchJobs.isEmpty() || !d->oldSearchJobs.isEmpty())) {
         new DelayedJobCleaner(d->searchJobs + d->oldSearchJobs);
     }
 
     delete d;
 }
 
 void RunnerManager::reloadConfiguration()
 {
     KSharedConfig::openConfig()->reparseConfiguration();
     d->loadConfiguration();
     d->loadRunners();
 }
 
 void RunnerManager::setAllowedRunners(const QStringList &runners)
 {
     KConfigGroup config = d->configGroup();
     config.writeEntry("pluginWhiteList", runners);
 
     if (!d->runners.isEmpty()) {
         // this has been called with runners already created. so let's do an instant reload
         d->loadRunners();
     }
 }
 
 void RunnerManager::setEnabledCategories(const QStringList& categories)
 {
     KConfigGroup config = d->configGroup();
     config.writeEntry("enabledCategories", categories);
 
     d->enabledCategories = categories;
 
     if (!d->runners.isEmpty()) {
         d->loadRunners();
     }
 }
 
 QStringList RunnerManager::allowedRunners() const
 {
     KConfigGroup config = d->configGroup();
     return config.readEntry("pluginWhiteList", QStringList());
 }
 
 QStringList RunnerManager::enabledCategories() const
 {
     KConfigGroup config = d->configGroup();
     QStringList list = config.readEntry("enabledCategories", QStringList());
     if (list.isEmpty()) {
         list.reserve(d->runners.count());
         for (AbstractRunner* runner : qAsConst(d->runners)) {
             list << runner->categories();
         }
     }
 
     return list;
 }
 
 void RunnerManager::loadRunner(const KService::Ptr service)
 {
     KPluginInfo description(service);
     const QString runnerName = description.pluginName();
     if (!runnerName.isEmpty() && !d->runners.contains(runnerName)) {
         AbstractRunner *runner = d->loadInstalledRunner(service);
         if (runner) {
             d->runners.insert(runnerName, runner);
         }
     }
 }
 
 void RunnerManager::loadRunner(const QString &path)
 {
     if (!d->runners.contains(path)) {
         AbstractRunner *runner = new AbstractRunner(this, path);
         connect(runner, SIGNAL(matchingSuspended(bool)), this, SLOT(runnerMatchingSuspended(bool)));
         d->runners.insert(path, runner);
     }
 }
 
 AbstractRunner* RunnerManager::runner(const QString &name) const
 {
     if (d->runners.isEmpty()) {
         d->loadRunners();
     }
 
     return d->runners.value(name, nullptr);
 }
 
 AbstractRunner *RunnerManager::singleModeRunner() const
 {
     return d->currentSingleRunner;
 }
 
 void RunnerManager::setSingleModeRunnerId(const QString &id)
 {
     d->singleModeRunnerId = id;
     d->loadSingleRunner();
 }
 
 QString RunnerManager::singleModeRunnerId() const
 {
     return d->singleModeRunnerId;
 }
 
 bool RunnerManager::singleMode() const
 {
     return d->singleMode;
 }
 
 void RunnerManager::setSingleMode(bool singleMode)
 {
     if (d->singleMode == singleMode) {
         return;
     }
 
 
     Plasma::AbstractRunner *prevSingleRunner = d->currentSingleRunner;
     d->singleMode = singleMode;
     d->loadSingleRunner();
     d->singleMode = d->currentSingleRunner;
 
     if (prevSingleRunner != d->currentSingleRunner) {
         if (d->prepped) {
             matchSessionComplete();
 
             if (d->singleMode) {
                 setupMatchSession();
             }
         }
     }
 }
 
 QList<AbstractRunner *> RunnerManager::runners() const
 {
     return d->runners.values();
 }
 
 QStringList RunnerManager::singleModeAdvertisedRunnerIds() const
 {
     return d->advertiseSingleRunnerIds.keys();
 }
 
 QString RunnerManager::runnerName(const QString &id) const
 {
     if (runner(id)) {
         return runner(id)->name();
     } else {
         return d->advertiseSingleRunnerIds.value(id, QString());
     }
 }
 
 RunnerContext* RunnerManager::searchContext() const
 {
     return &d->context;
 }
 
 //Reordering is here so data is not reordered till strictly needed
 QList<QueryMatch> RunnerManager::matches() const
 {
     return d->context.matches();
 }
 
 void RunnerManager::run(const QString &matchId)
 {
     run(d->context.match(matchId));
 }
 
 void RunnerManager::run(const QueryMatch &match)
 {
     if (!match.isEnabled()) {
         return;
     }
 
     //TODO: this function is not const as it may be used for learning
     AbstractRunner *runner = match.runner();
 
     for (auto it = d->searchJobs.constBegin(); it != d->searchJobs.constEnd(); ++it) {
         if ((*it)->runner() == runner && !(*it)->isFinished()) {
 #ifndef NDEBUG
             // qCDebug(KRUNNER) << "deferred run";
 #endif
             d->deferredRun = match;
             return;
         }
     }
 
     if (d->deferredRun.isValid()) {
         d->deferredRun = QueryMatch(nullptr);
     }
 
     d->context.run(match);
 }
 
 QList<QAction*> RunnerManager::actionsForMatch(const QueryMatch &match)
 {
     AbstractRunner *runner = match.runner();
     if (runner) {
         return runner->actionsForMatch(match);
     }
 
     return QList<QAction*>();
 }
 
 QMimeData * RunnerManager::mimeDataForMatch(const QString &id) const
 {
     return mimeDataForMatch(d->context.match(id));
 }
 
 
 QMimeData * RunnerManager::mimeDataForMatch(const QueryMatch &match) const
 {
     AbstractRunner *runner = match.runner();
     if (runner) {
         return runner->mimeDataForMatch(match);
     }
 
     return nullptr;
 }
 
 KPluginInfo::List RunnerManager::listRunnerInfo(const QString &parentApp)
 {
     QString constraint;
     if (parentApp.isEmpty()) {
         constraint.append(QStringLiteral("not exist [X-KDE-ParentApp]"));
     } else {
         constraint.append(QStringLiteral("[X-KDE-ParentApp] == '")).append(parentApp).append(QLatin1Char('\''));
     }
 
     KService::List offers = KServiceTypeTrader::self()->query(QStringLiteral("Plasma/Runner"), constraint);
     return KPluginInfo::fromServices(offers);
 }
 
 void RunnerManager::setupMatchSession()
 {
     d->teardownRequested = false;
 
     if (d->prepped) {
         return;
     }
 
     d->prepped = true;
     if (d->singleMode) {
         if (d->currentSingleRunner) {
             emit d->currentSingleRunner->prepare();
             d->singleRunnerPrepped = true;
         }
     } else {
         for (AbstractRunner *runner : qAsConst(d->runners)) {
 #ifdef MEASURE_PREPTIME
             QTime t;
             t.start();
 #endif
             emit runner->prepare();
 #ifdef MEASURE_PREPTIME
 #ifndef NDEBUG
             // qCDebug(KRUNNER) << t.elapsed() << runner->name();
 #endif
 #endif
         }
 
         d->allRunnersPrepped = true;
     }
 }
 
 void RunnerManager::matchSessionComplete()
 {
     if (!d->prepped) {
         return;
     }
 
     d->teardownRequested = true;
     d->checkTearDown();
 }
 
 void RunnerManager::launchQuery(const QString &term)
 {
     launchQuery(term, QString());
 }
 
 void RunnerManager::launchQuery(const QString &untrimmedTerm, const QString &runnerName)
 {
     setupMatchSession();
     QString term = untrimmedTerm.trimmed();
 
     setSingleModeRunnerId(runnerName);
     setSingleMode(d->currentSingleRunner);
     if (!runnerName.isEmpty() && !d->currentSingleRunner) {
         reset();
         return;
     }
 
     if (term.isEmpty()) {
         if (d->singleMode && d->currentSingleRunner->defaultSyntax()) {
-            term = d->currentSingleRunner->defaultSyntax()->exampleQueries().first().remove(QRegExp(QStringLiteral(":q:")));
+            term = d->currentSingleRunner->defaultSyntax()->exampleQueries().first().remove(QLatin1String(":q:"));
         } else {
             reset();
             return;
         }
     }
 
     if (d->context.query() == term) {
         // we already are searching for this!
         return;
     }
 
     if (!d->singleMode && d->runners.isEmpty()) {
         d->loadRunners();
     }
 
     reset();
 //    qCDebug(KRUNNER) << "runners searching for" << term << "on" << runnerName;
     d->context.setQuery(term);
     d->context.setEnabledCategories(d->enabledCategories);
 
     QHash<QString, AbstractRunner*> runable;
 
     //if the name is not empty we will launch only the specified runner
     if (d->singleMode) {
         runable.insert(QString(), d->currentSingleRunner);
         d->context.setSingleRunnerQueryMode(true);
     } else {
         runable = d->runners;
     }
 
     for (Plasma::AbstractRunner *r : qAsConst(runable)) {
         if (r->isMatchingSuspended()) {
             continue;
         }
 
         d->startJob(r);
     }
 
     // Start timer to unblock slow runners
     d->delayTimer.start(RunnerManagerPrivate::slowRunDelay);
 }
 
 QString RunnerManager::query() const
 {
     return d->context.query();
 }
 
 void RunnerManager::reset()
 {
     // If ThreadWeaver is idle, it is safe to clear previous jobs
     if (Queue::instance()->isIdle()) {
         d->oldSearchJobs.clear();
     } else {
         for (auto it = d->searchJobs.constBegin(); it != d->searchJobs.constEnd(); ++it) {
             Queue::instance()->dequeue((*it));
         }
         d->oldSearchJobs += d->searchJobs;
     }
 
     d->searchJobs.clear();
 
     if (d->deferredRun.isEnabled()) {
         //qCDebug(KRUNNER) << "job actually done, running now **************";
         QueryMatch tmpRun = d->deferredRun;
         d->deferredRun = QueryMatch(nullptr);
         tmpRun.run(d->context);
     }
 
     d->context.reset();
     emit queryFinished();
 }
 
 } // Plasma namespace
 
 
 #include "moc_runnermanager.cpp"