Changeset 10817 for code/branches/cpp11_v2/src/orxonox/gamestates

Timestamp:

Nov 19, 2015, 11:40:28 AM (10 years ago)

Author:

muemart

Message:

Run clang-modernize -add-override
A few notes:

• There are probably some overrides missing, especially in funky templatey code
• Virtual methods with wrong signatures were not fixed, needs to be done by hand (only warnings get emitted)

Location:

code/branches/cpp11_v2/src/orxonox/gamestates

Files:

• GSClient.h (modified) (1 diff)
• GSGraphics.h (modified) (1 diff)
• GSLevel.h (modified) (1 diff)
• GSMainMenu.h (modified) (1 diff)
• GSMasterServer.h (modified) (1 diff)
• GSRoot.h (modified) (2 diffs)
• GSServer.h (modified) (1 diff)
• GSStandalone.h (modified) (1 diff)

code/branches/cpp11_v2/src/orxonox/gamestates/GSClient.h

@@ -43 +43 @@
         ~GSClient();
 
-        void activate();
-        void deactivate();
-        void update(const Clock& time);
+        void activate() override;
+        void deactivate() override;
+        void update(const Clock& time) override;
     };
 }

code/branches/cpp11_v2/src/orxonox/gamestates/GSGraphics.h

@@ -53 +53 @@
         ~GSGraphics();
 
-        void activate();
-        void deactivate();
-        void update(const Clock& time);
+        void activate() override;
+        void deactivate() override;
+        void update(const Clock& time) override;
 
     private:

code/branches/cpp11_v2/src/orxonox/gamestates/GSLevel.h

@@ -44 +44 @@
         ~GSLevel();
 
-        void activate();
-        void deactivate();
-        void update(const Clock& time);
+        void activate() override;
+        void deactivate() override;
+        void update(const Clock& time) override;
 
         static void startMainMenu(void); //!< Starts the MainMenu

code/branches/cpp11_v2/src/orxonox/gamestates/GSMainMenu.h

@@ -44 +44 @@
         ~GSMainMenu();
 
-        void activate();
-        void deactivate();
-        void update(const Clock& time);
+        void activate() override;
+        void deactivate() override;
+        void update(const Clock& time) override;
 
         void setConfigValues();

code/branches/cpp11_v2/src/orxonox/gamestates/GSMasterServer.h

@@ -45 +45 @@
       ~GSMasterServer();
 
-      void activate();
-      void deactivate();
-      void update(const Clock& time);
+      void activate() override;
+      void deactivate() override;
+      void update(const Clock& time) override;
 
     private:

code/branches/cpp11_v2/src/orxonox/gamestates/GSRoot.h

@@ -44 +44 @@
         static void printObjects();
 
-        void activate();
-        void deactivate();
-        void update(const Clock& time);
+        void activate() override;
+        void deactivate() override;
+        void update(const Clock& time) override;
 
         // this has to be public because proteced triggers a bug in msvc
@@ -59 +59 @@
 
     protected:
-        virtual void changedTimeFactor(float factor_new, float factor_old);
+        virtual void changedTimeFactor(float factor_new, float factor_old) override;
 
     private:

code/branches/cpp11_v2/src/orxonox/gamestates/GSServer.h

@@ -43 +43 @@
         ~GSServer();
 
-        void activate();
-        void deactivate();
-        void update(const Clock& time);
+        void activate() override;
+        void deactivate() override;
+        void update(const Clock& time) override;
 
     private:

code/branches/cpp11_v2/src/orxonox/gamestates/GSStandalone.h

@@ -41 +41 @@
         ~GSStandalone();
 
-        void activate();
-        void deactivate();
-        void update(const Clock& time);
+        void activate() override;
+        void deactivate() override;
+        void update(const Clock& time) override;
 
     private: