Overriding virtual destructors are marked as 'override'.

- so are functions missed from If046270d3b6036f8566a9c48e4064425c1498daa;
- affected files that were the wrong mode have that fixed too (-x);

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

diff --git a/dali-toolkit/internal/builder/builder-impl.h b/dali-toolkit/internal/builder/builder-impl.h
index 0a76c7b..049b3ce 100644 (file)
--- a/dali-toolkit/internal/builder/builder-impl.h
+++ b/dali-toolkit/internal/builder/builder-impl.h
@@ -230,7 +230,7 @@ public:
 
 protected:
 
-  virtual ~Builder();
+  ~Builder() override;
 
 private:
   typedef std::vector<const char*> KeyStack;

diff --git a/dali-toolkit/internal/builder/json-parser-impl.h b/dali-toolkit/internal/builder/json-parser-impl.h
index 21992e9..f635a82 100644 (file)
--- a/dali-toolkit/internal/builder/json-parser-impl.h
+++ b/dali-toolkit/internal/builder/json-parser-impl.h
@@ -57,7 +57,7 @@ public:
 
   /*
    */
-  ~JsonParser();
+  ~JsonParser() override;
 
   /*
    * @copydoc Toolkit::JsonParser::Parse()

diff --git a/dali-toolkit/internal/builder/style.h b/dali-toolkit/internal/builder/style.h
index 441f568..0265ff6 100644 (file)
--- a/dali-toolkit/internal/builder/style.h
+++ b/dali-toolkit/internal/builder/style.h
@@ -108,7 +108,7 @@ protected:
   /**
    * @brief virtual destructor.
    */
-  virtual ~Style();
+  ~Style() override;
 
 private:
   // Not implemented

diff --git a/dali-toolkit/internal/image-loader/async-image-loader-impl.h b/dali-toolkit/internal/image-loader/async-image-loader-impl.h
index e49b146..4ffda6c 100644 (file)
--- a/dali-toolkit/internal/image-loader/async-image-loader-impl.h
+++ b/dali-toolkit/internal/image-loader/async-image-loader-impl.h
@@ -110,7 +110,7 @@ protected:
   /**
    * Destructor
    */
-  ~AsyncImageLoader();
+  ~AsyncImageLoader() override;
 
 private:
   Toolkit::AsyncImageLoader::ImageLoadedSignalType mLoadedSignal;

diff --git a/dali-toolkit/internal/image-loader/image-load-thread.h b/dali-toolkit/internal/image-loader/image-load-thread.h
index 27c8850..c7d5d06 100644 (file)
--- a/dali-toolkit/internal/image-loader/image-load-thread.h
+++ b/dali-toolkit/internal/image-loader/image-load-thread.h
@@ -149,7 +149,7 @@ public:
   /**
    * Destructor.
    */
-  virtual ~ImageLoadThread();
+  ~ImageLoadThread() override;
 
   /**
    * Add a task in to the loading queue

diff --git a/dali-toolkit/internal/visuals/animated-image/animated-image-visual.h b/dali-toolkit/internal/visuals/animated-image/animated-image-visual.h
old mode 100755 (executable)
new mode 100644 (file)
index 70419d0..8e91623
--- a/dali-toolkit/internal/visuals/animated-image/animated-image-visual.h
+++ b/dali-toolkit/internal/visuals/animated-image/animated-image-visual.h
@@ -154,7 +154,7 @@ protected:
   /**
    * @brief A reference counted object may only be deleted by calling Unreference().
    */
-  virtual ~AnimatedImageVisual();
+  ~AnimatedImageVisual() override;
 
   /**
    * @copydoc Visual::Base::DoSetProperties
@@ -216,7 +216,7 @@ private:
    * Called when the next frame is ready.
    * @param[in] textureSet the texture set to apply
    */
