Rename the scratchcppgui namespace to scratchcpprender

adazem009 · adazem009 · commit 006f1842b76d · 2023-12-26T20:55:55.000+01:00
diff --git a/src/irenderedtarget.h b/src/irenderedtarget.h
@@ -16,7 +16,7 @@ class Target;
 
 } // namespace libscratchcpp
 
-namespace scratchcppgui
+namespace scratchcpprender
 {
 
 class StageModel;
@@ -77,4 +77,4 @@ class IRenderedTarget : public QNanoQuickItem
         virtual const std::vector<QPointF> &hullPoints() const = 0;
 };
 
-} // namespace scratchcppgui
+} // namespace scratchcpprender
diff --git a/src/keyeventhandler.cpp b/src/keyeventhandler.cpp
@@ -4,7 +4,7 @@
 
 #include "keyeventhandler.h"
 
-using namespace scratchcppgui;
+using namespace scratchcpprender;
 
 KeyEventHandler::KeyEventHandler(QObject *parent) :
     QObject(parent)
diff --git a/src/keyeventhandler.h b/src/keyeventhandler.h
@@ -4,7 +4,7 @@
 
 #include <QObject>
 
-namespace scratchcppgui
+namespace scratchcpprender
 {
 
 class KeyEventHandler : public QObject
@@ -20,4 +20,4 @@ class KeyEventHandler : public QObject
         void keyReleased(Qt::Key key, const QString &text);
 };
 
-} // namespace scratchcppgui
+} // namespace scratchcpprender
diff --git a/src/mouseeventhandler.cpp b/src/mouseeventhandler.cpp
@@ -6,7 +6,7 @@
 #include "mouseeventhandler.h"
 #include "renderedtarget.h"
 
-using namespace scratchcppgui;
+using namespace scratchcpprender;
 
 MouseEventHandler::MouseEventHandler(QObject *parent) :
     QObject(parent)
diff --git a/src/mouseeventhandler.h b/src/mouseeventhandler.h
@@ -9,7 +9,7 @@ class QQuickItem;
 class QSinglePointEvent;
 class QHoverEvent;
 
-namespace scratchcppgui
+namespace scratchcpprender
 {
 
 class IRenderedTarget;
@@ -44,4 +44,4 @@ class MouseEventHandler : public QObject
         QQuickItem *m_spriteRepeater = nullptr;
 };
 
-} // namespace scratchcppgui
+} // namespace scratchcpprender
diff --git a/src/projectloader.cpp b/src/projectloader.cpp
@@ -9,7 +9,7 @@
 #include "spritemodel.h"
 #include "renderedtarget.h"
 
-using namespace scratchcppgui;
+using namespace scratchcpprender;
 using namespace libscratchcpp;
 
 void runEventLoop(IEngine *engine)
diff --git a/src/projectloader.h b/src/projectloader.h
@@ -9,7 +9,7 @@
 
 #include "stagemodel.h"
 
-namespace scratchcppgui
+namespace scratchcpprender
 {
 
 class SpriteModel;
@@ -126,4 +126,4 @@ class ProjectLoader : public QObject
         std::atomic<bool> m_stopLoading = false;
 };
 
-} // namespace scratchcppgui
+} // namespace scratchcpprender
diff --git a/src/projectscene.cpp b/src/projectscene.cpp
@@ -7,7 +7,7 @@
 #include "projectscene.h"
 #include "keyeventhandler.h"
 
-using namespace scratchcppgui;
+using namespace scratchcpprender;
 using namespace libscratchcpp;
 
 static const std::unordered_map<Qt::Key, KeyEvent::Type> SPECIAL_KEY_MAP = {
diff --git a/src/projectscene.h b/src/projectscene.h
@@ -9,7 +9,7 @@ namespace libscratchcpp
 class IEngine;
 }
 
-namespace scratchcppgui
+namespace scratchcpprender
 {
 
 class KeyEventHandler;
@@ -49,4 +49,4 @@ class ProjectScene : public QQuickItem
         KeyEventHandler *m_keyHandler = nullptr;
 };
 
-} // namespace scratchcppgui
+} // namespace scratchcpprender
diff --git a/src/renderedtarget.cpp b/src/renderedtarget.cpp
@@ -11,7 +11,7 @@
 #include "spritemodel.h"
 #include "scenemousearea.h"
 
-using namespace scratchcppgui;
+using namespace scratchcpprender;
 using namespace libscratchcpp;
 
 static const double SVG_SCALE_LIMIT = 0.1; // the maximum viewport dimensions are multiplied by this
diff --git a/src/renderedtarget.h b/src/renderedtarget.h
@@ -13,7 +13,7 @@ Q_MOC_INCLUDE("stagemodel.h");
 Q_MOC_INCLUDE("spritemodel.h");
 Q_MOC_INCLUDE("scenemousearea.h");
 
