From e16aa5fb305cc1b69e9c57a8a7ac4689426345c5 Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Fri, 23 Dec 2016 10:50:13 +0000 Subject: [PATCH] [3.0] Remove deprecation warnings from TouchEvent This pollutes the log for general touch as it's used by the TouchEventProcessor for backwards compatability and, thus, the log is always shown even if applications are not using it. Change-Id: Ied028740a3007914a6c68c0ffa3a66ad6ef840c9 --- dali/public-api/events/touch-event.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/dali/public-api/events/touch-event.cpp b/dali/public-api/events/touch-event.cpp index acb8496..2ec7411 100644 --- a/dali/public-api/events/touch-event.cpp +++ b/dali/public-api/events/touch-event.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,31 +30,24 @@ namespace Dali 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]; } -- 2.7.4