Remove handle::operator=(NULL) as it is duplicating handle.Reset() functionality...

Change-Id: Iabc6220d316a3bdca55fa1edab6ff4733fb36532

diff --git a/adaptors/public-api/adaptor-framework/bitmap-loader.cpp b/adaptors/public-api/adaptor-framework/bitmap-loader.cpp
index 68a5305..e0e54e4 100644 (file)
--- a/adaptors/public-api/adaptor-framework/bitmap-loader.cpp
+++ b/adaptors/public-api/adaptor-framework/bitmap-loader.cpp
@@ -58,13 +58,6 @@ BitmapLoader& BitmapLoader::operator=(const BitmapLoader& rhs)
   return *this;
 }
 
-BitmapLoader& BitmapLoader::operator=(BaseHandle::NullType* rhs)
-{
-  DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle");
-  Reset();
-  return *this;
-}
-
 unsigned char* BitmapLoader::GetPixelData() const
 {
   return GetImplementation(*this).GetPixelData();

diff --git a/adaptors/public-api/adaptor-framework/bitmap-loader.h b/adaptors/public-api/adaptor-framework/bitmap-loader.h
index 94f2fc3..a64b05c 100644 (file)
--- a/adaptors/public-api/adaptor-framework/bitmap-loader.h
+++ b/adaptors/public-api/adaptor-framework/bitmap-loader.h
@@ -67,16 +67,6 @@ public:
    */
   BitmapLoader& operator=(const BitmapLoader& rhs);
 
-  /**
-   * @brief This method is defined to allow assignment of the NULL value,
-   * and will throw an exception if passed any other value.
-   *
-   * Assigning to NULL is an alias for Reset().
-   * @param [in] rhs  A NULL pointer
-   * @return A reference to this handle
-   */
-  BitmapLoader& operator=(BaseHandle::NullType* rhs);
-
 public:
 
   /**

diff --git a/adaptors/public-api/adaptor-framework/color-controller.cpp b/adaptors/public-api/adaptor-framework/color-controller.cpp
index 5ec6545..f005227 100644 (file)
--- a/adaptors/public-api/adaptor-framework/color-controller.cpp
+++ b/adaptors/public-api/adaptor-framework/color-controller.cpp
@@ -39,13 +39,6 @@ ColorController& ColorController::operator=(const ColorController& rhs)
   return *this;
 }
 
-ColorController& ColorController::operator=(BaseHandle::NullType* rhs)
-{
-  DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle");
-  Reset();
-  return *this;
-}
-
 ColorController ColorController::Get()
 {
   return Internal::Adaptor::ColorController::Get();

diff --git a/adaptors/public-api/adaptor-framework/color-controller.h b/adaptors/public-api/adaptor-framework/color-controller.h
index 6a57961..9d661fd 100644 (file)
--- a/adaptors/public-api/adaptor-framework/color-controller.h
+++ b/adaptors/public-api/adaptor-framework/color-controller.h
@@ -62,16 +62,6 @@ public:
   ColorController& operator=(const ColorController& rhs);
 
   /**
-   * @brief This method is defined to allow assignment of the NULL value,
-   * and will throw an exception if passed any other value.
-   *
-   * Assigning to NULL is an alias for Reset().
-   * @param [in] rhs  A NULL pointer
-   * @return A reference to this handle
-   */
-  ColorController& operator=(BaseHandle::NullType* rhs);
-
-  /**
    * @brief Retrieve the initialized instance of the ColorController.
    *
    * @return Handle to ColorController.

diff --git a/adaptors/public-api/adaptor-framework/orientation.cpp b/adaptors/public-api/adaptor-framework/orientation.cpp
index f276b66..245b047 100644 (file)
--- a/adaptors/public-api/adaptor-framework/orientation.cpp
+++ b/adaptors/public-api/adaptor-framework/orientation.cpp
@@ -43,13 +43,6 @@ Orientation& Orientation::operator=(const Orientation& rhs)
   return *this;
 }
 
-Orientation& Orientation::operator=(BaseHandle::NullType* rhs)
-{
-  DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle");
-  Reset();
-  return *this;
-}
-
 int Orientation::GetDegrees() const
 {
   return Internal::Adaptor::GetImplementation(*this).GetDegrees();

diff --git a/adaptors/public-api/adaptor-framework/orientation.h b/adaptors/public-api/adaptor-framework/orientation.h
index 6dba273..de70243 100644 (file)
--- a/adaptors/public-api/adaptor-framework/orientation.h
+++ b/adaptors/public-api/adaptor-framework/orientation.h
@@ -78,16 +78,6 @@ public:
   Orientation& operator=(const Orientation& rhs);
 
   /**
-   * @brief This method is defined to allow assignment of the NULL value,
-   * and will throw an exception if passed any other value.
-   *
-   * Assigning to NULL is an alias for Reset().
-   * @param [in] rhs  A NULL pointer
-   * @return A reference to this handle
-   */
-  Orientation& operator=(BaseHandle::NullType* rhs);
-
-  /**
    * @brief Returns the orientation of the device in degrees.
    *
    * This is one of four discrete values, in degrees clockwise: 0, 90, 180, & 270

diff --git a/adaptors/public-api/adaptor-framework/style-monitor.cpp b/adaptors/public-api/adaptor-framework/style-monitor.cpp
index 5bb0e28..cb2848b 100644 (file)
--- a/adaptors/public-api/adaptor-framework/style-monitor.cpp
+++ b/adaptors/public-api/adaptor-framework/style-monitor.cpp
@@ -81,13 +81,6 @@ StyleMonitor& StyleMonitor::operator=(const StyleMonitor& monitor)
   return *this;
 }
 
-StyleMonitor& StyleMonitor::operator=(BaseHandle::NullType* rhs)
-{
-  DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle");
-  Reset();
-  return *this;
-}
-
 StyleMonitor::StyleMonitor(Internal::Adaptor::StyleMonitor* internal)
 : BaseHandle(internal)
 {

diff --git a/adaptors/public-api/adaptor-framework/style-monitor.h b/adaptors/public-api/adaptor-framework/style-monitor.h
index e4fc855..fdb6590 100644 (file)
--- a/adaptors/public-api/adaptor-framework/style-monitor.h
+++ b/adaptors/public-api/adaptor-framework/style-monitor.h
@@ -145,16 +145,6 @@ public: // Operators
    */
   StyleMonitor& operator=(const StyleMonitor& monitor);
 
-  /**
-   * @brief This method is defined to allow assignment of the NULL value,
-   * and will throw an exception if passed any other value.
-   *
-   * Assigning to NULL is an alias for Reset().
-   * @param [in] rhs  A NULL pointer
-   * @return A reference to this handle
-   */
-  StyleMonitor& operator=(BaseHandle::NullType* rhs);
-
 public: // Not intended for application developers
   /**
    * @brief This constructor is used internally to create a handle from an object pointer.

diff --git a/adaptors/public-api/adaptor-framework/timer.cpp b/adaptors/public-api/adaptor-framework/timer.cpp
index 3dd28bb..5a1b940 100644 (file)
--- a/adaptors/public-api/adaptor-framework/timer.cpp
+++ b/adaptors/public-api/adaptor-framework/timer.cpp
@@ -52,13 +52,6 @@ Timer& Timer::operator=( const Timer& timer )
   return *this;
 }
 
-Timer& Timer::operator=(BaseHandle::NullType* rhs)
-{
-  DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle");
-  Reset();
-  return *this;
-}
-
 Timer::~Timer()
 {
 }

diff --git a/adaptors/public-api/adaptor-framework/timer.h b/adaptors/public-api/adaptor-framework/timer.h
index 8affd3e..1617af2 100644 (file)
--- a/adaptors/public-api/adaptor-framework/timer.h
+++ b/adaptors/public-api/adaptor-framework/timer.h
@@ -86,16 +86,6 @@ public: // API
   Timer& operator=( const Timer& timer );
 
   /**
-   * @brief This method is defined to allow assignment of the NULL value,
-   * and will throw an exception if passed any other value.
-   *
-   * Assigning to NULL is an alias for Reset().
-   * @param [in] rhs  A NULL pointer
-   * @return A reference to this handle
-   */
-  Timer& operator=(BaseHandle::NullType* rhs);
-
-  /**
    * @brief Destructor
    *
    * This is non-virtual since derived Handle types must not contain data or virtual methods.

diff --git a/adaptors/public-api/adaptor-framework/window.cpp b/adaptors/public-api/adaptor-framework/window.cpp
index 768429d..31a271a 100644 (file)
--- a/adaptors/public-api/adaptor-framework/window.cpp
+++ b/adaptors/public-api/adaptor-framework/window.cpp
@@ -50,13 +50,6 @@ Window& Window::operator=(const Window& rhs)
   return *this;
 }
 
-Window& Window::operator=(BaseHandle::NullType* rhs)
-{
-  DALI_ASSERT_ALWAYS( (rhs == NULL) && "Can only assign NULL pointer to handle");
-  Reset();
-  return *this;
-}
-
 void Window::SetIndicatorStyle( IndicatorStyle style )
 {
   GetImplementation(*this).SetIndicatorStyle( style );

diff --git a/adaptors/public-api/adaptor-framework/window.h b/adaptors/public-api/adaptor-framework/window.h
index df5374e..5e24855 100644 (file)
--- a/adaptors/public-api/adaptor-framework/window.h
+++ b/adaptors/public-api/adaptor-framework/window.h
@@ -134,16 +134,6 @@ public:
   Window& operator=(const Window& rhs);
 
   /**
-   * @brief This method is defined to allow assignment of the NULL value,
-   * and will throw an exception if passed any other value.
-   *
-   * Assigning to NULL is an alias for Reset().
-   * @param [in] rhs  A NULL pointer
-   * @return A reference to this handle
-   */
-  Window& operator=(BaseHandle::NullType* rhs);
-
-  /**
    * @brief This sets the style of indicator
    * @param[in] style style type of the indicator
    *