-namespace scratchcppgui
+namespace scratchcpprender
 {
 
 class RenderedTarget : public IRenderedTarget
@@ -130,4 +130,4 @@ class RenderedTarget : public IRenderedTarget
         double m_dragDeltaY = 0;
 };
 
-} // namespace scratchcppgui
+} // namespace scratchcpprender
diff --git a/src/scenemousearea.cpp b/src/scenemousearea.cpp
@@ -5,7 +5,7 @@
 #include "scenemousearea.h"
 #include "mouseeventhandler.h"
 
-using namespace scratchcppgui;
+using namespace scratchcpprender;
 
 SceneMouseArea::SceneMouseArea(QQuickItem *parent) :
     QQuickItem(parent)
diff --git a/src/scenemousearea.h b/src/scenemousearea.h
@@ -4,7 +4,7 @@
 
 #include <QQuickItem>
 
-namespace scratchcppgui
+namespace scratchcpprender
 {
 
 class IRenderedTarget;
@@ -41,4 +41,4 @@ class SceneMouseArea : public QQuickItem
         IRenderedTarget *m_draggedSprite = nullptr;
 };
 
-} // namespace scratchcppgui
+} // namespace scratchcpprender
diff --git a/src/spritemodel.cpp b/src/spritemodel.cpp
@@ -5,7 +5,7 @@
 #include "spritemodel.h"
 #include "renderedtarget.h"
 
-namespace scratchcppgui
+namespace scratchcpprender
 {
 
 SpriteModel::SpriteModel(QObject *parent) :
@@ -80,4 +80,4 @@ void SpriteModel::setRenderedTarget(IRenderedTarget *newRenderedTarget)
     emit renderedTargetChanged();
 }
 
-} // namespace scratchcppgui
+} // namespace scratchcpprender
diff --git a/src/spritemodel.h b/src/spritemodel.h
@@ -8,7 +8,7 @@
 
 Q_MOC_INCLUDE("renderedtarget.h");
 
-namespace scratchcppgui
+namespace scratchcpprender
 {
 
 class IRenderedTarget;
@@ -50,4 +50,4 @@ class SpriteModel
         IRenderedTarget *m_renderedTarget = nullptr;
 };
 
-} // namespace scratchcppgui
+} // namespace scratchcpprender
diff --git a/src/stagemodel.cpp b/src/stagemodel.cpp
@@ -5,7 +5,7 @@
 #include "stagemodel.h"
 #include "renderedtarget.h"
 
-using namespace scratchcppgui;
+using namespace scratchcpprender;
 
 StageModel::StageModel(QObject *parent) :
     QObject(parent)
diff --git a/src/stagemodel.h b/src/stagemodel.h
@@ -7,7 +7,7 @@
 
 Q_MOC_INCLUDE("renderedtarget.h");
 
-namespace scratchcppgui
+namespace scratchcpprender
 {
 
 class IRenderedTarget;
@@ -43,4 +43,4 @@ class StageModel
         IRenderedTarget *m_renderedTarget = nullptr;
 };
 
-} // namespace scratchcppgui
+} // namespace scratchcpprender
diff --git a/src/targetpainter.cpp b/src/targetpainter.cpp
@@ -7,7 +7,7 @@
 #include "irenderedtarget.h"
 #include "spritemodel.h"
 
-using namespace scratchcppgui;
+using namespace scratchcpprender;
 
 TargetPainter::TargetPainter()
 {
diff --git a/src/targetpainter.h b/src/targetpainter.h
@@ -4,7 +4,7 @@
 
 #include <qnanoquickitempainter.h>
 
-namespace scratchcppgui
+namespace scratchcpprender
 {
 
 class IRenderedTarget;
@@ -22,4 +22,4 @@ class TargetPainter : public QNanoQuickItemPainter
         IRenderedTarget *m_target = nullptr;
 };
 
-} // namespace scratchcppgui
+} // namespace scratchcpprender
diff --git a/test/keyeventhandler/keyeventhandler_test.cpp b/test/keyeventhandler/keyeventhandler_test.cpp
@@ -4,7 +4,7 @@
 
 #include "../common.h"
 
-using namespace scratchcppgui;
+using namespace scratchcpprender;
 
 TEST(KeyEventHandlerTest, EventFilter)
 {
diff --git a/test/mocks/enginemock.h b/test/mocks/enginemock.h
@@ -5,7 +5,7 @@
 
 using namespace libscratchcpp;
 
-namespace scratchcppgui
+namespace scratchcpprender
 {
 
 using ScriptMap = std::unordered_map<std::shared_ptr<Block>, std::shared_ptr<Script>>;
@@ -112,4 +112,4 @@ class EngineMock : public IEngine
         MOCK_METHOD(const ScriptMap &, scripts, (), (const, override));
 };
 
-} // namespace scratchcppgui
+} // namespace scratchcpprender
diff --git a/test/mocks/renderedtargetmock.h b/test/mocks/renderedtargetmock.h
@@ -4,9 +4,9 @@
 #include <qnanoquickitem.h>
 #include <gmock/gmock.h>
 
