From 44aa2d06cbc3a9575a62ef7390cbb5f8c2f2d258 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Gy=C3=B6rgy=20Straub?= Date: Fri, 4 Sep 2020 16:47:20 +0100 Subject: [PATCH 1/1] Changed 'virtual' function override declarations to 'override' in automated-tests. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: I36e68de23820a1d796a07c084643514b1439fc9c Signed-off-by: György Straub --- .../dali-test-suite-utils/test-gl-context-helper-abstraction.h | 7 ++++--- .../dali-test-suite-utils/test-gl-sync-abstraction.h | 4 ++-- .../dali-test-suite-utils/test-platform-abstraction.h | 10 +++++----- .../dali-test-suite-utils/test-render-controller.h | 4 ++-- 4 files changed, 13 insertions(+), 12 deletions(-) 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 ce150d1..4c29757 100644 --- 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 775d209..1990b9c 100644 --- 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 7c1b010..bb62c26 100644 --- 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 d44e7b6..74f0f5e 100644 --- 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 { -- 2.7.4