libkwineffects/ -> effect/

autotests/CMakeLists.txt

@@ -1,6 +1,6 @@
 add_definitions(-DKWIN_UNIT_TEST)
 remove_definitions(-DQT_USE_QSTRINGBUILDER)
-add_subdirectory(libkwineffects)
+add_subdirectory(effect)
 add_subdirectory(integration)
 add_subdirectory(libinput)
 add_subdirectory(wayland)

autotests/effect/timelinetest.cpp

@@ -7,7 +7,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "libkwineffects/timeline.h"
+#include "effect/timeline.h"
 
 #include <QTest>
 

autotests/effect/windowquadlisttest.cpp

@@ -6,7 +6,7 @@
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
-#include "libkwineffects/effects.h"
+#include "effect/effects.h"
 #include <QTest>
 
 Q_DECLARE_METATYPE(KWin::WindowQuadList)

autotests/integration/dont_crash_cancel_animation.cpp

@@ -9,8 +9,8 @@
 #include "kwin_wayland_test.h"
 
 #include "compositor.h"
-#include "libkwineffects/effectloader.h"
-#include "libkwineffects/effects.h"
+#include "effect/effectloader.h"
+#include "effect/effects.h"
 #include "scripting/scriptedeffect.h"
 #include "wayland_server.h"
 #include "window.h"

autotests/integration/dont_crash_reinitialize_compositor.cpp

@@ -11,8 +11,8 @@
 
 #include "compositor.h"
 #include "core/output.h"
-#include "libkwineffects/effectloader.h"
-#include "libkwineffects/effects.h"
+#include "effect/effectloader.h"
+#include "effect/effects.h"
 #include "wayland_server.h"
 #include "window.h"
 #include "workspace.h"

autotests/integration/effects/desktop_switching_animation_test.cpp

@@ -9,8 +9,8 @@
 
 #include "kwin_wayland_test.h"
 
-#include "libkwineffects/effectloader.h"
-#include "libkwineffects/effects.h"
+#include "effect/effectloader.h"
+#include "effect/effects.h"
 #include "virtualdesktops.h"
 #include "wayland_server.h"
 #include "window.h"

autotests/integration/effects/maximize_animation_test.cpp

@@ -10,8 +10,8 @@
 #include "kwin_wayland_test.h"
 
 #include "compositor.h"
-#include "libkwineffects/effectloader.h"
-#include "libkwineffects/effects.h"
+#include "effect/effectloader.h"
+#include "effect/effects.h"
 #include "scene/workspacescene.h"
 #include "wayland_server.h"
 #include "window.h"

autotests/integration/effects/minimize_animation_test.cpp

@@ -9,8 +9,8 @@
 
 #include "kwin_wayland_test.h"
 
-#include "libkwineffects/effectloader.h"
-#include "libkwineffects/effects.h"
+#include "effect/effectloader.h"
+#include "effect/effects.h"
 #include "wayland_server.h"
 #include "window.h"
 #include "workspace.h"

autotests/integration/effects/popup_open_close_animation_test.cpp

@@ -9,9 +9,9 @@
 
 #include "kwin_wayland_test.h"
 
+#include "effect/effectloader.h"
+#include "effect/effects.h"
 #include "internalwindow.h"
-#include "libkwineffects/effectloader.h"
-#include "libkwineffects/effects.h"
 #include "useractions.h"
 #include "wayland_server.h"
 #include "window.h"

autotests/integration/effects/scripted_effects_test.cpp

@@ -9,9 +9,9 @@
 
 #include "kwin_wayland_test.h"
 
-#include "libkwineffects/anidata_p.h"
-#include "libkwineffects/effectloader.h"
-#include "libkwineffects/effects.h"
+#include "effect/anidata_p.h"
+#include "effect/effectloader.h"
+#include "effect/effects.h"
 #include "scripting/scriptedeffect.h"
 #include "virtualdesktops.h"
 #include "wayland_server.h"

autotests/integration/effects/slidingpopups_test.cpp

@@ -6,9 +6,9 @@
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
+#include "effect/effectloader.h"
+#include "effect/effects.h"
 #include "kwin_wayland_test.h"
-#include "libkwineffects/effectloader.h"
-#include "libkwineffects/effects.h"
 #include "wayland_server.h"
 #include "workspace.h"
 #include "x11window.h"

autotests/integration/effects/toplevel_open_close_animation_test.cpp

