Changeset 10845 for code/branches/cpp11_v2/src/orxonox/sound

Timestamp:

Nov 23, 2015, 10:20:29 PM (9 years ago)

Author:

landauf

Message:

always use 'virtual' in the declaration of virtual functions even if they are inherited

Location:

code/branches/cpp11_v2/src/orxonox/sound

Files:

• AmbientSound.h (modified) (2 diffs)
• SoundManager.h (modified) (1 diff)
• WorldAmbientSound.h (modified) (1 diff)
• WorldSound.h (modified) (2 diffs)

code/branches/cpp11_v2/src/orxonox/sound/AmbientSound.h

@@ -50 +50 @@
         AmbientSound();
 
-        void play() override;
-        bool stop() override;
-        void pause() override;
+        virtual void play() override;
+        virtual bool stop() override;
+        virtual void pause() override;
 
         bool setAmbientSource(const std::string& source);
@@ -66 +66 @@
 
     private:
-        void preDestroy() override;
-        float getRealVolume() override;
-        bool moodChanged(const std::string& mood) override;
+        virtual void preDestroy() override;
+        virtual float getRealVolume() override;
+        virtual bool moodChanged(const std::string& mood) override;
         inline void ambientSourceChanged()
             { this->setAmbientSource(this->ambientSource_); }

code/branches/cpp11_v2/src/orxonox/sound/SoundManager.h

@@ -68 +68 @@
         ~SoundManager();
 
-        void preUpdate(const Clock& time) override;
-        void postUpdate(const Clock& time) override { /*no action*/ }
+        virtual void preUpdate(const Clock& time) override;
+        virtual void postUpdate(const Clock& time) override { /*no action*/ }
         void setConfigValues();
 

code/branches/cpp11_v2/src/orxonox/sound/WorldAmbientSound.h

@@ -50 +50 @@
             virtual ~WorldAmbientSound();
 
-            void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
-            void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             virtual void changedActivity() override;

code/branches/cpp11_v2/src/orxonox/sound/WorldSound.h

@@ -47 +47 @@
         WorldSound(Context* context);
 
-        void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
-        void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
-        void changedActivity() override;
+        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+        virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
+        virtual void changedActivity() override;
 
-        void tick(float dt) override;
+        virtual void tick(float dt) override;
 
     protected:
@@ -58 +58 @@
     private:
         void registerVariables();
-        void initialiseSource() override;
-        float getRealVolume() override;
+        virtual void initialiseSource() override;
+        virtual float getRealVolume() override;
     };
 }