overrideを明示

MihailJP · Oct 24, 2020 · 515dd1a · 515dd1a
1 parent c499635
commit 515dd1a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/graphic/scenes/table.h b/graphic/scenes/table.h
@@ -77,13 +77,13 @@ class GameTableScreen : public TableProtoScene {
 	GameTableScreen(const GameTableScreen&) = delete; // Delete unexpected copy constructor
 	GameTableScreen& operator= (const GameTableScreen&) = delete; // Delete unexpected assign operator
 	~GameTableScreen();
-	void Render();
+	void Render() override;
 #ifdef _WIN32
-	void KeyboardInput(LPDIDEVICEOBJECTDATA od);
-	void MouseInput(LPDIDEVICEOBJECTDATA od, int X, int Y);
+	void KeyboardInput(LPDIDEVICEOBJECTDATA od) override;
+	void MouseInput(LPDIDEVICEOBJECTDATA od, int X, int Y) override;
 #else /*_WIN32*/
-	void KeyboardInput(const XEvent* od);
-	void MouseInput(const XEvent* od, int X, int Y);
+	void KeyboardInput(const XEvent* od) override;
+	void MouseInput(const XEvent* od, int X, int Y) override;
 #endif /*_WIN32*/
 private:
 	void checkTimeout();

diff --git a/graphic/scenes/waiting.h b/graphic/scenes/waiting.h
@@ -25,43 +25,43 @@ class ConnectionWaitingProto : public SystemScreen {
 class ServerWait : public ConnectionWaitingProto {
 private:
 	ServerWaitingSubsceneID subsceneID;
-	CodeConv::tstring waiting_desc_str();
+	CodeConv::tstring waiting_desc_str() override;
 public:
 	ServerWait(ScreenManipulator* const manipulator);
 	ServerWait(const ServerWait&) = delete; // Delete unexpected copy constructor
 	ServerWait& operator= (const ServerWait&) = delete; // Delete unexpected assign operator
 	~ServerWait();
-	void Render();
+	void Render() override;
 #ifdef _WIN32
-	void KeyboardInput(LPDIDEVICEOBJECTDATA od);
+	void KeyboardInput(LPDIDEVICEOBJECTDATA od) override;
 #else /*_WIN32*/
-	void KeyboardInput(const XEvent* od);
+	void KeyboardInput(const XEvent* od) override;
 #endif /*_WIN32*/
 	void SetSubscene(SubSceneID scene_ID) override;
 };
 
 class ClientWait : public ConnectionWaitingProto {
 private:
 	ClientWaitingSubsceneID subsceneID;
-	CodeConv::tstring waiting_desc_str();
+	CodeConv::tstring waiting_desc_str() override;
 public:
 	ClientWait(ScreenManipulator* const manipulator);
 	ClientWait(const ClientWait&) = delete; // Delete unexpected copy constructor
 	ClientWait& operator= (const ClientWait&) = delete; // Delete unexpected assign operator
 	~ClientWait();
-	void Render();
+	void Render() override;
 	void SetSubscene(SubSceneID scene_ID) override;
 };
 
 class ConnectionWaitFailed : public ConnectionWaitingProto {
 private:
-	CodeConv::tstring waiting_desc_str();
+	CodeConv::tstring waiting_desc_str() override;
 public:
 	ConnectionWaitFailed(ScreenManipulator* const manipulator);
 	ConnectionWaitFailed(const ConnectionWaitFailed&) = delete; // Delete unexpected copy constructor
 	ConnectionWaitFailed& operator= (const ConnectionWaitFailed&) = delete; // Delete unexpected assign operator
 	~ConnectionWaitFailed();
-	void Render();
+	void Render() override;
 };
 
 }