From 28292170d8c02743cabfabba3a1623b8d71b9aa2 Mon Sep 17 00:00:00 2001
From: ctrlaltca
Date: Sat, 8 Jul 2023 01:38:33 +0200
Subject: Port to (and require) Qt 5.15. Drop KDE4 support, fix KDE5 (#2541)

* Port to (and require) Qt 5.15. Drop KDE4 support, implement KDE5 support where needed.
---------

Co-authored-by: Fabio Bas <fabio.bas@officineinformatiche.net>---
 src/modules/notifier/NotifierWindow.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/modules/notifier/NotifierWindow.cpp')

diff --git a/src/modules/notifier/NotifierWindow.cpp b/src/modules/notifier/NotifierWindow.cpp
index d3a7f6902..6e0dd3fcd 100644
--- a/src/modules/notifier/NotifierWindow.cpp
+++ b/src/modules/notifier/NotifierWindow.cpp
@@ -38,7 +38,6 @@
 #include "KviThemedLineEdit.h"
 
 #include <QApplication>
-#include <QDesktopWidget>
 #include <QEvent>
 #include <QFontMetrics>
 #include <QImage>
@@ -47,6 +46,7 @@
 #include <QPaintEvent>
 #include <QPen>
 #include <QRegExp>
+#include <QScreen>
 #include <QToolTip>
 
 extern NotifierWindow * g_pNotifierWindow;
@@ -75,8 +75,7 @@ NotifierWindow::NotifierWindow()
 	hide();
 
 	// Positioning the notifier bottom-right
-	QDesktopWidget * pDesktop = QApplication::desktop();
-	QRect r = pDesktop->availableGeometry(pDesktop->primaryScreen());
+	QRect r = g_pApp->primaryScreen()->availableGeometry();
 
 	m_wndRect.setRect(
 	    r.x() + r.width() - (WDG_MIN_WIDTH + SPACING),
@@ -227,10 +226,11 @@ void NotifierWindow::stopAutoHideTimer()
 
 #if COMPILE_KDE_SUPPORT
 #include <kwindowsystem.h>
+#include <kx11extras.h>
 
 static bool active_window_is_full_screen()
 {
-	WId activeId = KWindowSystem::activeWindow();
+	WId activeId = KX11Extras::activeWindow();
 	KWindowInfo wi = KWindowInfo(activeId, NET::WMState);
 	return (wi.valid() && wi.hasState(NET::FullScreen));
 }
-- 
cgit v1.3.1-10-gc9f91