Changed 'virtual' function override declarations to 'override' in automated-tests.

Change-Id: I36e68de23820a1d796a07c084643514b1439fc9c
Signed-off-by: György Straub <g.straub@partner.samsung.com>

diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gl-context-helper-abstraction.h b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gl-context-helper-abstraction.h
index ce150d15197b9db2a5533a5137116839cea19dca..4c297576abd158f13f484a9b07404404f59c4b6d 100644 (file)
--- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gl-context-helper-abstraction.h
+++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gl-context-helper-abstraction.h
@@ -43,17 +43,18 @@ public:
   /**
    * @brief Switch to the surfaceless GL context
    */
-  virtual void MakeSurfacelessContextCurrent() {};
+  void MakeSurfacelessContextCurrent() override {};
 
   /**
    * @brief Clear the GL context
    */
-  virtual void MakeContextNull() {};
+  void MakeContextNull() override {};
 
   /**
    * @brief Wait until all GL rendering calls for the current GL context are executed
    */
-  virtual void WaitClient() {};
+  void WaitClient() override {};
+
 private:
 
   TestGlContextHelperAbstraction( const TestGlContextHelperAbstraction& ); ///< Undefined

diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gl-sync-abstraction.h b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gl-sync-abstraction.h
index 775d2091676b5cbefbff7871a1fde9b715c331eb..1990b9ced1b5d09a5a35196c379ee650c850f701 100644 (file)
--- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gl-sync-abstraction.h
+++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gl-sync-abstraction.h
@@ -66,13 +66,13 @@ public:
    * Create a sync object
    * @return the sync object
    */
-  virtual Integration::GlSyncAbstraction::SyncObject* CreateSyncObject( );
+  Integration::GlSyncAbstraction::SyncObject* CreateSyncObject( ) override;
 
   /**
    * Destroy a sync object
    * @param[in] syncObject The object to destroy
    */
-  virtual void DestroySyncObject( Integration::GlSyncAbstraction::SyncObject* syncObject );
+  void DestroySyncObject( Integration::GlSyncAbstraction::SyncObject* syncObject ) override;
 
 
 public: // TEST FUNCTIONS

diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-platform-abstraction.h b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-platform-abstraction.h
index 7c1b0108bc27171141e8da732f0fd1e5d6cd60c3..bb62c262a3db9048439189584d8eb1ef371231c3 100644 (file)
--- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-platform-abstraction.h
+++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-platform-abstraction.h
@@ -72,17 +72,17 @@ public:
   /**
    * @copydoc PlatformAbstraction::LoadResourceSynchronously()
    */
-  virtual Integration::ResourcePointer LoadImageSynchronously( const Integration::BitmapResourceType& resourceType, const std::string& resourcePath );
+  Integration::ResourcePointer LoadImageSynchronously( const Integration::BitmapResourceType& resourceType, const std::string& resourcePath ) override;
 
   /**
    * @copydoc PlatformAbstraction::DecodeBuffer()
    */
-  virtual Integration::BitmapPtr DecodeBuffer( const Dali::Integration::BitmapResourceType& resourceType, uint8_t * buffer, size_t size );
+  Integration::BitmapPtr DecodeBuffer( const Dali::Integration::BitmapResourceType& resourceType, uint8_t * buffer, size_t size ) override;
 
   /**
    * @copydoc PlatformAbstraction::LoadShaderBinaryFile()
    */
-  virtual bool LoadShaderBinaryFile( const std::string& filename, Dali::Vector< unsigned char >& buffer ) const;
+  bool LoadShaderBinaryFile( const std::string& filename, Dali::Vector< unsigned char >& buffer ) const override;
 
   /**
    * @copydoc PlatformAbstraction::SaveShaderBinaryFile()
@@ -92,12 +92,12 @@ public:
   /**
    * @copydoc PlatformAbstraction::StartTimer()
    */
-  virtual uint32_t StartTimer( uint32_t milliseconds, CallbackBase* callback );
+  uint32_t StartTimer( uint32_t milliseconds, CallbackBase* callback ) override;
 
   /*
    * @copydoc PlatformAbstraction::CancelTimer()
    */
-  virtual void CancelTimer ( uint32_t timerId );
+  void CancelTimer ( uint32_t timerId ) override;
 
 public: // TEST FUNCTIONS
 

diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-render-controller.h b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-render-controller.h
index d44e7b68463cd499e3416b42ff95b4b1249fd86a..74f0f5e67638f1f24185358b746b0c6b44402df2 100644 (file)
--- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-render-controller.h
+++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-render-controller.h
@@ -31,8 +31,8 @@ public:
   TestRenderController();
   ~TestRenderController();
 
-  virtual void RequestUpdate( bool forceUpdate );
-  virtual void RequestProcessEventsOnIdle( bool forceProcess );
+  void RequestUpdate( bool forceUpdate ) override;
+  void RequestProcessEventsOnIdle( bool forceProcess ) override;
 
   typedef enum
   {