Utilize KIO::OpenUrlJob for opening urls

This way we consistently use the KIO jobs for launching urls.
wilder-5.25
Alexander Lohnau 4 years ago
parent dde0f20b23
commit 71ebe03748
  1. 1
      runners/bookmarks/CMakeLists.txt
  2. 5
      runners/bookmarks/bookmarksrunner.cpp
  3. 5
      runners/webshortcuts/webshortcutrunner.cpp

@ -29,6 +29,7 @@ add_library(krunner_bookmarks_common STATIC ${krunner_bookmarks_common_SRCS})
target_link_libraries(krunner_bookmarks_common target_link_libraries(krunner_bookmarks_common
Qt::Sql Qt::Sql
KF5::KIOCore KF5::KIOCore
KF5::KIOGui
KF5::I18n KF5::I18n
KF5::Runner KF5::Runner
KF5::Bookmarks KF5::Bookmarks

@ -9,13 +9,13 @@
#include "browsers/browser.h" #include "browsers/browser.h"
#include <QDebug> #include <QDebug>
#include <QDesktopServices>
#include <QDir> #include <QDir>
#include <QList> #include <QList>
#include <QStack> #include <QStack>
#include <QUrl> #include <QUrl>
#include <KApplicationTrader> #include <KApplicationTrader>
#include <KIO/OpenUrlJob>
#include <KLocalizedString> #include <KLocalizedString>
#include <KSharedConfig> #include <KSharedConfig>
@ -108,7 +108,8 @@ void BookmarksRunner::run(const Plasma::RunnerContext &context, const Plasma::Qu
url.setScheme(QStringLiteral("http")); url.setScheme(QStringLiteral("http"));
} }
QDesktopServices::openUrl(url); auto job = new KIO::OpenUrlJob(url);
job->start();
} }
#include "bookmarksrunner.moc" #include "bookmarksrunner.moc"

@ -8,6 +8,7 @@
#include <KApplicationTrader> #include <KApplicationTrader>
#include <KIO/CommandLauncherJob> #include <KIO/CommandLauncherJob>
#include <KIO/OpenUrlJob>
#include <KLocalizedString> #include <KLocalizedString>
#include <KSharedConfig> #include <KSharedConfig>
#include <KShell> #include <KShell>
@ -15,7 +16,6 @@
#include <KUriFilter> #include <KUriFilter>
#include <QAction> #include <QAction>
#include <QDBusConnection> #include <QDBusConnection>
#include <QDesktopServices>
WebshortcutRunner::WebshortcutRunner(QObject *parent, const KPluginMetaData &metaData, const QVariantList &args) WebshortcutRunner::WebshortcutRunner(QObject *parent, const KPluginMetaData &metaData, const QVariantList &args)
: Plasma::AbstractRunner(parent, metaData, args) : Plasma::AbstractRunner(parent, metaData, args)
@ -177,7 +177,8 @@ void WebshortcutRunner::run(const Plasma::RunnerContext &context, const Plasma::
auto *job = new KIO::CommandLauncherJob(command); auto *job = new KIO::CommandLauncherJob(command);
job->start(); job->start();
} else { } else {
QDesktopServices::openUrl(location); auto job = new KIO::OpenUrlJob(location);
job->start();
} }
} }
} }

Loading…
Cancel
Save