From 00843b5b834a9b9dc73137b6339691ad434f4735 Mon Sep 17 00:00:00 2001 From: Fushan Wen <qydwhotmail@gmail.com> Date: Sat, 30 Sep 2023 07:40:06 +0800 Subject: [PATCH] Import QX11Info from QtGuiPrivate --- app/primaryoutputwatcher.cpp | 4 ---- app/screenpool.cpp | 13 ++++--------- app/shortcuts/globalshortcuts.cpp | 4 ++-- app/wm/tasktools.cpp | 2 +- app/wm/waylandinterface.cpp | 8 ++++---- app/wm/xwindowinterface.cpp | 2 +- 6 files changed, 12 insertions(+), 21 deletions(-) diff --git a/app/primaryoutputwatcher.cpp b/app/primaryoutputwatcher.cpp index 773e48b5f..cef2742d7 100644 --- a/app/primaryoutputwatcher.cpp +++ b/app/primaryoutputwatcher.cpp @@ -19,11 +19,7 @@ #include <config-latte.h> #if HAVE_X11 #include <QTimer> //Used only in x11 case -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) #include <private/qtx11extras_p.h> -#else -#include <QX11Info> -#endif #include <xcb/randr.h> #include <xcb/xcb.h> #include <xcb/xcb_event.h> diff --git a/app/screenpool.cpp b/app/screenpool.cpp index a87c759a2..a4e37fdf3 100644 --- a/app/screenpool.cpp +++ b/app/screenpool.cpp @@ -22,9 +22,9 @@ // X11 #if HAVE_X11 -#include <QtX11Extras/QX11Info> -#include <xcb/xcb.h> +#include <private/qtx11extras_p.h> #include <xcb/randr.h> +#include <xcb/xcb.h> #include <xcb/xcb_event.h> #endif @@ -141,11 +141,7 @@ void ScreenPool::updateScreenGeometry(const int &screenId, const QRect &screenGe emit screenGeometryChanged(); } - -Latte::Data::ScreensTable ScreenPool::screensTable() -{ - return m_screensTable; -} +Latte::Data::ScreensTable ScreenPool::screensTable() { return m_screensTable; } void ScreenPool::reload(QString path) { @@ -242,8 +238,7 @@ int ScreenPool::id(const QString &connector) const return screenId.isEmpty() ? NOSCREENID : screenId.toInt(); } -QString ScreenPool::connector(int id) const -{ +QString ScreenPool::connector(int id) const { QString idStr = QString::number(id); return (m_screensTable.containsId(idStr) ? m_screensTable[idStr].name : QString()); } diff --git a/app/shortcuts/globalshortcuts.cpp b/app/shortcuts/globalshortcuts.cpp index 1bc157e07..bc57cc960 100644 --- a/app/shortcuts/globalshortcuts.cpp +++ b/app/shortcuts/globalshortcuts.cpp @@ -25,9 +25,9 @@ // Qt #include <QAction> #include <QDebug> -#include <QQuickItem> #include <QMetaMethod> -#include <QX11Info> +#include <QQuickItem> +#include <private/qtx11extras_p.h> // KDE #include <KActionCollection> diff --git a/app/wm/tasktools.cpp b/app/wm/tasktools.cpp index 5c2f06862..251768ace 100644 --- a/app/wm/tasktools.cpp +++ b/app/wm/tasktools.cpp @@ -24,7 +24,7 @@ #include <QScreen> #include <QUrlQuery> #if HAVE_X11 -#include <QX11Info> +#include <private/qtx11extras_p.h> #endif namespace Latte diff --git a/app/wm/waylandinterface.cpp b/app/wm/waylandinterface.cpp index df8d0fae6..4160a800b 100644 --- a/app/wm/waylandinterface.cpp +++ b/app/wm/waylandinterface.cpp @@ -16,12 +16,12 @@ #include "../lattecorona.h" // Qt -#include <QDebug> -#include <QTimer> #include <QApplication> -#include <QtX11Extras/QX11Info> -#include <QQuickView> +#include <QDebug> #include <QLatin1String> +#include <QQuickView> +#include <QTimer> +#include <private/qtx11extras_p.h> // KDE #include <KWindowSystem> diff --git a/app/wm/xwindowinterface.cpp b/app/wm/xwindowinterface.cpp index dc7732be5..f80b46ba6 100644 --- a/app/wm/xwindowinterface.cpp +++ b/app/wm/xwindowinterface.cpp @@ -16,7 +16,7 @@ // Qt #include <QDebug> #include <QTimer> -#include <QtX11Extras/QX11Info> +#include <private/qtx11extras_p.h> // KDE #include <KDesktopFile>