@@ -9,8 +9,8 @@
 
 #include "kwin_wayland_test.h"
 
-#include "libkwineffects/effectloader.h"
-#include "libkwineffects/effects.h"
+#include "effect/effectloader.h"
+#include "effect/effects.h"
 #include "wayland_server.h"
 #include "window.h"
 #include "workspace.h"

autotests/integration/effects/translucency_test.cpp

@@ -9,8 +9,8 @@
 #include "kwin_wayland_test.h"
 
 #include "compositor.h"
-#include "libkwineffects/effectloader.h"
-#include "libkwineffects/effects.h"
+#include "effect/effectloader.h"
+#include "effect/effects.h"
 #include "pointer_input.h"
 #include "virtualdesktops.h"
 #include "wayland_server.h"

autotests/integration/effects/wobbly_shade_test.cpp

@@ -9,8 +9,8 @@
 #include "kwin_wayland_test.h"
 
 #include "cursor.h"
-#include "libkwineffects/effectloader.h"
-#include "libkwineffects/effects.h"
+#include "effect/effectloader.h"
+#include "effect/effects.h"
 #include "wayland_server.h"
 #include "workspace.h"
 #include "x11window.h"

autotests/integration/generic_scene_opengl_test.cpp

@@ -10,7 +10,7 @@
 #include "compositor.h"
 #include "core/renderbackend.h"
 #include "cursor.h"
-#include "libkwineffects/effectloader.h"
+#include "effect/effectloader.h"
 #include "scene/workspacescene.h"
 #include "wayland_server.h"
 #include "window.h"

autotests/integration/internal_window.cpp

@@ -9,8 +9,8 @@
 #include "kwin_wayland_test.h"
 
 #include "core/output.h"
+#include "effect/effects.h"
 #include "internalwindow.h"
-#include "libkwineffects/effects.h"
 #include "pointer_input.h"
 #include "wayland/surface.h"
 #include "wayland_server.h"

autotests/integration/kwin_wayland_test.cpp

@@ -11,8 +11,8 @@
 #include "backends/virtual/virtual_backend.h"
 #include "compositor_wayland.h"
 #include "core/session.h"
+#include "effect/effects.h"
 #include "inputmethod.h"
-#include "libkwineffects/effects.h"
 #include "placement.h"
 #include "pluginmanager.h"
 #include "utils/xcbutils.h"

autotests/integration/lockscreen.cpp

@@ -11,7 +11,7 @@
 #include "compositor.h"
 #include "core/output.h"
 #include "core/renderbackend.h"
-#include "libkwineffects/effects.h"
+#include "effect/effects.h"
 #include "pointer_input.h"
 #include "screenedge.h"
 #include "wayland/keyboard.h"

autotests/integration/pointer_input.cpp

@@ -11,7 +11,7 @@
 #include "core/output.h"
 #include "cursor.h"
 #include "cursorsource.h"
-#include "libkwineffects/effects.h"
+#include "effect/effects.h"
 #include "options.h"
 #include "pointer_input.h"
 #include "utils/xcursortheme.h"

autotests/integration/screenedges_test.cpp

@@ -12,7 +12,7 @@
 
 #include "atoms.h"
 #include "cursor.h"
-#include "libkwineffects/effectloader.h"
+#include "effect/effectloader.h"
 #include "main.h"
 #include "pointer_input.h"
 #include "screenedge.h"

autotests/integration/scripting/screenedge_test.cpp

@@ -8,7 +8,7 @@
 */
 #include "kwin_wayland_test.h"
 
-#include "libkwineffects/effectloader.h"
+#include "effect/effectloader.h"
 #include "pointer_input.h"
 #include "scripting/scripting.h"
 #include "wayland_server.h"

autotests/integration/x11_window_test.cpp

@@ -11,7 +11,7 @@
 #include "atoms.h"
 #include "compositor.h"
 #include "cursor.h"
-#include "libkwineffects/effectloader.h"
+#include "effect/effectloader.h"
 #include "wayland_server.h"
 #include "workspace.h"
 #include "x11window.h"

autotests/test_window_paint_data.cpp

@@ -7,7 +7,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "libkwineffects/effects.h"
+#include "effect/effects.h"
 
 #include "virtualdesktops.h"
 

autotests/test_x11_timestamp_update.cpp

@@ -10,7 +10,7 @@
 #include <QTest>
 #include <private/qtx11extras_p.h>
 