-using namespace scratchcppgui;
+using namespace scratchcpprender;
 
-namespace scratchcppgui
+namespace scratchcpprender
 {
 
 class RenderedTargetMock : public IRenderedTarget
@@ -65,4 +65,4 @@ class RenderedTargetMock : public IRenderedTarget
         MOCK_METHOD(void, mouseReleaseEvent, (QMouseEvent *), (override));
 };
 
-} // namespace scratchcppgui
+} // namespace scratchcpprender
diff --git a/test/mouseeventhandler/fakerepeater.cpp b/test/mouseeventhandler/fakerepeater.cpp
@@ -1,6 +1,6 @@
 #include "fakerepeater.h"
 
-using namespace scratchcppgui;
+using namespace scratchcpprender;
 
 FakeRepeater::FakeRepeater(QQuickItem *parent) :
     QQuickItem(parent)
diff --git a/test/mouseeventhandler/fakerepeater.h b/test/mouseeventhandler/fakerepeater.h
@@ -2,7 +2,7 @@
 
 #include <QQuickItem>
 
-namespace scratchcppgui
+namespace scratchcpprender
 {
 
 class FakeRepeater : public QQuickItem
@@ -18,4 +18,4 @@ class FakeRepeater : public QQuickItem
         std::vector<QQuickItem *> items;
 };
 
-} // namespace scratchcppgui
+} // namespace scratchcpprender
diff --git a/test/mouseeventhandler/mouseeventhandler_test.cpp b/test/mouseeventhandler/mouseeventhandler_test.cpp
@@ -6,7 +6,7 @@
 #include "../common.h"
 #include "fakerepeater.h"
 
-using namespace scratchcppgui;
+using namespace scratchcpprender;
 using namespace libscratchcpp;
 
 using ::testing::Return;
diff --git a/test/projectloader/projectloader_test.cpp b/test/projectloader/projectloader_test.cpp
@@ -5,7 +5,7 @@
 
 #include "../common.h"
 
-using namespace scratchcppgui;
+using namespace scratchcpprender;
 using namespace libscratchcpp;
 
 using ::testing::Return;
diff --git a/test/projectscene/projectscene_test.cpp b/test/projectscene/projectscene_test.cpp
@@ -4,7 +4,7 @@
 
 #include "../common.h"
 
-using namespace scratchcppgui;
+using namespace scratchcpprender;
 
 using ::testing::Return;
 
diff --git a/test/renderedtarget/renderedtarget_test.cpp b/test/renderedtarget/renderedtarget_test.cpp
@@ -13,7 +13,7 @@
 
 #include "../common.h"
 
-using namespace scratchcppgui;
+using namespace scratchcpprender;
 using namespace libscratchcpp;
 
 using ::testing::Return;
diff --git a/test/scenemousearea/scenemousearea_test.cpp b/test/scenemousearea/scenemousearea_test.cpp
@@ -4,7 +4,7 @@
 
 #include "../common.h"
 
-using namespace scratchcppgui;
+using namespace scratchcpprender;
 
 TEST(SceneMouseAreaTest, Constructors)
 {
diff --git a/test/target_models/spritemodel_test.cpp b/test/target_models/spritemodel_test.cpp
@@ -5,7 +5,7 @@
 
 #include "../common.h"
 
-using namespace scratchcppgui;
+using namespace scratchcpprender;
 using namespace libscratchcpp;
 
 TEST(SpriteModelTest, Constructors)
diff --git a/test/target_models/stagemodel_test.cpp b/test/target_models/stagemodel_test.cpp
@@ -5,7 +5,7 @@
 
 #include "../common.h"
 
-using namespace scratchcppgui;
+using namespace scratchcpprender;
 using namespace libscratchcpp;
 
 TEST(StageModelTest, Constructors)
diff --git a/test/targetpainter/targetpainter_test.cpp b/test/targetpainter/targetpainter_test.cpp
@@ -3,7 +3,7 @@
 
 #include "../common.h"
 
-using namespace scratchcppgui;
+using namespace scratchcpprender;
 
 using ::testing::Return;
 using ::testing::ReturnRef;

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace libscratchcpp`
`9`	`9`	`class IEngine;`
`10`	`10`	`}`
`11`	`11`
`12`		`-namespace scratchcppgui`
	`12`	`+namespace scratchcpprender`
`13`	`13`	`{`
`14`	`14`
`15`	`15`	`class KeyEventHandler;`
`@@ -49,4 +49,4 @@ class ProjectScene : public QQuickItem`
`49`	`49`	`KeyEventHandler *m_keyHandler = nullptr;`
`50`	`50`	`};`
`51`	`51`
`52`		`-} // namespace scratchcppgui`
	`52`	`+} // namespace scratchcpprender`