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
Utilities
Ark
Commits
2b34a8bf
Commit
2b34a8bf
authored
Oct 07, 2022
by
Nicolas Fella
Browse files
Port away from deprecated KIO::JobUiDelegate ctor
parent
10d665c6
Pipeline
#243537
passed with stage
in 3 minutes and 59 seconds
Changes
4
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
2b34a8bf
...
...
@@ -8,7 +8,7 @@ set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE
project
(
ark VERSION
${
RELEASE_SERVICE_VERSION
}
)
set
(
QT_MIN_VERSION 5.15.2
)
set
(
KF5_MIN_VERSION 5.9
0
.0
)
set
(
KF5_MIN_VERSION 5.9
8
.0
)
find_package
(
ECM
${
KF5_MIN_VERSION
}
REQUIRED NO_MODULE
)
set
(
CMAKE_MODULE_PATH
${
ECM_MODULE_PATH
}
${
CMAKE_CURRENT_SOURCE_DIR
}
/cmake/modules
)
...
...
app/batchextract.cpp
View file @
2b34a8bf
...
...
@@ -14,6 +14,7 @@
#include
<KIO/JobTracker>
#include
<KIO/JobUiDelegate>
#include
<KIO/OpenUrlJob>
#include
<KIO/JobUiDelegateFactory>
#include
<KLocalizedString>
#include
<KMessageBox>
#include
<KWidgetJobTracker>
...
...
@@ -154,7 +155,7 @@ void BatchExtract::slotResult(KJob *job)
const
QString
path
=
QDir
::
cleanPath
(
destinationFolder
());
const
QUrl
destination
(
QUrl
::
fromLocalFile
(
path
));
KIO
::
OpenUrlJob
*
job
=
new
KIO
::
OpenUrlJob
(
destination
,
QStringLiteral
(
"inode/directory"
));
job
->
setUiDelegate
(
new
KIO
::
JobUiDelegate
(
KJobUiDelegate
::
AutoHandlingEnabled
,
nullptr
));
job
->
setUiDelegate
(
KIO
::
createDefault
JobUiDelegate
(
KJobUiDelegate
::
AutoHandlingEnabled
,
nullptr
));
job
->
start
();
}
...
...
part/arkviewer.cpp
View file @
2b34a8bf
...
...
@@ -14,6 +14,7 @@
#include
<KApplicationTrader>
#include
<KIO/ApplicationLauncherJob>
#include
<KIO/JobUiDelegate>
#include
<KIO/JobUiDelegateFactory>
#include
<KLocalizedString>
#include
<KMessageBox>
#include
<KMimeTypeTrader>
...
...
@@ -78,7 +79,7 @@ void ArkViewer::openExternalViewer(const KService::Ptr viewer, const QString& fi
const
QList
<
QUrl
>
fileUrlList
=
{
QUrl
::
fromLocalFile
(
fileName
)};
KIO
::
ApplicationLauncherJob
*
job
=
new
KIO
::
ApplicationLauncherJob
(
viewer
);
job
->
setUrls
(
fileUrlList
);
job
->
setUiDelegate
(
new
KIO
::
JobUiDelegate
(
KJobUiDelegate
::
AutoHandlingEnabled
,
nullptr
));
job
->
setUiDelegate
(
KIO
::
createDefault
JobUiDelegate
(
KJobUiDelegate
::
AutoHandlingEnabled
,
nullptr
));
// The temporary file will be removed when the viewer application exits.
job
->
setRunFlags
(
KIO
::
ApplicationLauncherJob
::
DeleteTemporaryFiles
);
job
->
start
();
...
...
part/part.cpp
View file @
2b34a8bf
...
...
@@ -37,6 +37,7 @@
#include
<KIO/Job>
#include
<KIO/JobUiDelegate>
#include
<KIO/OpenUrlJob>
#include
<KIO/JobUiDelegateFactory>
#include
<KJobWidgets>
#include
<KIO/StatJob>
#include
<KMessageBox>
...
...
@@ -1048,11 +1049,11 @@ void Part::slotOpenExtractedEntry(KJob *job)
// trigger the openWith dialog
KIO
::
ApplicationLauncherJob
*
job
=
new
KIO
::
ApplicationLauncherJob
();
job
->
setUrls
({
url
});
job
->
setUiDelegate
(
new
KIO
::
JobUiDelegate
(
KJobUiDelegate
::
AutoHandlingEnabled
,
widget
()));
job
->
setUiDelegate
(
KIO
::
createDefault
JobUiDelegate
(
KJobUiDelegate
::
AutoHandlingEnabled
,
widget
()));
job
->
start
();
}
else
{
KIO
::
OpenUrlJob
*
job
=
new
KIO
::
OpenUrlJob
(
url
);
job
->
setUiDelegate
(
new
KIO
::
JobUiDelegate
(
KJobUiDelegate
::
AutoHandlingEnabled
,
widget
()));
job
->
setUiDelegate
(
KIO
::
createDefault
JobUiDelegate
(
KJobUiDelegate
::
AutoHandlingEnabled
,
widget
()));
job
->
start
();
}
}
else
if
(
job
->
error
()
!=
KJob
::
KilledJobError
)
{
...
...
@@ -1296,7 +1297,7 @@ void Part::slotExtractionDone(KJob* job)
qCDebug
(
ARK
)
<<
"Shall open URL"
<<
destinationDirectory
;
KIO
::
OpenUrlJob
*
job
=
new
KIO
::
OpenUrlJob
(
destinationDirectory
,
QStringLiteral
(
"inode/directory"
));
job
->
setUiDelegate
(
new
KIO
::
JobUiDelegate
(
KJobUiDelegate
::
AutoHandlingEnabled
,
widget
()));
job
->
setUiDelegate
(
KIO
::
createDefault
JobUiDelegate
(
KJobUiDelegate
::
AutoHandlingEnabled
,
widget
()));
job
->
start
();
}
...
...
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