Merge "(Build) Stopped toolkit-base compiling separately." into tizen

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-accessibility-manager.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-accessibility-manager.h
index a87c733..f8575a1 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-accessibility-manager.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-accessibility-manager.h
@@ -49,7 +49,7 @@ public: // Typedefs
 
 public: // Construction & Destruction
   AccessibilityManager();
-  virtual ~AccessibilityManager();
+  ~AccessibilityManager();
 
 public: // Getters
   static AccessibilityManager Get();

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard.h
index 3cb121b..a67c0da 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard.h
@@ -50,9 +50,9 @@ public:
   Clipboard();
 
   /**
-   * Virtual destructor.
+   * Non virtual destructor.
    */
-  virtual ~Clipboard();
+  ~Clipboard();
 
   /**
    * This constructor is used by Adaptor::GetClipboard().

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.h
index 856c943..bd8cb62 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.h
@@ -211,9 +211,9 @@ public:
   ImfManager();
 
   /**
-   * Virtual destructor.
+   * Non virtual destructor.
    */
-  virtual ~ImfManager();
+  ~ImfManager();
 
   /**
    * This constructor is used by ImfManager::Get().

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-physical-keyboard.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-physical-keyboard.h
index d56bc61..f4afb95 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-physical-keyboard.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-physical-keyboard.h
@@ -38,7 +38,7 @@ class PhysicalKeyboard : public BaseHandle
 public:
   typedef SignalV2< void (PhysicalKeyboard) > Signal;
   PhysicalKeyboard();
-  virtual ~PhysicalKeyboard();
+  ~PhysicalKeyboard();
   static PhysicalKeyboard Get();
   bool IsAttached() const;
   Signal& StatusChangedSignal();

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.h
index 19adcbd..771e992 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.h
@@ -49,7 +49,7 @@ public: // Creation & Destruction
   StyleMonitor();
   StyleMonitor(const StyleMonitor& monitor);
   static StyleMonitor Get();
-  virtual ~StyleMonitor();
+  ~StyleMonitor();
   static StyleMonitor DownCast( BaseHandle handle );
   using BaseHandle::operator=;
 

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.h
index 16c9c96..8f23022 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.h
@@ -45,7 +45,7 @@ public:
   static Timer New( unsigned int milliSec );
   Timer( const Timer& timer );
   Timer& operator=( const Timer& timer );
-  virtual ~Timer();
+  ~Timer();
   static Timer DownCast( BaseHandle handle );
   using BaseHandle::operator=;
   void Start();