kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-03-23 14:50:35 +03:00
Code Issues Projects Releases Wiki Activity

Import QX11Info from QtGuiPrivate

Browse Source
This commit is contained in:
Fushan Wen 2023-09-30 07:40:06 +08:00
parent 2d62524ac5
commit 00843b5b83
No known key found for this signature in database
GPG Key ID: 2E48D1487C91DCAA
6 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/primaryoutputwatcher.cpp
View File

@ -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>

13
app/screenpool.cpp
View File

@ -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());
}

4
app/shortcuts/globalshortcuts.cpp
View File

@ -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>

2
app/wm/tasktools.cpp
View File

@ -24,7 +24,7 @@
#include <QScreen>
#include <QUrlQuery>
#if HAVE_X11
#include <QX11Info>
#include <private/qtx11extras_p.h>
#endif
namespace Latte

8
app/wm/waylandinterface.cpp
View File

@ -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>

2
app/wm/xwindowinterface.cpp
View File

@ -16,7 +16,7 @@
// Qt
#include <QDebug>
#include <QTimer>
#include <QtX11Extras/QX11Info>
#include <private/qtx11extras_p.h>
// KDE
#include <KDesktopFile>