From db21849b9e7182ea9b7354274b914f69c2a48cb3 Mon Sep 17 00:00:00 2001
From: Joshua Goins <josh@redstrate.com>
Date: Sat, 20 Jul 2024 14:51:12 -0400
Subject: [PATCH] Move out of KWin namespace

---
 src/catpaw.cpp         |  8 +-------
 src/catpaw.h           | 12 ++++--------
 src/catpaw_config.cpp  |  2 +-
 src/catpawconfig.kcfgc |  1 -
 src/main.cpp           |  5 -----
 5 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/src/catpaw.cpp b/src/catpaw.cpp
index 3f5aa60..98a2518 100644
--- a/src/catpaw.cpp
+++ b/src/catpaw.cpp
@@ -11,14 +11,10 @@
 #include "core/renderviewport.h"
 #include "effect/effecthandler.h"
 
-#include <QPainter>
-#include <QTabletEvent>
-
 #include <cmath>
 #include <opengl/openglcontext.h>
 
-namespace KWin
-{
+using namespace KWin;
 
 CatPawEffect::CatPawEffect()
 {
@@ -186,6 +182,4 @@ QColor CatPawEffect::kittyColor() const
     return m_kittyColor;
 }
 
-} // namespace
-
 #include "moc_catpaw.cpp"
diff --git a/src/catpaw.h b/src/catpaw.h
index 8d4d29a..362aa29 100644
--- a/src/catpaw.h
+++ b/src/catpaw.h
@@ -11,17 +11,15 @@
 
 #include <KLocalizedString>
 
-namespace KWin
-{
-
-class CatPawEffect : public Effect
+class CatPawEffect : public KWin::Effect
 {
     Q_OBJECT
 public:
     CatPawEffect();
     ~CatPawEffect() override;
     void reconfigure(ReconfigureFlags) override;
-    void paintScreen(const RenderTarget &renderTarget, const RenderViewport &viewport, int mask, const QRegion &region, Output *screen) override;
+    void
+    paintScreen(const KWin::RenderTarget &renderTarget, const KWin::RenderViewport &viewport, int mask, const QRegion &region, KWin::Output *screen) override;
     void postPaintScreen() override;
 
     // for properties
@@ -37,11 +35,9 @@ private Q_SLOTS:
 
 private:
     void repaint();
-    void drawKitty(const RenderTarget &renderTarget, const RenderViewport &viewport);
+    void drawKitty(const KWin::RenderTarget &renderTarget, const KWin::RenderViewport &viewport);
 
     QColor m_kittyColor;
     QPointF m_cursorPos;
     bool m_pressed = false;
 };
-
-} // namespace
diff --git a/src/catpaw_config.cpp b/src/catpaw_config.cpp
index b290271..dc7a65b 100644
--- a/src/catpaw_config.cpp
+++ b/src/catpaw_config.cpp
@@ -18,7 +18,7 @@ CatPawEffectConfig::CatPawEffectConfig(QObject *parent, const KPluginMetaData &d
 {
     m_ui.setupUi(widget());
 
-    addConfig(KWin::CatPawConfig::self(), widget());
+    addConfig(CatPawConfig::self(), widget());
 }
 
 void CatPawEffectConfig::save()
diff --git a/src/catpawconfig.kcfgc b/src/catpawconfig.kcfgc
index 2f3275a..838c750 100644
--- a/src/catpawconfig.kcfgc
+++ b/src/catpawconfig.kcfgc
@@ -1,5 +1,4 @@
 File=catpaw.kcfg
 ClassName=CatPawConfig
-NameSpace=KWin
 Singleton=true
 Mutators=true
diff --git a/src/main.cpp b/src/main.cpp
index 35af0ae..605f6d9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6,11 +6,6 @@
 
 #include "catpaw.h"
 
-namespace KWin
-{
-
 KWIN_EFFECT_FACTORY(CatPawEffect, "metadata.json")
 
-} // namespace KWin
-
 #include "main.moc"