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 Desktop
Commits
6cbb36c8
Commit
6cbb36c8
authored
Apr 14, 2022
by
Volker Krause
Browse files
Don't use QDesktopWidget as parent widget/window
This has no effect, apart from breaking the Qt6 build.
parent
4d4cfdac
Pipeline
#164654
passed with stage
in 2 minutes and 33 seconds
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
applets/trash/plugin/trash.cpp
View file @
6cbb36c8
...
...
@@ -7,7 +7,6 @@
#include
"trash.h"
#include
<QApplication>
#include
<QDesktopWidget>
#include
<QFileInfo>
#include
<KIO/CopyJob>
...
...
@@ -32,7 +31,6 @@ void Trash::trashUrls(const QList<QUrl> &urls)
void
Trash
::
emptyTrash
()
{
KIO
::
JobUiDelegate
uiDelegate
;
uiDelegate
.
setWindow
(
QApplication
::
desktop
());
if
(
uiDelegate
.
askDeleteConfirmation
(
QList
<
QUrl
>
(),
KIO
::
JobUiDelegate
::
EmptyTrash
,
KIO
::
JobUiDelegate
::
DefaultConfirmation
))
{
KIO
::
Job
*
job
=
KIO
::
emptyTrash
();
job
->
uiDelegate
()
->
setAutoErrorHandlingEnabled
(
true
);
...
...
containments/desktop/plugins/folder/foldermodel.cpp
View file @
6cbb36c8
...
...
@@ -17,7 +17,6 @@
#include
<QApplication>
#include
<QClipboard>
#include
<QCollator>
#include
<QDesktopWidget>
#include
<QDrag>
#include
<QImage>
#include
<QItemSelectionModel>
...
...
@@ -1812,7 +1811,6 @@ void FolderModel::openContextMenu(QQuickItem *visualParent, Qt::KeyboardModifier
QMenu
*
menu
=
new
QMenu
();
if
(
!
m_fileItemActions
)
{
m_fileItemActions
=
new
KFileItemActions
(
this
);
m_fileItemActions
->
setParentWidget
(
QApplication
::
desktop
());
}
if
(
indexes
.
isEmpty
())
{
...
...
@@ -2135,7 +2133,6 @@ void FolderModel::undo()
void
FolderModel
::
emptyTrashBin
()
{
KIO
::
JobUiDelegate
uiDelegate
;
uiDelegate
.
setWindow
(
QApplication
::
desktop
());
if
(
uiDelegate
.
askDeleteConfirmation
(
QList
<
QUrl
>
(),
KIO
::
JobUiDelegate
::
EmptyTrash
,
KIO
::
JobUiDelegate
::
DefaultConfirmation
))
{
KIO
::
Job
*
job
=
KIO
::
emptyTrash
();
...
...
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