Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Plasma
Plasma Workspace
Commits
f47d78bc
Commit
f47d78bc
authored
Dec 14, 2020
by
Nicolas Fella
Browse files
[runners] Port from KRun to OpenUrlJob
The former is deprecated
parent
8cbaa7eb
Changes
8
Hide whitespace changes
Inline
Side-by-side
runners/baloo/CMakeLists.txt
View file @
f47d78bc
...
...
@@ -12,6 +12,7 @@ target_link_libraries(baloorunner
KF5::KIOWidgets
KF5::I18n
KF5::Baloo
KF5::Notifications
Qt5::DBus
)
...
...
runners/baloo/baloosearchrunner.cpp
View file @
f47d78bc
...
...
@@ -24,7 +24,6 @@
#include
<QAction>
#include
<QIcon>
#include
<QDir>
#include
<KRun>
#include
<KLocalizedString>
#include
<QMimeDatabase>
#include
<QTimer>
...
...
@@ -36,6 +35,8 @@
#include
<Baloo/IndexerConfig>
#include
<KIO/OpenFileManagerWindowJob>
#include
<KIO/OpenUrlJob>
#include
<KNotificationJobUiDelegate>
#include
"krunner1adaptor.h"
...
...
@@ -202,5 +203,8 @@ void SearchRunner::Run(const QString& id, const QString& actionId)
return
;
}
new
KRun
(
url
,
nullptr
);
auto
*
job
=
new
KIO
::
OpenUrlJob
(
url
);
job
->
setUiDelegate
(
new
KNotificationJobUiDelegate
(
KJobUiDelegate
::
AutoErrorHandlingEnabled
));
job
->
setRunExecutables
(
false
);
job
->
start
();
}
runners/locations/CMakeLists.txt
View file @
f47d78bc
...
...
@@ -11,6 +11,7 @@ target_link_libraries(krunner_locations
KF5::KIOWidgets
KF5::I18n
KF5::Runner
KF5::Notifications
)
install
(
TARGETS krunner_locations DESTINATION
"
${
KDE_INSTALL_PLUGINDIR
}
/kf5/krunner"
)
runners/locations/locationrunner.cpp
View file @
f47d78bc
...
...
@@ -25,15 +25,14 @@
#include
<QDebug>
#include
<KApplicationTrader>
#include
<KRun>
#include
<KLocalizedString>
#include
<KProtocolInfo>
#include
<KUriFilter>
#include
<KIO/DesktopExecParser>
#include
<KIO/Global>
#include
<KShell>
#include
<
kservicetypetrader.h
>
#include
<KIO/OpenUrlJob>
#include
<
KNotificationJobUiDelegate
>
K_EXPORT_PLASMA_RUNNER_WITH_JSON
(
LocationsRunner
,
"plasma-runner-locations.json"
)
...
...
@@ -186,9 +185,13 @@ void LocationsRunner::run(const Plasma::RunnerContext &context, const Plasma::Qu
location
=
convertCaseInsensitivePath
(
location
);
QUrl
urlToRun
(
KUriFilter
::
self
()
->
filteredUri
(
location
,
{
QStringLiteral
(
"kshorturifilter"
)}));
const
QUrl
urlToRun
(
KUriFilter
::
self
()
->
filteredUri
(
location
,
{
QStringLiteral
(
"kshorturifilter"
)}));
auto
*
job
=
new
KIO
::
OpenUrlJob
(
urlToRun
);
job
->
setUiDelegate
(
new
KNotificationJobUiDelegate
(
KJobUiDelegate
::
AutoErrorHandlingEnabled
));
job
->
setRunExecutables
(
false
);
job
->
start
();
new
KRun
(
urlToRun
,
nullptr
);
}
QMimeData
*
LocationsRunner
::
mimeDataForMatch
(
const
Plasma
::
QueryMatch
&
match
)
...
...
runners/places/CMakeLists.txt
View file @
f47d78bc
...
...
@@ -8,10 +8,10 @@ add_library(krunner_placesrunner MODULE ${krunner_placesrunner_SRCS})
kcoreaddons_desktop_to_json
(
krunner_placesrunner plasma-runner-places.desktop
)
target_link_libraries
(
krunner_placesrunner
KF5::KIOCore
KF5::KIOWidgets
KF5::KIOFileWidgets
KF5::I18n
KF5::Runner
KF5::Notifications
)
install
(
TARGETS krunner_placesrunner DESTINATION
"
${
KDE_INSTALL_PLUGINDIR
}
/kf5/krunner"
)
runners/places/placesrunner.cpp
View file @
f47d78bc
...
...
@@ -27,8 +27,10 @@
#include
<QIcon>
#include
<QMimeData>
#include
<QUrl>
#include
<KRun>
#include
<KLocalizedString>
#include
<KIO/OpenUrlJob>
#include
<KNotificationJobUiDelegate>
K_EXPORT_PLASMA_RUNNER_WITH_JSON
(
PlacesRunner
,
"plasma-runner-places.json"
)
...
...
@@ -75,7 +77,10 @@ PlacesRunnerHelper::PlacesRunnerHelper(PlacesRunner *runner)
connect
(
&
m_places
,
&
KFilePlacesModel
::
setupDone
,
this
,
[
this
](
const
QModelIndex
&
index
,
bool
success
)
{
if
(
success
&&
m_pendingUdi
==
m_places
.
deviceForIndex
(
index
).
udi
())
{
new
KRun
(
m_places
.
url
(
index
),
nullptr
);
auto
*
job
=
new
KIO
::
OpenUrlJob
(
m_places
.
url
(
index
));
job
->
setUiDelegate
(
new
KNotificationJobUiDelegate
(
KJobUiDelegate
::
AutoErrorHandlingEnabled
));
job
->
setRunExecutables
(
false
);
job
->
start
();
}
m_pendingUdi
.
clear
();
});
...
...
@@ -156,7 +161,10 @@ void PlacesRunner::run(const Plasma::RunnerContext &context, const Plasma::Query
Q_UNUSED
(
context
);
//I don't just pass the model index because the list could change before the user clicks on it, which would make everything go wrong. Ideally we don't want things to go wrong.
if
(
action
.
data
().
type
()
==
QVariant
::
Url
)
{
new
KRun
(
action
.
data
().
toUrl
(),
nullptr
);
auto
*
job
=
new
KIO
::
OpenUrlJob
(
action
.
data
().
toUrl
());
job
->
setUiDelegate
(
new
KNotificationJobUiDelegate
(
KJobUiDelegate
::
AutoErrorHandlingEnabled
));
job
->
setRunExecutables
(
false
);
job
->
start
();
}
else
if
(
action
.
data
().
canConvert
<
QString
>
())
{
m_helper
->
openDevice
(
action
.
data
().
toString
());
}
...
...
runners/recentdocuments/CMakeLists.txt
View file @
f47d78bc
...
...
@@ -12,6 +12,7 @@ target_link_libraries(krunner_recentdocuments
KF5::I18n
KF5::ActivitiesStats
KF5::Runner
KF5::Notifications
)
install
(
TARGETS krunner_recentdocuments DESTINATION
"
${
KDE_INSTALL_PLUGINDIR
}
/kf5/krunner"
)
runners/recentdocuments/recentdocuments.cpp
View file @
f47d78bc
...
...
@@ -23,10 +23,11 @@
#include
<QDir>
#include
<QMimeData>
#include
<KRun>
#include
<KLocalizedString>
#include
<KIO/OpenFileManagerWindowJob>
#include
<KIO/OpenUrlJob>
#include
<KIO/Job>
#include
<KNotificationJobUiDelegate>
#include
<KShell>
#include
<KActivities/Stats/ResultModel>
...
...
@@ -118,8 +119,10 @@ void RecentDocuments::run(const Plasma::RunnerContext &context, const Plasma::Qu
return
;
}
auto
run
=
new
KRun
(
url
,
nullptr
);
run
->
setRunExecutables
(
false
);
auto
*
job
=
new
KIO
::
OpenUrlJob
(
url
);
job
->
setUiDelegate
(
new
KNotificationJobUiDelegate
(
KJobUiDelegate
::
AutoErrorHandlingEnabled
));
job
->
setRunExecutables
(
false
);
job
->
start
();
}
QMimeData
*
RecentDocuments
::
mimeDataForMatch
(
const
Plasma
::
QueryMatch
&
match
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment