Merge remote-tracking branch 'origin/tizen' into new_text

[platform/core/uifw/dali-adaptor.git] / adaptors / common / window-impl.h

diff --git a/adaptors/common/window-impl.h b/adaptors/common/window-impl.h
index 86b82ed..32068da 100644 (file)
--- a/adaptors/common/window-impl.h
+++ b/adaptors/common/window-impl.h
@@ -21,20 +21,20 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/object/ref-object.h>
 #include <dali/public-api/object/base-object.h>
-#include <window.h>
-#include <orientation.h>
-#include <render-surface.h>
-#include <drag-and-drop-detector.h>
 
 // INTERNAL INCLUDES
 #include <base/lifecycle-observer.h>
 #include <adaptor-impl.h>
 #include <indicator-impl.h>
-
+#include <window.h>
+#include <orientation.h>
+#include <render-surface.h>
+#include <drag-and-drop-detector.h>
 
 namespace Dali
 {
 class Adaptor;
+class RenderSurface;
 
 namespace Integration
 {
@@ -45,7 +45,6 @@ namespace Internal
 {
 namespace Adaptor
 {
-class RenderSurface;
 class Indicator;
 class Orientation;
 
@@ -59,7 +58,7 @@ typedef IntrusivePtr<Orientation> OrientationPtr;
 class Window : public Dali::BaseObject, public Indicator::Observer, public LifeCycleObserver
 {
 public:
-  typedef Dali::Window::IndicatorSignalV2 IndicatorSignalV2;
+  typedef Dali::Window::IndicatorSignalType IndicatorSignalType;
 
   /**
    * Create a new Window. This should only be called once by the Application class
@@ -172,7 +171,6 @@ public:
    */
   void RotationDone( int orientation, int width, int height );
 
-
 private:
   /**
    * Private constructor.
@@ -260,7 +258,7 @@ public: // Signals
   /**
    * The user should connect to this signal to get a timing when indicator was shown / hidden.
    */
-  IndicatorSignalV2& IndicatorVisibilityChangedSignal() { return mIndicatorVisibilityChangedSignalV2; }
+  IndicatorSignalType& IndicatorVisibilityChangedSignal() { return mIndicatorVisibilityChangedSignal; }
 
 private:
 
@@ -290,7 +288,7 @@ private:
   Dali::Window::WindowOrientation              mPreferredOrientation;
 
   // Signals
-  IndicatorSignalV2 mIndicatorVisibilityChangedSignalV2;
+  IndicatorSignalType mIndicatorVisibilityChangedSignal;
 };
 
 } // namespace Adaptor