From 1211d8e3d6fd9620fb17d1e97814cd892cb3cde7 Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Sat, 25 Mar 2023 17:33:13 +0200 Subject: [PATCH] Prefix more kwineffects includes with libkwineffects/ --- CMakeLists.txt | 1 - autotests/opengl_context_attribute_builder_test.cpp | 2 +- src/backends/x11/standalone/x11_standalone_backend.cpp | 2 +- src/effects/magnifier/magnifier.cpp | 2 +- src/effects/mousemark/mousemark.cpp | 2 +- src/effects/trackmouse/trackmouse.cpp | 2 +- src/libkwineffects/kwinanimationeffect.h | 2 +- src/libkwineffects/kwineffects.h | 4 ++-- src/libkwineffects/kwineglimagetexture.h | 2 +- src/libkwineffects/kwinglobals.h | 2 +- src/libkwineffects/kwinglplatform.h | 2 +- src/libkwineffects/kwingltexture.cpp | 2 +- src/libkwineffects/kwingltexture.h | 2 +- src/libkwineffects/kwingltexture_p.h | 4 ++-- src/libkwineffects/kwinglutils.h | 2 +- src/libkwineffects/kwinglutils_funcs.h | 2 +- src/libkwineffects/kwinoffscreenquickview.h | 2 +- src/libkwineffects/rendertarget.h | 2 +- src/libkwineffects/renderviewport.h | 2 +- src/utils/common.h | 2 +- 20 files changed, 21 insertions(+), 22 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 20976d4636..da9da66b13 100644 --- a/CMakeLists.txt +++ b/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 diff --git a/autotests/opengl_context_attribute_builder_test.cpp b/autotests/opengl_context_attribute_builder_test.cpp index d7eeb72c10..dad07bc2ba 100644 --- a/autotests/opengl_context_attribute_builder_test.cpp +++ b/autotests/opengl_context_attribute_builder_test.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include "libkwineffects/kwinconfig.h" #if HAVE_EPOXY_GLX #include "../src/backends/x11/standalone/x11_standalone_glx_context_attribute_builder.h" #include diff --git a/src/backends/x11/standalone/x11_standalone_backend.cpp b/src/backends/x11/standalone/x11_standalone_backend.cpp index da126502a5..0f56419c95 100644 --- a/src/backends/x11/standalone/x11_standalone_backend.cpp +++ b/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 #if HAVE_EPOXY_GLX #include "x11_standalone_glx_backend.h" #endif diff --git a/src/effects/magnifier/magnifier.cpp b/src/effects/magnifier/magnifier.cpp index 5af45b5a8b..a36f0b674a 100644 --- a/src/effects/magnifier/magnifier.cpp +++ b/src/effects/magnifier/magnifier.cpp @@ -13,9 +13,9 @@ // KConfigSkeleton #include "magnifierconfig.h" +#include "libkwineffects/kwinconfig.h" #include #include -#include #include "libkwineffects/kwinglutils.h" #include "libkwineffects/renderviewport.h" diff --git a/src/effects/mousemark/mousemark.cpp b/src/effects/mousemark/mousemark.cpp index 08740e014a..2fc153dc2d 100644 --- a/src/effects/mousemark/mousemark.cpp +++ b/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 #include #include -#include #include diff --git a/src/effects/trackmouse/trackmouse.cpp b/src/effects/trackmouse/trackmouse.cpp index c0a3b5c801..522200a378 100644 --- a/src/effects/trackmouse/trackmouse.cpp +++ b/src/effects/trackmouse/trackmouse.cpp @@ -19,9 +19,9 @@ #include #include +#include "libkwineffects/kwinconfig.h" #include "libkwineffects/kwinglutils.h" #include "libkwineffects/renderviewport.h" -#include #include #include diff --git a/src/libkwineffects/kwinanimationeffect.h b/src/libkwineffects/kwinanimationeffect.h index 879ed45208..b4280c1069 100644 --- a/src/libkwineffects/kwinanimationeffect.h +++ b/src/libkwineffects/kwinanimationeffect.h @@ -10,11 +10,11 @@ #pragma once +#include "libkwineffects/kwineffects_export.h" #include "libkwineffects/kwinoffscreeneffect.h" #include #include #include -#include namespace KWin { diff --git a/src/libkwineffects/kwineffects.h b/src/libkwineffects/kwineffects.h index dde7d813dd..da967535cc 100644 --- a/src/libkwineffects/kwineffects.h +++ b/src/libkwineffects/kwineffects.h @@ -12,9 +12,9 @@ #pragma once +#include "libkwineffects/kwinconfig.h" +#include "libkwineffects/kwineffects_export.h" #include "libkwineffects/kwinglobals.h" -#include -#include #include #include diff --git a/src/libkwineffects/kwineglimagetexture.h b/src/libkwineffects/kwineglimagetexture.h index 15f73aa3dd..f984661651 100644 --- a/src/libkwineffects/kwineglimagetexture.h +++ b/src/libkwineffects/kwineglimagetexture.h @@ -10,7 +10,7 @@ #pragma once #include "libkwineffects/kwingltexture.h" -#include +#include "libkwineffects/kwinglutils_export.h" typedef void *EGLImageKHR; typedef void *EGLDisplay; diff --git a/src/libkwineffects/kwinglobals.h b/src/libkwineffects/kwinglobals.h index 5393801685..a4209c109b 100644 --- a/src/libkwineffects/kwinglobals.h +++ b/src/libkwineffects/kwinglobals.h @@ -18,7 +18,7 @@ #include -#include +#include "libkwineffects/kwinconfig.h" #define KWIN_QT5_PORTING 0 diff --git a/src/libkwineffects/kwinglplatform.h b/src/libkwineffects/kwinglplatform.h index 622b203b52..1217e6f7f4 100644 --- a/src/libkwineffects/kwinglplatform.h +++ b/src/libkwineffects/kwinglplatform.h @@ -10,7 +10,7 @@ #pragma once #include "libkwineffects/kwinglobals.h" -#include +#include "libkwineffects/kwinglutils_export.h" #include #include diff --git a/src/libkwineffects/kwingltexture.cpp b/src/libkwineffects/kwingltexture.cpp index 4efff2c396..eb7abbb6d6 100644 --- a/src/libkwineffects/kwingltexture.cpp +++ b/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" diff --git a/src/libkwineffects/kwingltexture.h b/src/libkwineffects/kwingltexture.h index ed19944da0..559e4d2a26 100644 --- a/src/libkwineffects/kwingltexture.h +++ b/src/libkwineffects/kwingltexture.h @@ -10,7 +10,7 @@ #pragma once -#include +#include "libkwineffects/kwinglutils_export.h" #include #include diff --git a/src/libkwineffects/kwingltexture_p.h b/src/libkwineffects/kwingltexture_p.h index 254022f1ea..5c907a33f2 100644 --- a/src/libkwineffects/kwingltexture_p.h +++ b/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 +#include "libkwineffects/kwinglutils_export.h" #include #include diff --git a/src/libkwineffects/kwinglutils.h b/src/libkwineffects/kwinglutils.h index ff0f4677d2..629a316785 100644 --- a/src/libkwineffects/kwinglutils.h +++ b/src/libkwineffects/kwinglutils.h @@ -11,8 +11,8 @@ // kwin #include "libkwineffects/kwingltexture.h" +#include "libkwineffects/kwinglutils_export.h" #include "libkwineffects/kwinglutils_funcs.h" -#include // Qt #include diff --git a/src/libkwineffects/kwinglutils_funcs.h b/src/libkwineffects/kwinglutils_funcs.h index 68542edf82..e794ec5680 100644 --- a/src/libkwineffects/kwinglutils_funcs.h +++ b/src/libkwineffects/kwinglutils_funcs.h @@ -9,7 +9,7 @@ #pragma once -#include +#include "libkwineffects/kwinglutils_export.h" #include #include diff --git a/src/libkwineffects/kwinoffscreenquickview.h b/src/libkwineffects/kwinoffscreenquickview.h index 5dcd0d20b5..00244decf8 100644 --- a/src/libkwineffects/kwinoffscreenquickview.h +++ b/src/libkwineffects/kwinoffscreenquickview.h @@ -13,7 +13,7 @@ #include #include -#include +#include "libkwineffects/kwineffects_export.h" #include "libkwineffects/kwineffects.h" diff --git a/src/libkwineffects/rendertarget.h b/src/libkwineffects/rendertarget.h index 6e06b7f06a..a943ca70bc 100644 --- a/src/libkwineffects/rendertarget.h +++ b/src/libkwineffects/rendertarget.h @@ -6,7 +6,7 @@ #pragma once -#include +#include "libkwineffects/kwinglutils_export.h" #include #include diff --git a/src/libkwineffects/renderviewport.h b/src/libkwineffects/renderviewport.h index 7c5480014f..0fd815c024 100644 --- a/src/libkwineffects/renderviewport.h +++ b/src/libkwineffects/renderviewport.h @@ -6,7 +6,7 @@ #pragma once -#include "kwineffects_export.h" +#include "libkwineffects/kwineffects_export.h" #include #include diff --git a/src/utils/common.h b/src/utils/common.h index 2b3d9e0b3c..c2f001821a 100644 --- a/src/utils/common.h +++ b/src/utils/common.h @@ -11,8 +11,8 @@ #pragma once // cmake stuff +#include "libkwineffects/kwinconfig.h" #include -#include // kwin #include "libkwineffects/kwinglobals.h" // Qt