-  void FrameReady( TextureSet textureSet );
+  void FrameReady( TextureSet textureSet ) override;
 
   /**
    * Display the next frame. It is called when the mFrameDelayTimer ticks.

diff --git a/dali-toolkit/internal/visuals/animated-image/fixed-image-cache.h b/dali-toolkit/internal/visuals/animated-image/fixed-image-cache.h
index 5063232..ec7f419 100644 (file)
--- a/dali-toolkit/internal/visuals/animated-image/fixed-image-cache.h
+++ b/dali-toolkit/internal/visuals/animated-image/fixed-image-cache.h
@@ -46,7 +46,7 @@ public:
                    ImageCache::FrameReadyObserver& observer,
                    unsigned int                    batchSize );
 
-  virtual ~FixedImageCache();
+  ~FixedImageCache() override;
 
   /**
    * Get the Nth frame. If it's not ready, this will trigger the

diff --git a/dali-toolkit/internal/visuals/animated-image/rolling-animated-image-cache.h b/dali-toolkit/internal/visuals/animated-image/rolling-animated-image-cache.h
index 8281c32..3a24eb6 100644 (file)
--- a/dali-toolkit/internal/visuals/animated-image/rolling-animated-image-cache.h
+++ b/dali-toolkit/internal/visuals/animated-image/rolling-animated-image-cache.h
@@ -64,7 +64,7 @@ public:
   /**
    * Destructor
    */
-  virtual ~RollingAnimatedImageCache();
+  ~RollingAnimatedImageCache() override;
 
   /**
    * Get the Nth frame. If it's not ready, this will trigger the

diff --git a/dali-toolkit/internal/visuals/animated-image/rolling-image-cache.h b/dali-toolkit/internal/visuals/animated-image/rolling-image-cache.h
index f57b5c2..5f4aa46 100644 (file)
--- a/dali-toolkit/internal/visuals/animated-image/rolling-image-cache.h
+++ b/dali-toolkit/internal/visuals/animated-image/rolling-image-cache.h
@@ -57,7 +57,7 @@ public:
   /**
    * Destructor
    */
-  virtual ~RollingImageCache();
+  ~RollingImageCache() override;
 
   /**
    * Get the Nth frame. If it's not ready, this will trigger the

diff --git a/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h b/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h
index e7ba945..e09527a 100644 (file)
--- a/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h
+++ b/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h
@@ -111,7 +111,7 @@ protected:
   /**
    * @brief A reference counted object may only be deleted by calling Unreference().
    */
-  virtual ~AnimatedVectorImageVisual();
+  ~AnimatedVectorImageVisual() override;
 
   /**
    * @copydoc Visual::Base::DoSetProperties

diff --git a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-manager.h b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-manager.h
index 2b36c7d..510c07e 100644 (file)
--- a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-manager.h
+++ b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-manager.h
@@ -52,7 +52,7 @@ public:
   /**
    * @brief Destructor.
    */
-  virtual ~VectorAnimationManager();
+  ~VectorAnimationManager() override;
 
   /**
    * Get the vector animation thread.

diff --git a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.h b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.h
index 844d378..e9c6902 100644 (file)
--- a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.h
+++ b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.h
@@ -119,7 +119,7 @@ public:
   /**
    * @brief Destructor.
    */
-  virtual ~VectorAnimationTask();
+  ~VectorAnimationTask() override;
 
   /**
    * @brief Finalizes the task.

diff --git a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-thread.h b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-thread.h
old mode 100755 (executable)
new mode 100644 (file)
index 964f662..b6cce85
--- a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-thread.h
+++ b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-thread.h
@@ -53,7 +53,7 @@ public:
   /**
    * @brief Destructor.
    */
-  virtual ~VectorAnimationThread();
+  ~VectorAnimationThread() override;
 
   /**
    * Add a animation task into the vector animation thread, called by main thread.
@@ -143,7 +143,7 @@ private:
     /**
      * @brief Destructor.
      */
