From a20d9e623d8829d526481e560763add7aa96f40b Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Wed, 2 Sep 2020 20:55:54 +0100 Subject: [PATCH] Deleted Move/Copy operators & constructors from Internal::Control Also added override keywords to methods that required it Change-Id: If624801451472dce9e2a5d1f2d2d5afa8fc7cb64 --- dali-toolkit/public-api/controls/control-impl.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dali-toolkit/public-api/controls/control-impl.h b/dali-toolkit/public-api/controls/control-impl.h index e49386d..160ac55 100644 --- a/dali-toolkit/public-api/controls/control-impl.h +++ b/dali-toolkit/public-api/controls/control-impl.h @@ -610,12 +610,12 @@ public: // API for derived classes to override /** * @copydoc ConnectionTrackerInterface::SignalConnected */ - virtual void SignalConnected( SlotObserver* slotObserver, CallbackBase* callback ); + virtual void SignalConnected( SlotObserver* slotObserver, CallbackBase* callback ) override; /** * @copydoc ConnectionTrackerInterface::SignalDisconnected */ - virtual void SignalDisconnected( SlotObserver* slotObserver, CallbackBase* callback ); + virtual void SignalDisconnected( SlotObserver* slotObserver, CallbackBase* callback ) override; /** * @brief Retrieves the extension for this control. @@ -631,9 +631,12 @@ public: // API for derived classes to override private: /// @cond internal - // Undefined - DALI_INTERNAL Control( const Control& ); - DALI_INTERNAL Control& operator=( const Control& ); + + // Not copyable or movable + DALI_INTERNAL Control( const Control& ) = delete; ///< Deleted copy constructor. + DALI_INTERNAL Control( Control&& ) = delete; ///< Deleted move constructor. + DALI_INTERNAL Control& operator=( const Control& ) = delete; ///< Deleted copy assignment operator. + DALI_INTERNAL Control& operator=( Control&& ) = delete; ///< Deleted move assignment operator. public: class DALI_INTERNAL Impl; // Class declaration is public so we can internally add devel API's to the Controls Impl -- 2.7.4