From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Fri, 17 May 2019 10:58:20 +0000 (+0000)
Subject: Merge "Remove RotationObserver from toolkit orientaiton implementation" into devel... 
X-Git-Tag: dali_1.4.21~5
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=01808a740662880dc14ca86d4808c7baf536b948;hp=8759e4d8674d2a4791cb4286fb678af8237c62cd

Merge "Remove RotationObserver from toolkit orientaiton implementation" into devel/master
---

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-orientation.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-orientation.cpp
index 4018f37..b959638 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-orientation.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-orientation.cpp
@@ -42,21 +42,7 @@ struct RotationEvent
   int height;    ///< new window height
 };
 
-/**
- * The RotationObserver can be overridden in order to listen to rotation events.
- */
-class RotationObserver
-{
-public:
-  virtual void OnRotationPrepare( const RotationEvent& rotation ) = 0;
-  virtual void OnRotationRequest( ) = 0;
-
-protected:
-  RotationObserver(){}
-  virtual ~RotationObserver(){}
-};
-
-class Orientation : public BaseObject, public RotationObserver
+class Orientation : public BaseObject
 {
 public:
   typedef Dali::Orientation::OrientationSignalType OrientationSignalType;
@@ -75,9 +61,6 @@ protected:
   {
   }
 public:
-  void SetAdaptor(Dali::Adaptor& adaptor)
-  {
-  }
   int GetDegrees() const
   {
     return 0;
@@ -86,16 +69,13 @@ public:
   {
     return 0.0f;
   }
+  void OnOrientationChanged( const RotationEvent& rotation )
+  {
+  }
   OrientationSignalType& ChangedSignal()
   {
     return mChangedSignal;
   }
-  virtual void OnRotationPrepare( const RotationEvent& rotation )
-  {
-  };
-  virtual void OnRotationRequest( )
-  {
-  };
 
 private:
   Orientation(const Orientation&);