Import QX11Info from QtGuiPrivate

work/plasma6
Fushan Wen committed by Lana Black
parent cc0140cdbb
commit e57c9c0e33

@ -19,11 +19,7 @@
#include <config-latte.h> #include <config-latte.h>
#if HAVE_X11 #if HAVE_X11
#include <QTimer> //Used only in x11 case #include <QTimer> //Used only in x11 case
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
#include <private/qtx11extras_p.h> #include <private/qtx11extras_p.h>
#else
#include <QX11Info>
#endif
#include <xcb/randr.h> #include <xcb/randr.h>
#include <xcb/xcb.h> #include <xcb/xcb.h>
#include <xcb/xcb_event.h> #include <xcb/xcb_event.h>

@ -22,9 +22,9 @@
// X11 // X11
#if HAVE_X11 #if HAVE_X11
#include <QtX11Extras/QX11Info> #include <private/qtx11extras_p.h>
#include <xcb/xcb.h>
#include <xcb/randr.h> #include <xcb/randr.h>
#include <xcb/xcb.h>
#include <xcb/xcb_event.h> #include <xcb/xcb_event.h>
#endif #endif
@ -141,11 +141,7 @@ void ScreenPool::updateScreenGeometry(const int &screenId, const QRect &screenGe
emit screenGeometryChanged(); emit screenGeometryChanged();
} }
Latte::Data::ScreensTable ScreenPool::screensTable() { return m_screensTable; }
Latte::Data::ScreensTable ScreenPool::screensTable()
{
return m_screensTable;
}
void ScreenPool::reload(QString path) void ScreenPool::reload(QString path)
{ {
@ -242,8 +238,7 @@ int ScreenPool::id(const QString &connector) const
return screenId.isEmpty() ? NOSCREENID : screenId.toInt(); return screenId.isEmpty() ? NOSCREENID : screenId.toInt();
} }
QString ScreenPool::connector(int id) const QString ScreenPool::connector(int id) const {
{
QString idStr = QString::number(id); QString idStr = QString::number(id);
return (m_screensTable.containsId(idStr) ? m_screensTable[idStr].name : QString()); return (m_screensTable.containsId(idStr) ? m_screensTable[idStr].name : QString());
} }

@ -25,9 +25,9 @@
// Qt // Qt
#include <QAction> #include <QAction>
#include <QDebug> #include <QDebug>
#include <QQuickItem>
#include <QMetaMethod> #include <QMetaMethod>
#include <QX11Info> #include <QQuickItem>
#include <private/qtx11extras_p.h>
// KDE // KDE
#include <KActionCollection> #include <KActionCollection>

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

@ -16,12 +16,12 @@
#include "../lattecorona.h" #include "../lattecorona.h"
// Qt // Qt
#include <QDebug>
#include <QTimer>
#include <QApplication> #include <QApplication>
#include <QtX11Extras/QX11Info> #include <QDebug>
#include <QQuickView>
#include <QLatin1String> #include <QLatin1String>
#include <QQuickView>
#include <QTimer>
#include <private/qtx11extras_p.h>
// KDE // KDE
#include <KWindowSystem> #include <KWindowSystem>

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

Loading…
Cancel
Save