[plasma/print-manager] src: Remove some X11 bits
Mike Noe <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit 277bab4292850ae72f4528836538c435376b3ca0 by Mike Noe.
Committed on 28/07/2026 at 20:19.
Pushed by noee into branch 'master'.
Remove some X11 bits
M +2 -7 src/configure-printer/ConfigurePrinterInterface.cpp
M +0 -4 src/libkcups/KCupsPasswordDialog.cpp
https://invent.kde.org/plasma/print-manager/-/commit/277bab4292850ae72f4528836538c435376b3ca0
diff --git a/src/configure-printer/ConfigurePrinterInterface.cpp b/src/configure-printer/ConfigurePrinterInterface.cpp
index dc24c26c..de774650 100644
--- a/src/configure-printer/ConfigurePrinterInterface.cpp
+++ b/src/configure-printer/ConfigurePrinterInterface.cpp
@@ -13,12 +13,11 @@
#include <KCupsPrinter.h>
#include <KCupsRequest.h>
-#include <KWindowSystem>
-#include <KX11Extras>
#include <QDBusConnection>
#include <QDialog>
#include <QPointer>
#include <QTimer>
+#include <QWindow>
ConfigurePrinterInterface::ConfigurePrinterInterface(QObject *parent)
: QObject(parent)
@@ -92,11 +91,7 @@ void ConfigurePrinterInterface::ConfigurePrinter(const QString &destName)
// Check if it's not reserved
if (m_uis.value(destName)) {
- if (KWindowSystem::isPlatformX11()) {
- KX11Extras::forceActiveWindow(m_uis.value(destName)->winId());
- } else {
- m_uis.value(destName)->windowHandle()->requestActivate();
- }
+ m_uis.value(destName)->windowHandle()->requestActivate();
}
}
diff --git a/src/libkcups/KCupsPasswordDialog.cpp b/src/libkcups/KCupsPasswordDialog.cpp
index 30a5a4f9..90545293 100644
--- a/src/libkcups/KCupsPasswordDialog.cpp
+++ b/src/libkcups/KCupsPasswordDialog.cpp
@@ -11,7 +11,6 @@
#include <KLocalizedString>
#include <KPasswordDialog>
#include <KWindowSystem>
-#include <KX11Extras>
KCupsPasswordDialog::KCupsPasswordDialog(QObject *parent)
: QObject(parent)
@@ -49,9 +48,6 @@ void KCupsPasswordDialog::exec(const QString &username, bool wrongPassword)
dialog->setAttribute(Qt::WA_NativeWindow, true);
KWindowSystem::setMainWindow(dialog->windowHandle(), m_mainwindow);
}
- if (KWindowSystem::isPlatformX11()) {
- KX11Extras::forceActiveWindow(dialog->winId());
- }
// Do not return from this method now
dialog->exec();