-#include "libkwineffects/xcb.h"
+#include "effect/xcb.h"
 #include "main.h"
 #include "utils/common.h"
 

autotests/testutils.h

@@ -9,8 +9,8 @@
 #ifndef TESTUTILS_H
 #define TESTUTILS_H
 // KWin
-#include "libkwineffects/globals.h"
-#include "libkwineffects/xcb.h"
+#include "effect/globals.h"
+#include "effect/xcb.h"
 
 namespace
 {

src/CMakeLists.txt

@@ -81,6 +81,18 @@ target_sources(kwin PRIVATE
     decorations/decorations_logging.cpp
     decorations/settings.cpp
     dpmsinputeventfilter.cpp
+    effect/anidata.cpp
+    effect/animationeffect.cpp
+    effect/effect.cpp
+    effect/effectframe.cpp
+    effect/effectloader.cpp
+    effect/effects.cpp
+    effect/effecttogglablestate.cpp
+    effect/logging.cpp
+    effect/offscreeneffect.cpp
+    effect/offscreenquickview.cpp
+    effect/quickeffect.cpp
+    effect/timeline.cpp
     events.cpp
     focuschain.cpp
     ftrace.cpp
@@ -106,18 +118,6 @@ target_sources(kwin PRIVATE
     layers.cpp
     layershellv1integration.cpp
     layershellv1window.cpp
-    libkwineffects/anidata.cpp
-    libkwineffects/animationeffect.cpp
-    libkwineffects/effect.cpp
-    libkwineffects/effectframe.cpp
-    libkwineffects/effectloader.cpp
-    libkwineffects/effects.cpp
-    libkwineffects/effecttogglablestate.cpp
-    libkwineffects/logging.cpp
-    libkwineffects/offscreeneffect.cpp
-    libkwineffects/offscreenquickview.cpp
-    libkwineffects/quickeffect.cpp
-    libkwineffects/timeline.cpp
     lidswitchtracker.cpp
     main.cpp
     modifier_only_shortcuts.cpp
@@ -294,7 +294,7 @@ set(kwin_dbus_SRCS)
 qt_add_dbus_adaptor(kwin_dbus_SRCS scripting/org.kde.kwin.Script.xml scripting/scripting.h KWin::AbstractScript)
 qt_add_dbus_adaptor(kwin_dbus_SRCS org.kde.KWin.xml dbusinterface.h KWin::DBusInterface)
 qt_add_dbus_adaptor(kwin_dbus_SRCS org.kde.kwin.Compositing.xml dbusinterface.h KWin::CompositorDBusInterface)
-qt_add_dbus_adaptor(kwin_dbus_SRCS ${kwin_effects_dbus_xml} libkwineffects/effects.h KWin::EffectsHandler)
+qt_add_dbus_adaptor(kwin_dbus_SRCS ${kwin_effects_dbus_xml} effect/effects.h KWin::EffectsHandler)
 qt_add_dbus_adaptor(kwin_dbus_SRCS org.kde.KWin.VirtualDesktopManager.xml dbusinterface.h KWin::VirtualDesktopManagerDBusInterface)
 qt_add_dbus_adaptor(kwin_dbus_SRCS org.kde.KWin.Session.xml sm.h KWin::SessionManager)
 qt_add_dbus_adaptor(kwin_dbus_SRCS org.kde.KWin.Plugins.xml dbusinterface.h KWin::PluginManagerDBusInterface)
@@ -435,16 +435,16 @@ install(FILES
     DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwin/utils COMPONENT Devel)
 
 install(FILES
-    libkwineffects/animationeffect.h
-    libkwineffects/effect.h
-    libkwineffects/effects.h
-    libkwineffects/effecttogglablestate.h
-    libkwineffects/globals.h
-    libkwineffects/offscreeneffect.h
-    libkwineffects/offscreenquickview.h
-    libkwineffects/quickeffect.h
-    libkwineffects/timeline.h
-    DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwin/libkwineffects COMPONENT Devel)
+    effect/animationeffect.h
+    effect/effect.h
+    effect/effects.h
+    effect/effecttogglablestate.h
+    effect/globals.h
+    effect/offscreeneffect.h
+    effect/offscreenquickview.h
+    effect/quickeffect.h
+    effect/timeline.h
+    DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwin/effect COMPONENT Devel)
 
 install(FILES
     opengl/glframebuffer.h

src/activities.h

@@ -8,7 +8,7 @@
 */
 #pragma once
 
-#include "libkwineffects/globals.h"
+#include "effect/globals.h"
 
 #include <QObject>
 #include <QStringList>

src/appmenu.h

@@ -10,7 +10,7 @@
 */
 #pragma once
 // KWin
-#include "libkwineffects/globals.h"
+#include "effect/globals.h"
 // Qt
 #include <QObject>
 // xcb

src/backends/libinput/connection.h

@@ -8,7 +8,7 @@
 */
 #pragma once
 
-#include "libkwineffects/globals.h"
+#include "effect/globals.h"
 
 #include <KSharedConfig>
 

src/backends/wayland/wayland_backend.h

@@ -14,7 +14,7 @@
 #include "core/inputbackend.h"
 #include "core/inputdevice.h"
 #include "core/outputbackend.h"
-#include "libkwineffects/globals.h"
+#include "effect/globals.h"
 #include "utils/filedescriptor.h"
 // Qt
 #include <QHash>

src/backends/x11/standalone/x11_standalone_effects.h

@@ -9,7 +9,7 @@
 */
 #pragma once
 
-#include "libkwineffects/effects.h"
+#include "effect/effects.h"
 #include "utils/xcbutils.h"
 
 #include <memory.h>

src/backends/x11/standalone/x11_standalone_effects_mouse_interception_filter.cpp

@@ -7,7 +7,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 #include "x11_standalone_effects_mouse_interception_filter.h"
-#include "libkwineffects/effects.h"
+#include "effect/effects.h"
 #include "utils/common.h"
 
 #include <QCursor>

src/backends/x11/standalone/x11_standalone_glx_backend.cpp

@@ -34,7 +34,7 @@
 #include "utils/xcbutils.h"
 #include "workspace.h"
 // kwin libs
-#include "libkwineffects/offscreenquickview.h"
+#include "effect/offscreenquickview.h"
 #include "opengl/glplatform.h"
 #include "opengl/glutils.h"
 // Qt

src/backends/x11/standalone/x11_standalone_overlaywindow.cpp

@@ -10,7 +10,7 @@
 #include "x11_standalone_overlaywindow.h"
 
 #include "compositor.h"
-#include "libkwineffects/globals.h"
+#include "effect/globals.h"
 #include "scene/workspacescene.h"
 #include "utils/common.h"
 #include "utils/xcbutils.h"

src/backends/x11/standalone/x11_standalone_xinputintegration.cpp

@@ -18,9 +18,9 @@
 
 #include "../common/ge_event_mem_mover.h"
 
+#include "effect/globals.h"
+#include "effect/xcb.h"
 #include "input.h"
-#include "libkwineffects/globals.h"
-#include "libkwineffects/xcb.h"
 #include "modifier_only_shortcuts.h"
 #include "workspace.h"
 #include "x11eventfilter.h"

src/client_machine.cpp

@@ -8,7 +8,7 @@
 */
 // own
 #include "client_machine.h"
-#include "libkwineffects/xcb.h"
+#include "effect/xcb.h"
 #include "main.h"
 #include "utils/common.h"
 // KF5

src/colors/colordevice.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "libkwineffects/globals.h"
+#include "effect/globals.h"
 
 #include <QObject>
 #include <memory>

src/colors/colormanager.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "libkwineffects/globals.h"
+#include "effect/globals.h"
 
 #include <QObject>
 #include <memory>

src/compositor.h

@@ -9,7 +9,7 @@
 */
 #pragma once
 
-#include "libkwineffects/globals.h"
+#include "effect/globals.h"
 #include <xcb/xcb.h>
 
 #include <QObject>

src/core/outputbackend.h

@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "libkwineffects/globals.h"
+#include "effect/globals.h"
 #include <epoxy/egl.h>
 #include <kwin_export.h>
 

src/core/renderbackend.h

@@ -7,7 +7,7 @@
 #pragma once
 
 #include "core/rendertarget.h"
-#include "libkwineffects/globals.h"
+#include "effect/globals.h"
 
 #include <QObject>
 

src/core/renderjournal.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "libkwineffects/globals.h"
+#include "effect/globals.h"
 
 #include <QElapsedTimer>
 #include <QQueue>

src/core/renderlayerdelegate.h

@@ -6,8 +6,8 @@
 
 #pragma once
 
+#include "effect/globals.h"
 #include "kwin_export.h"
-#include "libkwineffects/globals.h"
 
 #include <QRegion>
 #include <chrono>

src/core/renderloop.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "libkwineffects/globals.h"
+#include "effect/globals.h"
 
 #include <QObject>
 

src/core/session.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "libkwineffects/globals.h"
+#include "effect/globals.h"
 
 #include <QObject>
 #include <QString>

src/cursor.h

@@ -8,7 +8,7 @@
 */
 #pragma once
 // kwin
-#include "libkwineffects/globals.h"
+#include "effect/globals.h"
 // Qt
 #include <QHash>
 #include <QObject>

src/decorations/decorationbridge.h

@@ -8,7 +8,7 @@
 */
 #pragma once
 
-#include "libkwineffects/globals.h"
+#include "effect/globals.h"
 
 #include <KDecoration2/Private/DecorationBridge>
 

src/effect/anidata.cpp

@@ -8,7 +8,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "libkwineffects/anidata_p.h"
+#include "effect/anidata_p.h"
 
 #include "logging_p.h"
 

src/effect/anidata_p.h

@@ -10,8 +10,8 @@
 
 #pragma once
 
-#include "libkwineffects/animationeffect.h"
-#include "libkwineffects/timeline.h"
+#include "effect/animationeffect.h"
+#include "effect/timeline.h"
 
 #include <QEasingCurve>
 

src/effect/animationeffect.cpp

@@ -8,8 +8,8 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "libkwineffects/animationeffect.h"
-#include "libkwineffects/anidata_p.h"
+#include "effect/animationeffect.h"
+#include "effect/anidata_p.h"
 #include "opengl/glutils.h"
 
 #include <QDateTime>

src/effect/animationeffect.h

@@ -12,7 +12,7 @@
 
 #include "kwin_export.h"
 
-#include "libkwineffects/offscreeneffect.h"
+#include "effect/offscreeneffect.h"
 #include <QEasingCurve>
 #include <QElapsedTimer>
 #include <QtMath>

src/effect/effect.cpp

@@ -6,8 +6,8 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "libkwineffects/effect.h"
-#include "libkwineffects/effects.h"
+#include "effect/effect.h"
+#include "effect/effects.h"
 
 #include <KConfigGroup>
 

src/effect/effect.h

@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "libkwineffects/globals.h"
+#include "effect/globals.h"
 
 #include <QRegion>
 

src/effect/effectframe.cpp

@@ -5,8 +5,8 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "libkwineffects/effectframe.h"
-#include "libkwineffects/effects.h"
+#include "effect/effectframe.h"
+#include "effect/effects.h"
 
 #include <QQuickItem>
 #include <QStandardPaths>

src/effect/effectframe.h

@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include "libkwineffects/globals.h"
-#include "libkwineffects/offscreenquickview.h"
+#include "effect/globals.h"
+#include "effect/offscreenquickview.h"
 
 #include <QFont>
 #include <QIcon>

src/effect/effectloader.cpp

@@ -7,11 +7,11 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 // own
-#include "libkwineffects/effectloader.h"
+#include "effect/effectloader.h"
 // config
 #include <config-kwin.h>
 // KWin
-#include "libkwineffects/effect.h"
+#include "effect/effect.h"
 #include "plugin.h"
 #include "scripting/scriptedeffect.h"
 #include "scripting/scriptedquicksceneeffect.h"

src/effect/effects.cpp

@@ -9,7 +9,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "libkwineffects/effects.h"
+#include "effect/effects.h"
 
 #include "config-kwin.h"
 
@@ -20,6 +20,8 @@
 #include "core/rendertarget.h"
 #include "core/renderviewport.h"
 #include "decorations/decorationbridge.h"
+#include "effect/effectloader.h"
+#include "effect/offscreenquickview.h"
 #include "effectsadaptor.h"
 #include "group.h"
 #include "input.h"
@@ -27,8 +29,6 @@
 #include "inputmethod.h"
 #include "inputpanelv1window.h"
 #include "internalwindow.h"
-#include "libkwineffects/effectloader.h"
-#include "libkwineffects/offscreenquickview.h"
 #include "opengl/glutils.h"
 #include "osd.h"
 #include "pointer_input.h"

src/effect/effects.h

@@ -12,7 +12,7 @@
 
 #pragma once
 
-#include "libkwineffects/effect.h"
+#include "effect/effect.h"
 #include "opengl/glvertexbuffer.h"
 
 #include <QEasingCurve>