fix warnings

lisu188 · Oct 14, 2024 · ba263cc · ba263cc
1 parent 31b0762
commit ba263cc
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 34 deletions.
diff --git a/src/gui/object/CProxyGraphicsObject.cpp b/src/gui/object/CProxyGraphicsObject.cpp
@@ -27,10 +27,6 @@ CProxyGraphicsObject::CProxyGraphicsObject(int x, int y) : x(x), y(y) {
 
 }
 
-void CProxyGraphicsObject::render(std::shared_ptr<CGui> gui, int frameTime) {
-    CGameGraphicsObject::render(gui, frameTime);
-}
-
 void CProxyGraphicsObject::refresh() {
     vstd::with<void>(getGui(), [this](auto gui) {
         std::list<std::shared_ptr<CGameGraphicsObject>> objects = vstd::cast<CProxyTargetGraphicsObject>(
@@ -43,7 +39,3 @@ void CProxyGraphicsObject::refresh() {
         }
     });
 }
-
-bool CProxyGraphicsObject::event(std::shared_ptr<CGui> gui, SDL_Event *event) {
-    return CGameGraphicsObject::event(gui, event);
-}
diff --git a/src/gui/object/CProxyGraphicsObject.h b/src/gui/object/CProxyGraphicsObject.h
@@ -28,10 +28,6 @@ V_META(CProxyGraphicsObject, CGameGraphicsObject,
        V_PROPERTY(CProxyGraphicsObject, int, y, getY, setY)
 )
 
-    void render(std::shared_ptr<CGui> reneder, int frameTime) override;
-
-    bool event(std::shared_ptr<CGui> gui, SDL_Event *event) override;
-
 private:
     int x, y;
 

diff --git a/src/gui/object/CProxyTargetGraphicsObject.cpp b/src/gui/object/CProxyTargetGraphicsObject.cpp
@@ -22,9 +22,6 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include "gui/CLayout.h"
 #include "gui/CGui.h"
 
-void CProxyTargetGraphicsObject::render(std::shared_ptr<CGui> gui, int frameTime) {
-    CGameGraphicsObject::render(gui, frameTime);
-}
 
 void CProxyTargetGraphicsObject::refresh() {
     vstd::with<void>(getGui(), [this](auto gui) {
@@ -75,7 +72,7 @@ void CProxyTargetGraphicsObject::refresh() {
 void CProxyTargetGraphicsObject::addProxyObject(auto gui, int &x, int &y) {
     std::shared_ptr<CProxyGraphicsObject> nh = std::make_shared<CProxyGraphicsObject>(x, y);
     std::shared_ptr<CLayout> layout1 = gui->getGame()->template createObject<CLayout>(
-            proxyLayout);
+        proxyLayout);
     layout1->setNumericProperty("tileSize", getTileSize(this->ptr<CGameGraphicsObject>()));
     nh->setLayout(layout1);
     proxyObjects[x][y] = nh;
@@ -106,11 +103,6 @@ void CProxyTargetGraphicsObject::refreshObject(int x, int y) {
     }
 }
 
-bool CProxyTargetGraphicsObject::event(std::shared_ptr<CGui> gui, SDL_Event *event) {
-    return CGameGraphicsObject::event(gui, event);
-}
-
-
 int CProxyTargetGraphicsObject::getSizeX(std::shared_ptr<CGui> gui) {
     return 0;
 }
@@ -119,7 +111,7 @@ int CProxyTargetGraphicsObject::getSizeY(std::shared_ptr<CGui> gui) {
     return 0;
 }
 
-std::list<std::shared_ptr<CGameGraphicsObject>>
+std::list<std::shared_ptr<CGameGraphicsObject> >
 CProxyTargetGraphicsObject::getProxiedObjects(std::shared_ptr<CGui> gui, int x, int y) {
     return {};
 }

diff --git a/src/gui/object/CProxyTargetGraphicsObject.h b/src/gui/object/CProxyTargetGraphicsObject.h
@@ -22,16 +22,12 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 class CProxyGraphicsObject;
 
 class CProxyTargetGraphicsObject : public CGameGraphicsObject {
-V_META(CProxyTargetGraphicsObject, CGameGraphicsObject,
-       V_METHOD(CProxyTargetGraphicsObject, refresh),
-       V_METHOD(CProxyTargetGraphicsObject, refreshAll),
-       V_PROPERTY(CProxyTargetGraphicsObject, std::string, proxyLayout, getProxyLayout, setProxyLayout))
+    V_META(CProxyTargetGraphicsObject, CGameGraphicsObject,
+           V_METHOD(CProxyTargetGraphicsObject, refresh),
+           V_METHOD(CProxyTargetGraphicsObject, refreshAll),
+           V_PROPERTY(CProxyTargetGraphicsObject, std::string, proxyLayout, getProxyLayout, setProxyLayout))
 public:
-    void render(std::shared_ptr<CGui> reneder, int frameTime) override;
-
-    bool event(std::shared_ptr<CGui> gui, SDL_Event *event) override;
-
-    virtual std::list<std::shared_ptr<CGameGraphicsObject>>
+    virtual std::list<std::shared_ptr<CGameGraphicsObject> >
     getProxiedObjects(std::shared_ptr<CGui> gui, int x, int y);
 
     virtual int getSizeX(std::shared_ptr<CGui> gui);
@@ -41,10 +37,9 @@ V_META(CProxyTargetGraphicsObject, CGameGraphicsObject,
     CProxyTargetGraphicsObject() = default;
 
 private:
-    std::map<int, std::map<int, std::shared_ptr<CProxyGraphicsObject>>> proxyObjects;
+    std::map<int, std::map<int, std::shared_ptr<CProxyGraphicsObject> > > proxyObjects;
     std::string proxyLayout = "CProxyGraphicsLayout";
 
-
 public:
     std::string getProxyLayout();
 
@@ -59,4 +54,4 @@ V_META(CProxyTargetGraphicsObject, CGameGraphicsObject,
     void addProxyObject(auto gui, int &x, int &y);
 
     void removeProxyObject(int &x, int &y);
-};
+};