Port the webshortcuts runner to Plasma 5

REVIEW: 118797

runners/CMakeLists.txt

@@ -8,7 +8,7 @@ add_subdirectory(services)
 add_subdirectory(recentdocuments)
 add_subdirectory(shell)
 # add_subdirectory(solid)
-# add_subdirectory(webshortcuts)
+add_subdirectory(webshortcuts)
 # add_subdirectory(windowedwidgets)
 #
 if(NOT WIN32)

runners/webshortcuts/CMakeLists.txt

@@ -5,7 +5,11 @@ set(krunner_webshortcuts_SRCS
 )
 
 add_library(krunner_webshortcuts MODULE ${krunner_webshortcuts_SRCS})
-target_link_libraries(krunner_webshortcuts KIOCore KF5::Plasma)
+target_link_libraries(krunner_webshortcuts
+  Qt5::DBus
+  KF5::Runner
+  KF5::KIOWidgets
+  KF5::I18n)
 
 install(TARGETS krunner_webshortcuts DESTINATION ${PLUGIN_INSTALL_DIR} )
 

runners/webshortcuts/webshortcutrunner.cpp

@@ -19,14 +19,14 @@
 #include "webshortcutrunner.h"
 
 #include <QDebug>
-#include <KLocale>
-#include <KMimeType>
+#include <QMimeType>
+#include <QMimeDatabase>
 #include <KServiceTypeTrader>
-#include <KStandardDirs>
 #include <KSycoca>
 #include <KToolInvocation>
-#include <KUrl>
-#include <KUriFilter>
+#include <QUrl>
+#include <KIOWidgets/KUriFilter>
+#include <KLocalizedString>
 
 #include <QtDBus/QtDBus>
 
@@ -38,7 +38,7 @@ WebshortcutRunner::WebshortcutRunner(QObject *parent, const QVariantList& args)
     setObjectName( QLatin1String("Web Shortcut" ));
     setIgnoredTypes(Plasma::RunnerContext::Directory | Plasma::RunnerContext::File | Plasma::RunnerContext::Executable);
 
-    m_icon = KIcon("internet-web-browser");
+    m_icon = QIcon::fromTheme("internet-web-browser");
 
     m_match.setType(Plasma::QueryMatch::ExactMatch);
     m_match.setRelevance(0.9);
@@ -122,7 +122,7 @@ void WebshortcutRunner::match(Plasma::RunnerContext &context)
     if (m_lastKey == key) {
         m_filterBeforeRun = true;
         m_match.setText(i18n("Search %1 for %2", m_lastProvider, term.mid(delimIndex + 1)));
-        context.addMatch(term, m_match);
+        context.addMatch(m_match);
         return;
     }
 
@@ -139,9 +139,9 @@ void WebshortcutRunner::match(Plasma::RunnerContext &context)
     m_match.setData(filterData.uri().url());
     m_match.setId("WebShortcut:" + key);
 
-    m_match.setIcon(KIcon(filterData.iconName()));
+    m_match.setIcon(QIcon::fromTheme(filterData.iconName()));
     m_match.setText(i18n("Search %1 for %2", m_lastProvider, filterData.searchTerm()));
-    context.addMatch(term, m_match);
+    context.addMatch(m_match);
 }
 
 void WebshortcutRunner::run(const Plasma::RunnerContext &context, const Plasma::QueryMatch &match)
@@ -165,4 +165,6 @@ void WebshortcutRunner::run(const Plasma::RunnerContext &context, const Plasma::
     }
 }
 
+K_EXPORT_PLASMA_RUNNER(webshortcuts, WebshortcutRunner)
+
 #include "webshortcutrunner.moc"

runners/webshortcuts/webshortcutrunner.h

@@ -19,9 +19,9 @@
 #ifndef WEBSHORTCUTRUNNER_H
 #define WEBSHORTCUTRUNNER_H
 
-#include <KIcon>
+#include <QIcon>
 
-#include <Plasma/AbstractRunner>
+#include <KRunner/AbstractRunner>
 
 class WebshortcutRunner : public Plasma::AbstractRunner {
     Q_OBJECT
@@ -41,7 +41,7 @@ class WebshortcutRunner : public Plasma::AbstractRunner {
         void resetState();
 
     private:
-        KIcon m_icon;
+        QIcon m_icon;
         Plasma::QueryMatch m_match;
         bool m_filterBeforeRun;
 
@@ -51,6 +51,4 @@ class WebshortcutRunner : public Plasma::AbstractRunner {
         QString m_lastProvider;
 };
 
-K_EXPORT_PLASMA_RUNNER(webshortcuts, WebshortcutRunner)
-
 #endif