Drop redundant "kwin" prefix in some filenames

autotests/integration/dont_crash_cancel_animation.cpp

@@ -10,7 +10,7 @@
 
 #include "compositor.h"
 #include "effectloader.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "scripting/scriptedeffect.h"
 #include "wayland_server.h"
 #include "window.h"

autotests/integration/dont_crash_reinitialize_compositor.cpp

@@ -12,7 +12,7 @@
 #include "compositor.h"
 #include "core/output.h"
 #include "effectloader.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "wayland_server.h"
 #include "window.h"
 #include "workspace.h"

autotests/integration/effects/desktop_switching_animation_test.cpp

@@ -10,7 +10,7 @@
 #include "kwin_wayland_test.h"
 
 #include "effectloader.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "virtualdesktops.h"
 #include "wayland_server.h"
 #include "window.h"

autotests/integration/effects/maximize_animation_test.cpp

@@ -11,7 +11,7 @@
 
 #include "compositor.h"
 #include "effectloader.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "scene/workspacescene.h"
 #include "wayland_server.h"
 #include "window.h"

autotests/integration/effects/minimize_animation_test.cpp

@@ -10,7 +10,7 @@
 #include "kwin_wayland_test.h"
 
 #include "effectloader.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "wayland_server.h"
 #include "window.h"
 #include "workspace.h"

autotests/integration/effects/popup_open_close_animation_test.cpp

@@ -11,7 +11,7 @@
 
 #include "effectloader.h"
 #include "internalwindow.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "useractions.h"
 #include "wayland_server.h"
 #include "window.h"

autotests/integration/effects/scripted_effects_test.cpp

@@ -11,7 +11,7 @@
 
 #include "effectloader.h"
 #include "libkwineffects/anidata_p.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "scripting/scriptedeffect.h"
 #include "virtualdesktops.h"
 #include "wayland_server.h"

autotests/integration/effects/slidingpopups_test.cpp

@@ -8,7 +8,7 @@
 */
 #include "effectloader.h"
 #include "kwin_wayland_test.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "wayland_server.h"
 #include "workspace.h"
 #include "x11window.h"

autotests/integration/effects/toplevel_open_close_animation_test.cpp

@@ -10,7 +10,7 @@
 #include "kwin_wayland_test.h"
 
 #include "effectloader.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "wayland_server.h"
 #include "window.h"
 #include "workspace.h"

autotests/integration/effects/translucency_test.cpp

@@ -10,7 +10,7 @@
 
 #include "compositor.h"
 #include "effectloader.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "pointer_input.h"
 #include "virtualdesktops.h"
 #include "wayland_server.h"

autotests/integration/effects/wobbly_shade_test.cpp

@@ -10,7 +10,7 @@
 
 #include "cursor.h"
 #include "effectloader.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "wayland_server.h"
 #include "workspace.h"
 #include "x11window.h"

autotests/integration/internal_window.cpp

@@ -10,7 +10,7 @@
 
 #include "core/output.h"
 #include "internalwindow.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "pointer_input.h"
 #include "wayland/surface.h"
 #include "wayland_server.h"

autotests/integration/kwin_wayland_test.cpp

@@ -12,7 +12,7 @@
 #include "compositor_wayland.h"
 #include "core/session.h"
 #include "inputmethod.h"
-#include "libkwineffects/kwineffects.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/kwineffects.h"
+#include "libkwineffects/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/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "options.h"
 #include "pointer_input.h"
 #include "utils/xcursortheme.h"

autotests/libkwineffects/windowquadlisttest.cpp

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

autotests/test_window_paint_data.cpp

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

autotests/test_x11_timestamp_update.cpp

@@ -10,7 +10,7 @@
 #include <QTest>
 #include <private/qtx11extras_p.h>
 
