X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fcontrol-impl.h;h=160ac557badaa8b41836e7364af637d2f873b75a;hp=e49386db94904069473d40adc0ad8283b5dfd19c;hb=a20d9e623d8829d526481e560763add7aa96f40b;hpb=b1e8521ad77e7b4e62b59613b2edef64429130e9 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