From 49c97a2e97f05007085fc43739b1196f054d63a1 Mon Sep 17 00:00:00 2001
From: Richard Huang <r.huang@samsung.com>
Date: Mon, 11 Aug 2014 11:58:22 +0100
Subject: [PATCH] Remove Deprecated APIs

Change-Id: I9f70e6649fc6124d045420398fc16f9f7e0e00e6
---
 adaptors/common/feedback/feedback-controller.cpp |  2 --
 adaptors/common/window-impl.cpp                  | 17 -----------------
 adaptors/common/window-impl.h                    |  5 -----
 adaptors/common/window.cpp                       |  5 -----
 adaptors/public-api/window.h                     |  7 -------
 adaptors/wayland/window-impl-wl.cpp              | 17 -----------------
 adaptors/x11/window-impl-x.cpp                   | 17 -----------------
 7 files changed, 70 deletions(-)

diff --git a/adaptors/common/feedback/feedback-controller.cpp b/adaptors/common/feedback/feedback-controller.cpp
index db59865..aa67853 100644
--- a/adaptors/common/feedback/feedback-controller.cpp
+++ b/adaptors/common/feedback/feedback-controller.cpp
@@ -105,7 +105,6 @@ struct SignalFeedbackInfo
 {
   /**
    * Default constructor.
-   * @deprecated - moved into dali-adaptor FeedbackController.
    */
   SignalFeedbackInfo()
   :mHasHapticFeedbackInfo(false),
@@ -129,7 +128,6 @@ struct FeedbackStyleInfo
 {
   /**
    * Default constructor.
-   * @deprecated - moved into dali-adaptor FeedbackController.
    */
   FeedbackStyleInfo()
   {
diff --git a/adaptors/common/window-impl.cpp b/adaptors/common/window-impl.cpp
index c8910b6..20c6bde 100644
--- a/adaptors/common/window-impl.cpp
+++ b/adaptors/common/window-impl.cpp
@@ -265,23 +265,6 @@ void Window::SetIndicatorStyle( Dali::Window::IndicatorStyle style )
   mIndicatorStyle = style;
 }
 
-void Window::ShowIndicator( bool show )
-{
-  DALI_LOG_TRACE_METHOD_FMT( gWindowLogFilter, "%s\n", show?"SHOW":"HIDE" );
-  DALI_ASSERT_DEBUG(mOverlay);
-
-  if(show)
-  {
-    mIndicatorVisible = Dali::Window::VISIBLE;
-  }
-  else
-  {
-    mIndicatorVisible = Dali::Window::INVISIBLE;
-  }
-
-  DoShowIndicator( mIndicatorOrientation );
-}
-
 void Window::ShowIndicator( Dali::Window::IndicatorVisibleMode visibleMode )
 {
   DALI_LOG_TRACE_METHOD_FMT( gWindowLogFilter, "visible : %d\n", visibleMode );
diff --git a/adaptors/common/window-impl.h b/adaptors/common/window-impl.h
index 428244c..d0ce07b 100644
--- a/adaptors/common/window-impl.h
+++ b/adaptors/common/window-impl.h
@@ -88,11 +88,6 @@ public:
   /**
    * @copydoc Dali::Window::ShowIndicator()
    */
-  void ShowIndicator( bool show );
-
-  /**
-   * @copydoc Dali::Window::ShowIndicator()
-   */
   void ShowIndicator( Dali::Window::IndicatorVisibleMode visibleMode );
 
   /**
diff --git a/adaptors/common/window.cpp b/adaptors/common/window.cpp
index 4883b8d..a918d57 100644
--- a/adaptors/common/window.cpp
+++ b/adaptors/common/window.cpp
@@ -44,11 +44,6 @@ void Window::SetIndicatorStyle( IndicatorStyle style )
   GetImplementation(*this).SetIndicatorStyle( style );
 }
 
-void Window::ShowIndicator( bool show )
-{
-  GetImplementation(*this).ShowIndicator( show );
-}
-
 void Window::ShowIndicator( IndicatorVisibleMode visibleMode )
 {
   GetImplementation(*this).ShowIndicator( visibleMode );
diff --git a/adaptors/public-api/window.h b/adaptors/public-api/window.h
index 82be3cd..218e150 100644
--- a/adaptors/public-api/window.h
+++ b/adaptors/public-api/window.h
@@ -137,13 +137,6 @@ public:
 
   /**
    * @brief This sets whether the indicator bar should be shown or not.
-   * @param[in] show - true if the indicator bar should be shown
-   * @deprecated use "void ShowIndicator( IndicatorVisibleMode visibleMode )"
-   */
-  void ShowIndicator( bool show );
-
-  /**
-   * @brief This sets whether the indicator bar should be shown or not.
    * @param[in] visibleMode visible mode for indicator bar, VISIBLE in default
    */
   void ShowIndicator( IndicatorVisibleMode visibleMode );
diff --git a/adaptors/wayland/window-impl-wl.cpp b/adaptors/wayland/window-impl-wl.cpp
index 808ae52..539fcd7 100644
--- a/adaptors/wayland/window-impl-wl.cpp
+++ b/adaptors/wayland/window-impl-wl.cpp
@@ -153,23 +153,6 @@ void Window::SetIndicatorStyle( Dali::Window::IndicatorStyle style )
   mIndicatorStyle = style;
 }
 
-void Window::ShowIndicator( bool show )
-{
-  DALI_LOG_TRACE_METHOD_FMT( gWindowLogFilter, "%s\n", show?"SHOW":"HIDE" );
-  DALI_ASSERT_DEBUG(mOverlay);
-
-  if(show)
-  {
-    mIndicatorVisible = Dali::Window::VISIBLE;
-  }
-  else
-  {
-    mIndicatorVisible = Dali::Window::INVISIBLE;
-  }
-
-  DoShowIndicator( mIndicatorOrientation );
-}
-
 void Window::ShowIndicator( Dali::Window::IndicatorVisibleMode visibleMode )
 {
   DALI_LOG_TRACE_METHOD_FMT( gWindowLogFilter, "visible : %d\n", visibleMode );
diff --git a/adaptors/x11/window-impl-x.cpp b/adaptors/x11/window-impl-x.cpp
index 0241a2a..9f7b158 100644
--- a/adaptors/x11/window-impl-x.cpp
+++ b/adaptors/x11/window-impl-x.cpp
@@ -245,23 +245,6 @@ void Window::SetIndicatorStyle( Dali::Window::IndicatorStyle style )
   mIndicatorStyle = style;
 }
 
-void Window::ShowIndicator( bool show )
-{
-  DALI_LOG_TRACE_METHOD_FMT( gWindowLogFilter, "%s\n", show?"SHOW":"HIDE" );
-  DALI_ASSERT_DEBUG(mOverlay);
-
-  if(show)
-  {
-    mIndicatorVisible = Dali::Window::VISIBLE;
-  }
-  else
-  {
-    mIndicatorVisible = Dali::Window::INVISIBLE;
-  }
-
-  DoShowIndicator( mIndicatorOrientation );
-}
-
 void Window::ShowIndicator( Dali::Window::IndicatorVisibleMode visibleMode )
 {
   DALI_LOG_TRACE_METHOD_FMT( gWindowLogFilter, "visible : %d\n", visibleMode );
-- 
2.7.4