#define DALI_LOG_ERROR_NOFN(format, args...) Dali::Integration::Log::LogMessage(Dali::Integration::Log::DebugError, format, ## args)
+#define DALI_LOG_WARNING_NOFN(format, args...) Dali::Integration::Log::LogMessage(Dali::Integration::Log::DebugWarning, format, ## args)
+
/**
* Provides unfiltered logging for fps monitor
*/
Dali::Actor::TouchSignalType& Actor::TouchedSignal()
{
- DALI_LOG_WARNING( "Deprecated: Use TouchSignal() instead\n" );
return mTouchedSignal;
}
void Actor::SetPositionInheritanceMode( PositionInheritanceMode mode )
{
+ DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetPositionInheritanceMode() is deprecated and will be removed from next release. Use SetInheritPosition() instead.\n" );
+
GetImplementation(*this).SetPositionInheritanceMode( mode );
}
PositionInheritanceMode Actor::GetPositionInheritanceMode() const
{
+ DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: GetPositionInheritanceMode() is deprecated and will be removed from next release. Use IsPositionInherited() instead.\n" );
+
return GetImplementation(*this).GetPositionInheritanceMode();
}
Actor::TouchSignalType& Actor::TouchedSignal()
{
+ DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: TouchedSignal() is deprecated and will be removed from next release. Use TouchSignal() instead.\n" );
+
return GetImplementation(*this).TouchedSignal();
}
* @pre The Actor has been initialized.
* @see PositionInheritanceMode
*/
- void SetPositionInheritanceMode( PositionInheritanceMode mode );
+ void SetPositionInheritanceMode( PositionInheritanceMode mode ) DALI_DEPRECATED_API;
/**
* @brief Set whether a child actor inherits it's parent's position.
* @return Return the position inheritance mode.
* @pre The Actor has been initialized.
*/
- PositionInheritanceMode GetPositionInheritanceMode() const;
+ PositionInheritanceMode GetPositionInheritanceMode() const DALI_DEPRECATED_API;
/**
* @brief Returns whether the actor inherits its parent's position.
* @return The signal to connect to.
* @pre The Actor has been initialized.
*/
- TouchSignalType& TouchedSignal();
+ TouchSignalType& TouchedSignal() DALI_DEPRECATED_API;
/**
* @brief This signal is emitted when touch input is received.
* @return True if the event should be consumed.
* @note CustomActorImpl::REQUIRES_TOUCH_EVENTS must be enabled during construction. See CustomActorImpl::CustomActorImpl( ActorFlags flags ).
*/
- virtual bool OnTouchEvent(const TouchEvent& event) = 0;
+ virtual bool OnTouchEvent(const TouchEvent& event) DALI_DEPRECATED_API = 0;
/**
* @brief Called after a hover-event is received by the owning actor.
# define DALI_INTERNAL
#endif
+#ifdef DEPRECATION_WARNING
+#define DALI_DEPRECATED_API __attribute__((__visibility__("default"), deprecated))
+#else
+#define DALI_DEPRECATED_API
+#endif
+
#if defined (__GXX_EXPERIMENTAL_CXX0X__) || (__cplusplus >= 201103L)
// C++0x support
#define _CPP11
Stage::TouchedSignalType& Stage::TouchedSignal()
{
+ DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: TouchedSignal() is deprecated and will be removed from next release. Use TouchSignal() instead.\n" );
+
return GetImplementation(*this).TouchedSignal();
}
* @return The touch signal to connect to.
* @note Motion events are not emitted.
*/
- TouchedSignalType& TouchedSignal();
+ TouchedSignalType& TouchedSignal() DALI_DEPRECATED_API;
/**
* @brief This signal is emitted when the screen is touched and when the touch ends
// CLASS HEADER
#include <dali/public-api/events/touch-event.h>
+// EXTERNAL INCLUDES
+#include <dali/integration-api/debug.h>
+
// INTERNAL INCLUDES
#include <dali/public-api/common/dali-common.h>
TouchEvent::TouchEvent()
: time(0)
{
+ DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: TouchEvent() is deprecated and will be removed from next release. Use TouchData instead.\n" );
}
TouchEvent::TouchEvent(unsigned long time)
: time(time)
{
+ DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: TouchEvent() is deprecated and will be removed from next release. Use TouchData instead.\n" );
}
TouchEvent::~TouchEvent()
{
+ DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: ~TouchEvent() is deprecated and will be removed from next release. Use TouchData instead.\n" );
}
unsigned int TouchEvent::GetPointCount() const
{
+ DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: GetPointCount() is deprecated and will be removed from next release. Use TouchData instead.\n" );
+
return points.size();
}
const TouchPoint& TouchEvent::GetPoint(unsigned int point) const
{
+ DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: GetPoint() is deprecated and will be removed from next release. Use TouchData instead.\n" );
+
DALI_ASSERT_ALWAYS( point < points.size() && "No point at index" );
return points[point];
}
* @brief Default constructor
* @SINCE_1_0.0
*/
- TouchEvent();
+ TouchEvent() DALI_DEPRECATED_API;
/**
* @DEPRECATED_1_1.37
* @SINCE_1_0.0
* @param[in] time The time the event occurred
*/
- TouchEvent(unsigned long time);
+ TouchEvent(unsigned long time) DALI_DEPRECATED_API;
/**
* @DEPRECATED_1_1.37
* @brief Destructor
* @SINCE_1_0.0
*/
- ~TouchEvent();
+ ~TouchEvent() DALI_DEPRECATED_API;
// Data
* @SINCE_1_0.0
* @return Total number of Points.
*/
- unsigned int GetPointCount() const;
+ unsigned int GetPointCount() const DALI_DEPRECATED_API;
/**
* @DEPRECATED_1_1.37
* @note "point" should be less than the value returned by GetPointCount().
* If out of range, then program asserts.
*/
- const TouchPoint& GetPoint(unsigned int point) const;
+ const TouchPoint& GetPoint(unsigned int point) const DALI_DEPRECATED_API;
};
/**
// CLASS HEADER
#include <dali/public-api/object/property-map.h>
+// EXTERNAL INCLUDES
+#include <dali/integration-api/debug.h>
+
// INTERNAL INCLUDES
#include <dali/public-api/common/vector-wrapper.h>
const std::string& Property::Map::GetKey( SizeType position ) const
{
+ DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: GetKey() is deprecated and will be removed from next release.\n" );
+
DALI_ASSERT_ALWAYS( position < mImpl->mStringValueContainer.size() && "position out-of-bounds" );
return mImpl->mStringValueContainer[ position ].first;
StringValuePair& Property::Map::GetPair( SizeType position ) const
{
+ DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: GetPair() is deprecated and will be removed from next release.\n" );
+
DALI_ASSERT_ALWAYS( position < mImpl->mStringValueContainer.size() && "position out-of-bounds" );
return mImpl->mStringValueContainer[ position ];
*
* @note Will assert if position >= Count()
*/
- const std::string& GetKey( SizeType position ) const;
+ const std::string& GetKey( SizeType position ) const DALI_DEPRECATED_API;
/**
* DEPRECATED_1_1.39 Position based retrieval is no longer supported after extending the key type to both Index and String.
* @param[in] position The specified position
* @return A reference to the pair of key and value at the specified position.
*
- * @note Will assert if position >= Count()
+ * @note Will assert if position >= Count() or key at position is an index key.
*/
- StringValuePair& GetPair( SizeType position ) const;
+ StringValuePair& GetPair( SizeType position ) const DALI_DEPRECATED_API;
/**
* @brief Finds the value for the specified key if it exists.