diff options
Diffstat (limited to 'src/compositor/extensions')
22 files changed, 55 insertions, 55 deletions
diff --git a/src/compositor/extensions/qwaylandshell.cpp b/src/compositor/extensions/qwaylandshell.cpp index d726d301b..25e5e4ec8 100644 --- a/src/compositor/extensions/qwaylandshell.cpp +++ b/src/compositor/extensions/qwaylandshell.cpp @@ -38,11 +38,11 @@ #include "qwaylandshell.h" #include "qwaylandshell_p.h" -#include <QtCompositor/QWaylandCompositor> -#include <QtCompositor/QWaylandView> -#include <QtCompositor/QWaylandOutput> -#include <QtCompositor/QWaylandOutputSpace> -#include <QtCompositor/QWaylandClient> +#include <QtWaylandCompositor/QWaylandCompositor> +#include <QtWaylandCompositor/QWaylandView> +#include <QtWaylandCompositor/QWaylandOutput> +#include <QtWaylandCompositor/QWaylandOutputSpace> +#include <QtWaylandCompositor/QWaylandClient> #include <QtCore/QObject> #include <QtCore/QDebug> diff --git a/src/compositor/extensions/qwaylandshell.h b/src/compositor/extensions/qwaylandshell.h index 30e87ed50..5af9d5425 100644 --- a/src/compositor/extensions/qwaylandshell.h +++ b/src/compositor/extensions/qwaylandshell.h @@ -37,7 +37,7 @@ #ifndef QWAYLANDSHELL_H #define QWAYLANDSHELL_H -#include <QtCompositor/QWaylandExtension> +#include <QtWaylandCompositor/QWaylandExtension> QT_BEGIN_NAMESPACE diff --git a/src/compositor/extensions/qwaylandshell_p.h b/src/compositor/extensions/qwaylandshell_p.h index 4aeef67f4..e87a27562 100644 --- a/src/compositor/extensions/qwaylandshell_p.h +++ b/src/compositor/extensions/qwaylandshell_p.h @@ -37,19 +37,19 @@ #ifndef QWAYLANDSHELL_P_H #define QWAYLANDSHELL_P_H -#include <QtCompositor/qwaylandexport.h> -#include <QtCompositor/qwaylandsurface.h> -#include <QtCompositor/private/qwaylandextension_p.h> -#include <QtCompositor/QWaylandPointerGrabber> -#include <QtCompositor/QWaylandShellSurface> -#include <QtCompositor/QWaylandInputDevice> +#include <QtWaylandCompositor/qwaylandexport.h> +#include <QtWaylandCompositor/qwaylandsurface.h> +#include <QtWaylandCompositor/private/qwaylandextension_p.h> +#include <QtWaylandCompositor/QWaylandPointerGrabber> +#include <QtWaylandCompositor/QWaylandShellSurface> +#include <QtWaylandCompositor/QWaylandInputDevice> #include <wayland-server.h> #include <QHash> #include <QPoint> #include <QSet> -#include <QtCompositor/private/qwayland-server-wayland.h> +#include <QtWaylandCompositor/private/qwayland-server-wayland.h> QT_BEGIN_NAMESPACE diff --git a/src/compositor/extensions/qwaylandwindowmanagerextension.cpp b/src/compositor/extensions/qwaylandwindowmanagerextension.cpp index f8ba5e409..9050610d8 100644 --- a/src/compositor/extensions/qwaylandwindowmanagerextension.cpp +++ b/src/compositor/extensions/qwaylandwindowmanagerextension.cpp @@ -37,8 +37,8 @@ #include "qwaylandwindowmanagerextension.h" #include "qwaylandwindowmanagerextension_p.h" -#include <QtCompositor/QWaylandCompositor> -#include <QtCompositor/QWaylandClient> +#include <QtWaylandCompositor/QWaylandCompositor> +#include <QtWaylandCompositor/QWaylandClient> #include <QtCore/QUrl> diff --git a/src/compositor/extensions/qwaylandwindowmanagerextension.h b/src/compositor/extensions/qwaylandwindowmanagerextension.h index a47611170..48fcbef3e 100644 --- a/src/compositor/extensions/qwaylandwindowmanagerextension.h +++ b/src/compositor/extensions/qwaylandwindowmanagerextension.h @@ -37,8 +37,8 @@ #ifndef WAYLANDWINDOWMANAGERINTEGRATION_H #define WAYLANDWINDOWMANAGERINTEGRATION_H -#include <QtCompositor/qwaylandextension.h> -#include <QtCompositor/QWaylandClient> +#include <QtWaylandCompositor/qwaylandextension.h> +#include <QtWaylandCompositor/QWaylandClient> #include <QtCore/QUrl> diff --git a/src/compositor/extensions/qwaylandwindowmanagerextension_p.h b/src/compositor/extensions/qwaylandwindowmanagerextension_p.h index 08638e5be..02f71998d 100644 --- a/src/compositor/extensions/qwaylandwindowmanagerextension_p.h +++ b/src/compositor/extensions/qwaylandwindowmanagerextension_p.h @@ -37,9 +37,9 @@ #ifndef QWAYLANDWINDOWMANAGEREXTENSION_P_H #define QWAYLANDWINDOWMANAGEREXTENSION_P_H -#include <QtCompositor/private/qwaylandextension_p.h> +#include <QtWaylandCompositor/private/qwaylandextension_p.h> -#include <QtCompositor/private/qwayland-server-windowmanager.h> +#include <QtWaylandCompositor/private/qwayland-server-windowmanager.h> #include <QMap> diff --git a/src/compositor/extensions/qwlextendedsurface.cpp b/src/compositor/extensions/qwlextendedsurface.cpp index 2f4b551e7..f619ec339 100644 --- a/src/compositor/extensions/qwlextendedsurface.cpp +++ b/src/compositor/extensions/qwlextendedsurface.cpp @@ -36,7 +36,7 @@ #include "qwlextendedsurface_p.h" -#include <QtCompositor/QWaylandCompositor> +#include <QtWaylandCompositor/QWaylandCompositor> QT_BEGIN_NAMESPACE diff --git a/src/compositor/extensions/qwlextendedsurface_p.h b/src/compositor/extensions/qwlextendedsurface_p.h index fff517408..80e9b2315 100644 --- a/src/compositor/extensions/qwlextendedsurface_p.h +++ b/src/compositor/extensions/qwlextendedsurface_p.h @@ -39,9 +39,9 @@ #include <wayland-server.h> -#include <QtCompositor/private/qwayland-server-surface-extension.h> -#include <QtCompositor/qwaylandsurface.h> -#include <QtCompositor/qwaylandextension.h> +#include <QtWaylandCompositor/private/qwayland-server-surface-extension.h> +#include <QtWaylandCompositor/qwaylandsurface.h> +#include <QtWaylandCompositor/qwaylandextension.h> #include <QtCore/QVariant> #include <QtCore/QLinkedList> diff --git a/src/compositor/extensions/qwlinputmethod.cpp b/src/compositor/extensions/qwlinputmethod.cpp index 6029112f5..6cf23bcb1 100644 --- a/src/compositor/extensions/qwlinputmethod.cpp +++ b/src/compositor/extensions/qwlinputmethod.cpp @@ -36,9 +36,9 @@ #include "qwlinputmethod_p.h" -#include <QtCompositor/QWaylandCompositor> -#include <QtCompositor/QWaylandKeyboard> -#include <QtCompositor/QWaylandInputDevice> +#include <QtWaylandCompositor/QWaylandCompositor> +#include <QtWaylandCompositor/QWaylandKeyboard> +#include <QtWaylandCompositor/QWaylandInputDevice> #include "qwlinputmethodcontext_p.h" #include "qwlinputpanel_p.h" #include "qwltextinput_p.h" diff --git a/src/compositor/extensions/qwlinputmethod_p.h b/src/compositor/extensions/qwlinputmethod_p.h index 4d8ab78a0..2bddbd4f2 100644 --- a/src/compositor/extensions/qwlinputmethod_p.h +++ b/src/compositor/extensions/qwlinputmethod_p.h @@ -37,14 +37,14 @@ #ifndef QTWAYLAND_QWLINPUTMETHOD_H #define QTWAYLAND_QWLINPUTMETHOD_H -#include <QtCompositor/private/qwayland-server-input-method.h> -#include <QtCompositor/QWaylandExtension> -#include <QtCompositor/QWaylandInputDevice> +#include <QtWaylandCompositor/private/qwayland-server-input-method.h> +#include <QtWaylandCompositor/QWaylandExtension> +#include <QtWaylandCompositor/QWaylandInputDevice> #include <QObject> #include <QScopedPointer> -#include <QtCompositor/QWaylandSurface> +#include <QtWaylandCompositor/QWaylandSurface> QT_BEGIN_NAMESPACE diff --git a/src/compositor/extensions/qwlinputmethodcontext_p.h b/src/compositor/extensions/qwlinputmethodcontext_p.h index 8853d40bb..4165939fb 100644 --- a/src/compositor/extensions/qwlinputmethodcontext_p.h +++ b/src/compositor/extensions/qwlinputmethodcontext_p.h @@ -37,7 +37,7 @@ #ifndef QTWAYLAND_QWLINPUTMETHODCONTEXT_P_H #define QTWAYLAND_QWLINPUTMETHODCONTEXT_P_H -#include <QtCompositor/private/qwayland-server-input-method.h> +#include <QtWaylandCompositor/private/qwayland-server-input-method.h> QT_BEGIN_NAMESPACE diff --git a/src/compositor/extensions/qwlinputpanel.cpp b/src/compositor/extensions/qwlinputpanel.cpp index c5d96252b..5c6fb27c4 100644 --- a/src/compositor/extensions/qwlinputpanel.cpp +++ b/src/compositor/extensions/qwlinputpanel.cpp @@ -36,8 +36,8 @@ #include "qwlinputpanel_p.h" -#include <QtCompositor/qwaylandinputpanel.h> -#include <QtCompositor/QWaylandCompositor> +#include <QtWaylandCompositor/qwaylandinputpanel.h> +#include <QtWaylandCompositor/QWaylandCompositor> #include "qwlinputmethod_p.h" #include "qwlinputpanelsurface_p.h" diff --git a/src/compositor/extensions/qwlinputpanel_p.h b/src/compositor/extensions/qwlinputpanel_p.h index 1cb6f383b..95d6a0a20 100644 --- a/src/compositor/extensions/qwlinputpanel_p.h +++ b/src/compositor/extensions/qwlinputpanel_p.h @@ -37,11 +37,11 @@ #ifndef QTWAYLAND_QWLINPUTPANEL_P_H #define QTWAYLAND_QWLINPUTPANEL_P_H -#include <QtCompositor/qwaylandexport.h> -#include <QtCompositor/qwaylandinputpanel.h> +#include <QtWaylandCompositor/qwaylandexport.h> +#include <QtWaylandCompositor/qwaylandinputpanel.h> -#include <QtCompositor/private/qwaylandextension_p.h> -#include <QtCompositor/private/qwayland-server-input-method.h> +#include <QtWaylandCompositor/private/qwaylandextension_p.h> +#include <QtWaylandCompositor/private/qwayland-server-input-method.h> #include <QRect> #include <QScopedPointer> diff --git a/src/compositor/extensions/qwlinputpanelsurface.cpp b/src/compositor/extensions/qwlinputpanelsurface.cpp index 17f6fe7ec..c54520aad 100644 --- a/src/compositor/extensions/qwlinputpanelsurface.cpp +++ b/src/compositor/extensions/qwlinputpanelsurface.cpp @@ -37,8 +37,8 @@ #include "qwlinputpanelsurface_p.h" -#include <QtCompositor/private/qwaylandsurface_p.h> -#include <QtCompositor/QWaylandOutput> +#include <QtWaylandCompositor/private/qwaylandsurface_p.h> +#include <QtWaylandCompositor/QWaylandOutput> QT_BEGIN_NAMESPACE diff --git a/src/compositor/extensions/qwlinputpanelsurface_p.h b/src/compositor/extensions/qwlinputpanelsurface_p.h index 2992b803f..7c76ef88c 100644 --- a/src/compositor/extensions/qwlinputpanelsurface_p.h +++ b/src/compositor/extensions/qwlinputpanelsurface_p.h @@ -38,7 +38,7 @@ #ifndef QTWAYLAND_QWLINPUTPANELSURFACE_P_H #define QTWAYLAND_QWLINPUTPANELSURFACE_P_H -#include <QtCompositor/private/qwayland-server-input-method.h> +#include <QtWaylandCompositor/private/qwayland-server-input-method.h> #include <QWaylandSurface> diff --git a/src/compositor/extensions/qwlqtkey.cpp b/src/compositor/extensions/qwlqtkey.cpp index 90bb83b37..52373df08 100644 --- a/src/compositor/extensions/qwlqtkey.cpp +++ b/src/compositor/extensions/qwlqtkey.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include "qwlqtkey_p.h" -#include <QtCompositor/QWaylandSurface> +#include <QtWaylandCompositor/QWaylandSurface> #include <QKeyEvent> #include <QWindow> diff --git a/src/compositor/extensions/qwlqtkey_p.h b/src/compositor/extensions/qwlqtkey_p.h index decb1975d..238472343 100644 --- a/src/compositor/extensions/qwlqtkey_p.h +++ b/src/compositor/extensions/qwlqtkey_p.h @@ -39,9 +39,9 @@ #include "wayland-util.h" -#include <QtCompositor/QWaylandExtensionTemplate> -#include <QtCompositor/QWaylandCompositor> -#include <QtCompositor/private/qwayland-server-qtkey-extension.h> +#include <QtWaylandCompositor/QWaylandExtensionTemplate> +#include <QtWaylandCompositor/QWaylandCompositor> +#include <QtWaylandCompositor/private/qwayland-server-qtkey-extension.h> QT_BEGIN_NAMESPACE diff --git a/src/compositor/extensions/qwlqttouch_p.h b/src/compositor/extensions/qwlqttouch_p.h index 46afebfaa..c9be2c009 100644 --- a/src/compositor/extensions/qwlqttouch_p.h +++ b/src/compositor/extensions/qwlqttouch_p.h @@ -37,9 +37,9 @@ #ifndef WLTOUCH_H #define WLTOUCH_H -#include <QtCompositor/private/qwayland-server-touch-extension.h> -#include <QtCompositor/QWaylandCompositor> -#include <QtCompositor/QWaylandExtensionTemplate> +#include <QtWaylandCompositor/private/qwayland-server-touch-extension.h> +#include <QtWaylandCompositor/QWaylandCompositor> +#include <QtWaylandCompositor/QWaylandExtensionTemplate> #include "wayland-util.h" QT_BEGIN_NAMESPACE diff --git a/src/compositor/extensions/qwltextinput.cpp b/src/compositor/extensions/qwltextinput.cpp index 03c67bbdc..a9ad7bbbb 100644 --- a/src/compositor/extensions/qwltextinput.cpp +++ b/src/compositor/extensions/qwltextinput.cpp @@ -39,9 +39,9 @@ #include "qwlinputmethod_p.h" #include "qwlinputmethodcontext_p.h" #include "qwlinputpanel_p.h" -#include <QtCompositor/QWaylandInputPanel> -#include <QtCompositor/QWaylandCompositor> -#include <QtCompositor/private/qwaylandinput_p.h> +#include <QtWaylandCompositor/QWaylandInputPanel> +#include <QtWaylandCompositor/QWaylandCompositor> +#include <QtWaylandCompositor/private/qwaylandinput_p.h> #include <algorithm> diff --git a/src/compositor/extensions/qwltextinput_p.h b/src/compositor/extensions/qwltextinput_p.h index 8f51622fd..359227a4d 100644 --- a/src/compositor/extensions/qwltextinput_p.h +++ b/src/compositor/extensions/qwltextinput_p.h @@ -37,8 +37,8 @@ #ifndef QTWAYLAND_QWLTEXTINPUT_P_H #define QTWAYLAND_QWLTEXTINPUT_P_H -#include <QtCompositor/QWaylandExtension> -#include <QtCompositor/private/qwayland-server-text.h> +#include <QtWaylandCompositor/QWaylandExtension> +#include <QtWaylandCompositor/private/qwayland-server-text.h> #include <QRect> diff --git a/src/compositor/extensions/qwltextinputmanager.cpp b/src/compositor/extensions/qwltextinputmanager.cpp index cbffbf126..9c7dd72f4 100644 --- a/src/compositor/extensions/qwltextinputmanager.cpp +++ b/src/compositor/extensions/qwltextinputmanager.cpp @@ -36,7 +36,7 @@ #include "qwltextinputmanager_p.h" -#include <QtCompositor/QWaylandCompositor> +#include <QtWaylandCompositor/QWaylandCompositor> #include "qwltextinput_p.h" QT_BEGIN_NAMESPACE diff --git a/src/compositor/extensions/qwltextinputmanager_p.h b/src/compositor/extensions/qwltextinputmanager_p.h index 1702166cd..30557e7b0 100644 --- a/src/compositor/extensions/qwltextinputmanager_p.h +++ b/src/compositor/extensions/qwltextinputmanager_p.h @@ -37,8 +37,8 @@ #ifndef QTWAYLAND_QWLTEXTINPUTMANAGER_P_H #define QTWAYLAND_QWLTEXTINPUTMANAGER_P_H -#include <QtCompositor/QWaylandExtension> -#include <QtCompositor/private/qwayland-server-text.h> +#include <QtWaylandCompositor/QWaylandExtension> +#include <QtWaylandCompositor/private/qwayland-server-text.h> QT_BEGIN_NAMESPACE |