Prefix more kwineffects includes with libkwineffects/

CMakeLists.txt

@@ -395,7 +395,6 @@ endif()
 ########### global ###############
 
 include_directories(BEFORE
-    ${CMAKE_CURRENT_BINARY_DIR}/src/libkwineffects
     ${CMAKE_CURRENT_BINARY_DIR}/src/wayland
     ${CMAKE_CURRENT_BINARY_DIR}/src
     ${CMAKE_CURRENT_SOURCE_DIR}/src

autotests/opengl_context_attribute_builder_test.cpp

@@ -11,7 +11,7 @@
 #include <QtTest>
 #include <epoxy/egl.h>
 
-#include <kwinconfig.h>
+#include "libkwineffects/kwinconfig.h"
 #if HAVE_EPOXY_GLX
 #include "../src/backends/x11/standalone/x11_standalone_glx_context_attribute_builder.h"
 #include <epoxy/glx.h>

src/backends/x11/standalone/x11_standalone_backend.cpp

@@ -10,11 +10,11 @@
 
 #include "atoms.h"
 #include "core/session.h"
+#include "libkwineffects/kwinconfig.h"
 #include "x11_standalone_cursor.h"
 #include "x11_standalone_edge.h"
 #include "x11_standalone_placeholderoutput.h"
 #include "x11_standalone_windowselector.h"
-#include <kwinconfig.h>
 #if HAVE_EPOXY_GLX
 #include "x11_standalone_glx_backend.h"
 #endif

src/effects/magnifier/magnifier.cpp

@@ -13,9 +13,9 @@
 // KConfigSkeleton
 #include "magnifierconfig.h"
 
+#include "libkwineffects/kwinconfig.h"
 #include <QAction>
 #include <kstandardaction.h>
-#include <kwinconfig.h>
 
 #include "libkwineffects/kwinglutils.h"
 #include "libkwineffects/renderviewport.h"

src/effects/mousemark/mousemark.cpp

@@ -13,12 +13,12 @@
 // KConfigSkeleton
 #include "mousemarkconfig.h"
 
+#include "libkwineffects/kwinconfig.h"
 #include "libkwineffects/kwinglplatform.h"
 #include "libkwineffects/renderviewport.h"
 #include <KGlobalAccel>
 #include <KLocalizedString>
 #include <QAction>
-#include <kwinconfig.h>
 
 #include <QPainter>
 

src/effects/trackmouse/trackmouse.cpp

@@ -19,9 +19,9 @@
 #include <QPainter>
 #include <QTime>
 
+#include "libkwineffects/kwinconfig.h"
 #include "libkwineffects/kwinglutils.h"
 #include "libkwineffects/renderviewport.h"
-#include <kwinconfig.h>
 
 #include <KGlobalAccel>
 #include <KLocalizedString>

src/libkwineffects/kwinanimationeffect.h

@@ -10,11 +10,11 @@
 
 #pragma once
 
+#include "libkwineffects/kwineffects_export.h"
 #include "libkwineffects/kwinoffscreeneffect.h"
 #include <QEasingCurve>
 #include <QElapsedTimer>
 #include <QtMath>
-#include <kwineffects_export.h>
 
 namespace KWin
 {

src/libkwineffects/kwineffects.h

@@ -12,9 +12,9 @@
 
 #pragma once
 
+#include "libkwineffects/kwinconfig.h"
+#include "libkwineffects/kwineffects_export.h"
 #include "libkwineffects/kwinglobals.h"
-#include <kwinconfig.h>
-#include <kwineffects_export.h>
 
 #include <QEasingCurve>
 #include <QIcon>

src/libkwineffects/kwineglimagetexture.h

@@ -10,7 +10,7 @@
 #pragma once
 
 #include "libkwineffects/kwingltexture.h"
-#include <kwinglutils_export.h>
+#include "libkwineffects/kwinglutils_export.h"
 
 typedef void *EGLImageKHR;
 typedef void *EGLDisplay;

src/libkwineffects/kwinglobals.h

@@ -18,7 +18,7 @@
 
 #include <xcb/xcb.h>
 
-#include <kwinconfig.h>
+#include "libkwineffects/kwinconfig.h"
 
 #define KWIN_QT5_PORTING 0
 

src/libkwineffects/kwinglplatform.h

@@ -10,7 +10,7 @@
 #pragma once
 
 #include "libkwineffects/kwinglobals.h"
-#include <kwinglutils_export.h>
+#include "libkwineffects/kwinglutils_export.h"
 
 #include <QByteArray>
 #include <QSet>

src/libkwineffects/kwingltexture.cpp

@@ -9,7 +9,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "kwinconfig.h" // KWIN_HAVE_OPENGL
+#include "libkwineffects/kwinconfig.h" // KWIN_HAVE_OPENGL
 #include "libkwineffects/kwineffects.h"
 #include "libkwineffects/kwinglplatform.h"
 #include "libkwineffects/kwinglutils.h"

src/libkwineffects/kwingltexture.h

@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include <kwinglutils_export.h>
+#include "libkwineffects/kwinglutils_export.h"
 
 #include <QExplicitlySharedDataPointer>
 #include <QMatrix4x4>

src/libkwineffects/kwingltexture_p.h

@@ -11,9 +11,9 @@
 
 #pragma once
 
-#include "kwinconfig.h" // KWIN_HAVE_OPENGL
+#include "libkwineffects/kwinconfig.h" // KWIN_HAVE_OPENGL
 #include "libkwineffects/kwinglutils.h"
-#include <kwinglutils_export.h>
+#include "libkwineffects/kwinglutils_export.h"
 
 #include <QImage>
 #include <QMatrix4x4>

src/libkwineffects/kwinglutils.h

@@ -11,8 +11,8 @@
 
 // kwin
 #include "libkwineffects/kwingltexture.h"
+#include "libkwineffects/kwinglutils_export.h"
 #include "libkwineffects/kwinglutils_funcs.h"
-#include <kwinglutils_export.h>
 
 // Qt
 #include <QSize>

src/libkwineffects/kwinglutils_funcs.h

@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <kwinglutils_export.h>
+#include "libkwineffects/kwinglutils_export.h"
 
 #include <epoxy/gl.h>
 #include <functional>

src/libkwineffects/kwinoffscreenquickview.h

@@ -13,7 +13,7 @@
 #include <QRect>
 #include <QUrl>
 
-#include <kwineffects_export.h>
+#include "libkwineffects/kwineffects_export.h"
 
 #include "libkwineffects/kwineffects.h"
 

src/libkwineffects/rendertarget.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <kwinglutils_export.h>
+#include "libkwineffects/kwinglutils_export.h"
 
 #include <QImage>
 #include <QMatrix4x4>

src/libkwineffects/renderviewport.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "kwineffects_export.h"
+#include "libkwineffects/kwineffects_export.h"
 
 #include <QMatrix4x4>
 #include <QRectF>

src/utils/common.h

@@ -11,8 +11,8 @@
 #pragma once
 
 // cmake stuff
+#include "libkwineffects/kwinconfig.h"
 #include <config-kwin.h>
-#include <kwinconfig.h>
 // kwin
 #include "libkwineffects/kwinglobals.h"
 // Qt