-#include "libkwineffects/kwinxcb.h"
+#include "libkwineffects/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/kwinglobals.h"
-#include "libkwineffects/kwinxcb.h"
+#include "libkwineffects/globals.h"
+#include "libkwineffects/xcb.h"
 
 namespace
 {

src/CMakeLists.txt

@@ -108,15 +108,15 @@ target_sources(kwin PRIVATE
     layershellv1integration.cpp
     layershellv1window.cpp
     libkwineffects/anidata.cpp
+    libkwineffects/animationeffect.cpp
     libkwineffects/effect.cpp
     libkwineffects/effectframe.cpp
+    libkwineffects/effects.cpp
     libkwineffects/effecttogglablestate.cpp
-    libkwineffects/kwinanimationeffect.cpp
-    libkwineffects/kwineffects.cpp
-    libkwineffects/kwinoffscreeneffect.cpp
-    libkwineffects/kwinoffscreenquickview.cpp
-    libkwineffects/kwinquickeffect.cpp
     libkwineffects/logging.cpp
+    libkwineffects/offscreeneffect.cpp
+    libkwineffects/offscreenquickview.cpp
+    libkwineffects/quickeffect.cpp
     libkwineffects/timeline.cpp
     lidswitchtracker.cpp
     main.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/kwineffects.h KWin::EffectsHandler)
+qt_add_dbus_adaptor(kwin_dbus_SRCS ${kwin_effects_dbus_xml} libkwineffects/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,14 +435,14 @@ 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/kwinanimationeffect.h
-    libkwineffects/kwineffects.h
-    libkwineffects/kwinglobals.h
-    libkwineffects/kwinoffscreeneffect.h
-    libkwineffects/kwinoffscreenquickview.h
-    libkwineffects/kwinquickeffect.h
+    libkwineffects/globals.h
+    libkwineffects/offscreeneffect.h
+    libkwineffects/offscreenquickview.h
+    libkwineffects/quickeffect.h
     libkwineffects/timeline.h
     DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwin/libkwineffects COMPONENT Devel)
 

src/activities.h

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

src/appmenu.h

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

src/backends/libinput/connection.h

@@ -8,7 +8,7 @@
 */
 #pragma once
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/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/kwinglobals.h"
+#include "libkwineffects/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/kwineffects.h"
+#include "libkwineffects/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/kwineffects.h"
+#include "libkwineffects/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/kwinoffscreenquickview.h"
+#include "libkwineffects/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/kwinglobals.h"
+#include "libkwineffects/globals.h"
 #include "scene/workspacescene.h"
 #include "utils/common.h"
 #include "utils/xcbutils.h"

src/backends/x11/standalone/x11_standalone_xinputintegration.cpp

@@ -19,8 +19,8 @@
 #include "../common/ge_event_mem_mover.h"
 
 #include "input.h"
-#include "libkwineffects/kwinglobals.h"
-#include "libkwineffects/kwinxcb.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/kwinxcb.h"
+#include "libkwineffects/xcb.h"
 #include "main.h"
 #include "utils/common.h"
 // KF5

src/colors/colordevice.h

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

src/colors/colormanager.h

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

src/compositor.h

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

src/core/outputbackend.h

@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/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/kwinglobals.h"
+#include "libkwineffects/globals.h"
 
 #include <QObject>
 

src/core/renderjournal.h

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

src/core/renderlayerdelegate.h

@@ -7,7 +7,7 @@
 #pragma once
 
 #include "kwin_export.h"
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 
 #include <QRegion>
 #include <chrono>

src/core/renderloop.h

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

src/core/session.h

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

src/cursor.h

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

src/decorations/decorationbridge.h

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

src/events.cpp

@@ -18,7 +18,7 @@
 #include "cursor.h"
 #include "focuschain.h"
 #include "group.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "netinfo.h"
 #include "rules.h"
 #include "screenedge.h"

src/focuschain.h

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

src/ftrace.h

@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 
 #include <QFile>
 #include <QMutex>

src/gestures.h

@@ -8,7 +8,7 @@
 */
 #pragma once
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 #include <kwin_export.h>
 
 #include <QList>

src/globalshortcuts.cpp

@@ -12,7 +12,7 @@
 #include <config-kwin.h>
 // kwin
 #include "gestures.h"
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 #include "main.h"
 #include "utils/common.h"
 // KDE

src/globalshortcuts.h

@@ -8,7 +8,7 @@
 */
 #pragma once
 // KWin
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 // Qt
 #include <QKeySequence>
 

src/input.h

@@ -11,7 +11,7 @@
 #pragma once
 #include <config-kwin.h>
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 #include <QObject>
 #include <QPoint>
 #include <QPointer>

src/inputmethod.h

@@ -15,7 +15,7 @@
 
 #include <QObject>
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 #include <kwin_export.h>
 
 #include <QPointer>

src/kcms/screenedges/kwinscreenedge.h

@@ -11,7 +11,7 @@
 
 #include <QWidget>
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 
 namespace KWin
 {

src/kcms/screenedges/kwinscreenedgeeffectsettings.kcfgc

@@ -1,7 +1,7 @@
 File=kwinscreenedgeeffectsettings.kcfg
 NameSpace=KWin
 ClassName=KWinScreenEdgeEffectSettings
-IncludeFiles=\"libkwineffects/kwinglobals.h\"
+IncludeFiles=\"libkwineffects/globals.h\"
 Mutators=true
 DefaultValueGetters=true
 ParentInConstructor=true

src/kcms/screenedges/kwinscreenedgescriptsettings.kcfgc

@@ -1,7 +1,7 @@
 File=kwinscreenedgescriptsettings.kcfg
 NameSpace=KWin
 ClassName=KWinScreenEdgeScriptSettings
-IncludeFiles=\"libkwineffects/kwinglobals.h\"
+IncludeFiles=\"libkwineffects/globals.h\"
 Mutators=true
 DefaultValueGetters=true
 ParentInConstructor=true

src/kcms/screenedges/kwinscreenedgesettings.kcfgc

@@ -1,7 +1,7 @@
 File=kwinscreenedgesettings.kcfg
 NameSpace=KWin
 ClassName=KWinScreenEdgeSettings
-IncludeFiles=\"libkwineffects/kwinglobals.h\"
+IncludeFiles=\"libkwineffects/globals.h\"
 Mutators=true
 DefaultValueGetters=true
 ParentInConstructor=true

src/kcms/screenedges/kwintouchscreenedgeeffectsettings.kcfgc

@@ -1,7 +1,7 @@
 File=kwintouchscreenedgeeffectsettings.kcfg
 NameSpace=KWin
 ClassName=KWinTouchScreenEdgeEffectSettings
-IncludeFiles=\"libkwineffects/kwinglobals.h\"
+IncludeFiles=\"libkwineffects/globals.h\"
 Mutators=true
 DefaultValueGetters=true
 ParentInConstructor=true

src/kcms/screenedges/kwintouchscreenscriptsettings.kcfgc

@@ -1,7 +1,7 @@
 File=kwintouchscreenscriptsettings.kcfg
 NameSpace=KWin
 ClassName=KWinTouchScreenScriptSettings
-IncludeFiles=\"libkwineffects/kwinglobals.h\"
+IncludeFiles=\"libkwineffects/globals.h\"
 Mutators=true
 DefaultValueGetters=true
 ParentInConstructor=true

src/kcms/screenedges/kwintouchscreensettings.kcfgc

@@ -1,7 +1,7 @@
 File=kwintouchscreensettings.kcfg
 NameSpace=KWin
 ClassName=KWinTouchScreenSettings
-IncludeFiles=\"libkwineffects/kwinglobals.h\"
+IncludeFiles=\"libkwineffects/globals.h\"
 Mutators=true
 DefaultValueGetters=true
 ParentInConstructor=true

src/kcms/screenedges/main.h

@@ -13,7 +13,7 @@
 #include <kcmodule.h>
 #include <ksharedconfig.h>
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 
 namespace KWin
 {

src/kcms/screenedges/touch.h

@@ -13,7 +13,7 @@
 #include <kcmodule.h>
 #include <ksharedconfig.h>
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 
 class QShowEvent;
 

src/layers.cpp

@@ -68,7 +68,7 @@
 #include "focuschain.h"
 #include "group.h"
 #include "internalwindow.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "netinfo.h"
 #include "rules.h"
 #include "screenedge.h"

src/libkwineffects/anidata_p.h

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

src/libkwineffects/animationeffect.cpp

@@ -8,7 +8,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "libkwineffects/kwinanimationeffect.h"
+#include "libkwineffects/animationeffect.h"
 #include "libkwineffects/anidata_p.h"
 #include "opengl/glutils.h"
 
@@ -249,8 +249,7 @@ quint64 AnimationEffect::p_animate(EffectWindow *w, Attribute a, uint meta, int
         waitAtSource, // Whether the animation should be kept at source
         fullscreen, // Full screen effect lock
         keepAlive, // Keep alive flag
-        shader
-        ));
+        shader));
 
     const quint64 ret_id = ++d->m_animCounter;
     AniData &animation = it->first.last();