-    virtual ~SleepThread();
+    ~SleepThread() override;
 
     /**
      * @brief Sleeps untile the specified time point.

diff --git a/dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.h b/dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.h
index e24a918..6315d4d 100644 (file)
--- a/dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.h
+++ b/dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.h
@@ -51,7 +51,7 @@ public:
   /**
    * @brief Destructor.
    */
-  virtual ~VectorRasterizeThread();
+  ~VectorRasterizeThread() override;
 
   /**
    * The callback is called from the rasterize thread after the rasterization is completed.

diff --git a/dali-toolkit/internal/visuals/image-atlas-manager.h b/dali-toolkit/internal/visuals/image-atlas-manager.h
index 05ed3a5..45e2a54 100644 (file)
--- a/dali-toolkit/internal/visuals/image-atlas-manager.h
+++ b/dali-toolkit/internal/visuals/image-atlas-manager.h
@@ -120,7 +120,7 @@ protected:
   /**
    * Destructor
    */
-  virtual ~ImageAtlasManager();
+  ~ImageAtlasManager() override;
 
   /**
    * Undefined copy constructor.

diff --git a/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.h b/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.h
index e01020e..11fa03f 100644 (file)
--- a/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.h
+++ b/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.h
@@ -74,7 +74,7 @@ public:
   /**
    * Destructor.
    */
-  ~RasterizingTask();
+  ~RasterizingTask() override;
 
   /**
    * Do the rasterization with the mRasterizer.
@@ -193,7 +193,7 @@ protected:
   /**
    * Destructor.
    */
-  virtual ~SvgRasterizeThread();
+  ~SvgRasterizeThread() override;
 
 
   /**

diff --git a/dali-toolkit/internal/visuals/texture-manager-impl.h b/dali-toolkit/internal/visuals/texture-manager-impl.h
index 2ad0225..f8500c7 100644 (file)
--- a/dali-toolkit/internal/visuals/texture-manager-impl.h
+++ b/dali-toolkit/internal/visuals/texture-manager-impl.h
@@ -160,7 +160,7 @@ public:
   /**
    * Destructor.
    */
-  ~TextureManager();
+  ~TextureManager() override;
 
   // TextureManager Main API:
 

diff --git a/dali-toolkit/internal/visuals/transition-data-impl.h b/dali-toolkit/internal/visuals/transition-data-impl.h
index 9ca8193..0ecf0a4 100644 (file)
--- a/dali-toolkit/internal/visuals/transition-data-impl.h
+++ b/dali-toolkit/internal/visuals/transition-data-impl.h
@@ -136,7 +136,7 @@ protected:
   /**
    *  A ref counted object may only be deleted by calling Unreference
    */
-  virtual ~TransitionData();
+  ~TransitionData() override;
 
 private: // Unimplemented methods
   TransitionData( const TransitionData& );

diff --git a/dali-toolkit/internal/visuals/visual-base-impl.h b/dali-toolkit/internal/visuals/visual-base-impl.h
index 058d683..d9ff2dd 100644 (file)
--- a/dali-toolkit/internal/visuals/visual-base-impl.h
+++ b/dali-toolkit/internal/visuals/visual-base-impl.h
@@ -293,7 +293,7 @@ public:
   /**
    * @brief A reference counted object may only be deleted by calling Unreference().
    */
-  virtual ~Base();
+  ~Base() override;
 
 protected:
 

diff --git a/dali-toolkit/internal/visuals/visual-factory-impl.h b/dali-toolkit/internal/visuals/visual-factory-impl.h
index 5ee3e8e..e4dd8d3 100644 (file)
--- a/dali-toolkit/internal/visuals/visual-factory-impl.h
+++ b/dali-toolkit/internal/visuals/visual-factory-impl.h
@@ -91,7 +91,7 @@ protected:
   /**
    * A reference counted object may only be deleted by calling Unreference()
    */
-  virtual ~VisualFactory();
+  ~VisualFactory() override;
 
 private:
   /**