@@ -413,7 +412,9 @@ bool AnimationEffect::cancel(quint64 animationId)
         for (QList<AniData>::iterator anim = entry->first.begin(), animEnd = entry->first.end(); anim != animEnd; ++anim) {
             if (anim->id == animationId) {
                 EffectWindowDeletedRef ref = std::move(anim->deletedRef); // delete window once we're done updating m_animations
-                if (anim->shader && std::none_of(entry->first.begin(), entry->first.end(), [animationId] (const auto &anim) { return anim.id != animationId && anim.shader; })) {
+                if (anim->shader && std::none_of(entry->first.begin(), entry->first.end(), [animationId](const auto &anim) {
+                        return anim.id != animationId && anim.shader;
+                    })) {
                     unredirect(entry.key());
                 }
                 entry->first.erase(anim); // remove the animation
@@ -664,7 +665,9 @@ void AnimationEffect::postPaintScreen()
             }
             EffectWindow *window = entry.key();
             d->m_justEndedAnimation = anim->id;
-            if (anim->shader && std::none_of(entry->first.begin(), entry->first.end(), [anim] (const auto &other) { return anim->id != other.id && other.shader; })) {
+            if (anim->shader && std::none_of(entry->first.begin(), entry->first.end(), [anim](const auto &other) {
+                    return anim->id != other.id && other.shader;
+                })) {
                 unredirect(window);
             }
             unredirect(window);
@@ -1020,4 +1023,4 @@ AnimationEffect::AniMap AnimationEffect::state() const
 
 } // namespace KWin
 
-#include "moc_kwinanimationeffect.cpp"
+#include "moc_animationeffect.cpp"

src/libkwineffects/animationeffect.h

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

src/libkwineffects/effect.cpp

@@ -7,7 +7,7 @@
 */
 
 #include "libkwineffects/effect.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 
 #include <KConfigGroup>
 

src/libkwineffects/effect.h

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

src/libkwineffects/effectframe.h

@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include "libkwineffects/kwineffects.h" // FIXME: move infiniteRegion() elsewhere
-#include "libkwineffects/kwinoffscreenquickview.h"
+#include "libkwineffects/effects.h" // FIXME: move infiniteRegion() elsewhere
+#include "libkwineffects/offscreenquickview.h"
 
 #include <QFont>
 #include <QIcon>

src/libkwineffects/effects.cpp

@@ -9,7 +9,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 
 #include "config-kwin.h"
 
@@ -28,7 +28,7 @@
 #include "inputmethod.h"
 #include "inputpanelv1window.h"
 #include "internalwindow.h"
-#include "libkwineffects/kwinoffscreenquickview.h"
+#include "libkwineffects/offscreenquickview.h"
 #include "opengl/glutils.h"
 #include "osd.h"
 #include "pointer_input.h"
@@ -2684,5 +2684,5 @@ EffectWindow *WindowMotionManager::windowAtPoint(QPoint point, bool useStackingO
 
 } // namespace
 
-#include "moc_kwineffects.cpp"
-#include "moc_kwinglobals.cpp"
+#include "moc_effects.cpp"
+#include "moc_globals.cpp"

src/libkwineffects/effecttogglablestate.cpp

@@ -4,8 +4,8 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "effecttogglablestate.h"
-#include "kwineffects.h"
+#include "libkwineffects/effecttogglablestate.h"
+#include "libkwineffects/effects.h"
 
 namespace KWin
 {

src/libkwineffects/effecttogglablestate.h

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

src/libkwineffects/offscreeneffect.cpp

@@ -4,7 +4,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "libkwineffects/kwinoffscreeneffect.h"
+#include "libkwineffects/offscreeneffect.h"
 #include "core/output.h"
 #include "core/rendertarget.h"
 #include "core/renderviewport.h"
@@ -400,4 +400,4 @@ void CrossFadeEffect::setShader(EffectWindow *window, GLShader *shader)
 
 } // namespace KWin
 
-#include "moc_kwinoffscreeneffect.cpp"
+#include "moc_offscreeneffect.cpp"

src/libkwineffects/offscreeneffect.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 
 namespace KWin
 {

src/libkwineffects/offscreenquickview.cpp

@@ -7,7 +7,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "libkwineffects/kwinoffscreenquickview.h"
+#include "libkwineffects/offscreenquickview.h"
 
 #include "logging_p.h"
 #include "opengl/glutils.h"
@@ -24,10 +24,10 @@
 #include <QOffscreenSurface>
 #include <QOpenGLContext>
 #include <QOpenGLFramebufferObject>
-#include <QTimer>
 #include <QQuickGraphicsDevice>
 #include <QQuickOpenGLUtils>
 #include <QQuickRenderTarget>
+#include <QTimer>
 #include <private/qeventpoint_p.h> // for QMutableEventPoint
 
 namespace KWin
@@ -584,4 +584,4 @@ QQuickItem *OffscreenQuickScene::rootItem() const
 
 } // namespace KWin
 
-#include "moc_kwinoffscreenquickview.cpp"
+#include "moc_offscreenquickview.cpp"

src/libkwineffects/quickeffect.cpp

@@ -4,9 +4,9 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "libkwineffects/kwinquickeffect.h"
+#include "libkwineffects/quickeffect.h"
 #include "core/output.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 
 #include "logging_p.h"
 
@@ -596,4 +596,4 @@ bool QuickSceneEffect::touchUp(qint32 id, std::chrono::microseconds time)
 
 } // namespace KWin
 
-#include <moc_kwinquickeffect.cpp>
+#include "moc_quickeffect.cpp"

src/libkwineffects/quickeffect.h

@@ -8,7 +8,7 @@
 
 #include "core/output.h"
 #include "libkwineffects/effect.h"
-#include "libkwineffects/kwinoffscreenquickview.h"
+#include "libkwineffects/offscreenquickview.h"
 
 #include <QQmlComponent>
 

src/main.cpp

@@ -21,7 +21,7 @@
 #include "cursorsource.h"
 #include "input.h"
 #include "inputmethod.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "opengl/gltexture.h"
 #include "opengl/glutils.h"
 #include "options.h"
@@ -41,7 +41,7 @@
 #include "screenlockerwatcher.h"
 #endif
 
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 
 // KDE
 #include <KAboutData>

src/main.h

@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 #include <config-kwin.h>
 
 #include <KSharedConfig>

src/main_wayland.cpp

@@ -18,7 +18,7 @@
 #include "core/outputbackend.h"
 #include "core/session.h"
 #include "inputmethod.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "tabletmodemanager.h"
 #include "utils/realtime.h"
 #include "wayland/display.h"

src/main_x11.cpp

@@ -17,7 +17,7 @@
 #include "core/outputbackend.h"
 #include "core/session.h"
 #include "cursor.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "outline.h"
 #include "screenedge.h"
 #include "sm.h"

src/opengl/glplatform.cpp

@@ -10,7 +10,7 @@
 #include "opengl/glplatform.h"
 // include kwinglutils_funcs.h to avoid the redeclaration issues
 // between qopengl.h and epoxy/gl.h
-#include "libkwineffects/kwinxcb.h"
+#include "libkwineffects/xcb.h"
 #include "opengl/glutils_funcs.h"
 #include <epoxy/gl.h>
 

src/opengl/glplatform.h

@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwinglobals.h"
+#include "libkwineffects/globals.h"
 #include "openglcontext.h"
 
 #include <QByteArray>

src/opengl/glvertexbuffer.cpp

@@ -14,7 +14,7 @@
 #include "glshader.h"
 #include "glshadermanager.h"
 #include "glutils.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "utils/common.h"
 
 #include <QVector4D>

src/opengl/glvertexbuffer.h

@@ -9,7 +9,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 #pragma once
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 
 #include <QColor>
 #include <QRegion>

src/outline.h

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

src/pluginmanager.h

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

src/plugins/backgroundcontrast/contrastshader.cpp

@@ -7,7 +7,7 @@
 
 #include "contrastshader.h"
 
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "opengl/glplatform.h"
 
 #include <QByteArray>

src/plugins/blendchanges/blendchanges.h

@@ -7,8 +7,8 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 #pragma once
-#include "libkwineffects/kwineffects.h"
-#include "libkwineffects/kwinoffscreeneffect.h"
+#include "libkwineffects/effects.h"
+#include "libkwineffects/offscreeneffect.h"
 #include "libkwineffects/timeline.h"
 #include <chrono>
 

src/plugins/colorblindnesscorrection/colorblindnesscorrection.cpp

@@ -8,7 +8,7 @@
 
 #include <KSharedConfig>
 
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "opengl/glshader.h"
 
 #include "colorblindnesscorrection_settings.h"

src/plugins/colorblindnesscorrection/colorblindnesscorrection.h

@@ -8,7 +8,7 @@
 
 #include <unordered_set>
 
-#include "libkwineffects/kwinoffscreeneffect.h"
+#include "libkwineffects/offscreeneffect.h"
 #include "opengl/glshadermanager.h"
 
 namespace KWin

src/plugins/diminactive/diminactive.cpp

@@ -11,7 +11,7 @@
 
 // own
 #include "diminactive.h"
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 
 // KConfigSkeleton
 #include "diminactiveconfig.h"

src/plugins/fallapart/fallapart.h

@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwinoffscreeneffect.h"
+#include "libkwineffects/offscreeneffect.h"
 
 namespace KWin
 {

src/plugins/glide/glide.h

@@ -13,7 +13,7 @@
 #pragma once
 
 // kwineffects
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "libkwineffects/timeline.h"
 
 namespace KWin

src/plugins/highlightwindow/highlightwindow.h

@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwinanimationeffect.h"
+#include "libkwineffects/animationeffect.h"
 
 namespace KWin
 {

src/plugins/invert/invert.h

@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwinoffscreeneffect.h"
+#include "libkwineffects/offscreeneffect.h"
 
 namespace KWin
 {

src/plugins/kdecorations/aurorae/src/aurorae.cpp

@@ -9,7 +9,7 @@
 
 #include "auroraeshared.h"
 #include "auroraetheme.h"
-#include "libkwineffects/kwinoffscreenquickview.h"
+#include "libkwineffects/offscreenquickview.h"
 // qml imports
 #include "decorationoptions.h"
 // KDecoration2

src/plugins/kscreen/kscreen.h

@@ -8,7 +8,7 @@
 */
 #pragma once
 
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 #include "libkwineffects/timeline.h"
 
 namespace KWin

src/plugins/magiclamp/magiclamp.h

@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwinoffscreeneffect.h"
+#include "libkwineffects/offscreeneffect.h"
 #include "libkwineffects/timeline.h"
 
 namespace KWin

src/plugins/magnifier/magnifier.h

@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include "libkwineffects/kwineffects.h"
+#include "libkwineffects/effects.h"
 
 namespace KWin
 {