From 0868958bb5bb1d7894c9eec6282f533cea8f8d3a Mon Sep 17 00:00:00 2001 From: "minho.sun" Date: Fri, 10 Feb 2017 15:42:29 +0900 Subject: [PATCH] [3.0] Fix build error when using --enable-debug option Fix build error when using --enable-debug option. Some Logs make build error because they use old apis. Change old api to new one or remove. Change-Id: Ie3cbd212b21cd7cf54e4a61fb6f9beae602fc798 Signed-off-by: minho.sun --- adaptors/ecore/wayland/event-handler-ecore-wl.cpp | 3 +-- adaptors/ecore/wayland/pixmap-render-surface-ecore-wl.cpp | 3 +-- adaptors/ecore/wayland/render-surface-ecore-wl.cpp | 3 +++ adaptors/wayland/event-handler-wl.cpp | 9 ++++++++- adaptors/wayland/input/text/imf/imf-manager-impl-wl.cpp | 4 ++-- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/adaptors/ecore/wayland/event-handler-ecore-wl.cpp b/adaptors/ecore/wayland/event-handler-ecore-wl.cpp index abd9bc3..8461a44 100644 --- a/adaptors/ecore/wayland/event-handler-ecore-wl.cpp +++ b/adaptors/ecore/wayland/event-handler-ecore-wl.cpp @@ -68,7 +68,6 @@ namespace Adaptor namespace { Integration::Log::Filter* gTouchEventLogFilter = Integration::Log::Filter::New(Debug::NoLogging, false, "LOG_ADAPTOR_EVENTS_TOUCH"); -Integration::Log::Filter* gClientMessageLogFilter = Integration::Log::Filter::New(Debug::NoLogging, false, "LOG_ADAPTOR_EVENTS_CLIENT_MESSAGE"); Integration::Log::Filter* gDragAndDropLogFilter = Integration::Log::Filter::New(Debug::NoLogging, false, "LOG_ADAPTOR_EVENTS_DND"); Integration::Log::Filter* gImfLogging = Integration::Log::Filter::New(Debug::NoLogging, false, "LOG_ADAPTOR_EVENTS_IMF"); Integration::Log::Filter* gSelectionEventLogFilter = Integration::Log::Filter::New(Debug::NoLogging, false, "LOG_ADAPTOR_EVENTS_SELECTION"); @@ -1166,7 +1165,7 @@ void EventHandler::SendEvent(Integration::Point& point, unsigned long timeStamp) Integration::TouchEventCombiner::EventDispatchType type = mCombiner.GetNextTouchEvent(point, timeStamp, touchEvent, hoverEvent); if(type != Integration::TouchEventCombiner::DispatchNone ) { - DALI_LOG_INFO(gTouchEventLogFilter, Debug::General, "%d: Device %d: Button state %d (%.2f, %.2f)\n", timeStamp, point.deviceId, point.state, point.local.x, point.local.y); + DALI_LOG_INFO(gTouchEventLogFilter, Debug::General, "%d: Device %d: Button state %d (%.2f, %.2f)\n", timeStamp, point.GetDeviceId(), point.GetState(), point.GetLocalPosition().x, point.GetLocalPosition().y); // First the touch and/or hover event & related gesture events are queued if(type == Integration::TouchEventCombiner::DispatchTouch || type == Integration::TouchEventCombiner::DispatchBoth) diff --git a/adaptors/ecore/wayland/pixmap-render-surface-ecore-wl.cpp b/adaptors/ecore/wayland/pixmap-render-surface-ecore-wl.cpp index 9e66c5c..cc3d05b 100644 --- a/adaptors/ecore/wayland/pixmap-render-surface-ecore-wl.cpp +++ b/adaptors/ecore/wayland/pixmap-render-surface-ecore-wl.cpp @@ -52,8 +52,7 @@ PixmapRenderSurface::~PixmapRenderSurface() // release the surface if we own one if( mOwnSurface ) { - // if we did create the pixmap, delete the pixmap - DALI_LOG_INFO( gRenderSurfaceLogFilter, Debug::General, "Own pixmap (%x) freed\n", mX11Pixmap ); + //TODO: if we did create the pixmap, delete the pixmap } } diff --git a/adaptors/ecore/wayland/render-surface-ecore-wl.cpp b/adaptors/ecore/wayland/render-surface-ecore-wl.cpp index 8ef5cc0..1aaa06e 100644 --- a/adaptors/ecore/wayland/render-surface-ecore-wl.cpp +++ b/adaptors/ecore/wayland/render-surface-ecore-wl.cpp @@ -71,10 +71,13 @@ void EcoreWlRenderSurface::Init( Any surface ) #ifdef DEBUG_ENABLED // prints out 'INFO: DALI: new EcoreWlRenderSurface, created display xx, used existing surface xx // we can not use LOG_INFO because the surface can be created before Dali Core is created. + // TODO: Overy tizen 3.0, we don't use X anymore. Change this for Tizen 3.0 + /* printf( "INFO: DALI: new EcoreWlRenderSurface, %s %s surface %X \n", mOwnSurface?"created":"used existing", Dali::RenderSurface::PIXMAP==mType?" pixmap" :"window", AnyCast( GetSurface() ) ); + */ #endif } diff --git a/adaptors/wayland/event-handler-wl.cpp b/adaptors/wayland/event-handler-wl.cpp index 0ae57f4..b6a604e 100644 --- a/adaptors/wayland/event-handler-wl.cpp +++ b/adaptors/wayland/event-handler-wl.cpp @@ -53,6 +53,13 @@ namespace Internal namespace Adaptor { +#if defined(DEBUG_ENABLED) +namespace +{ + Integration::Log::Filter* gTouchEventLogFilter = Integration::Log::Filter::New(Debug::NoLogging, false, "LOG_ADAPTOR_EVENTS_TOUCH"); +} // unnamed namespace +#endif + struct EventHandler::Impl : public WindowEventInterface { // Construction & Destruction @@ -148,7 +155,7 @@ void EventHandler::SendEvent(Integration::Point& point, unsigned long timeStamp) Integration::TouchEventCombiner::EventDispatchType type = mCombiner.GetNextTouchEvent(point, timeStamp, touchEvent, hoverEvent); if(type != Integration::TouchEventCombiner::DispatchNone ) { - DALI_LOG_INFO(gTouchEventLogFilter, Debug::General, "%d: Device %d: Button state %d (%.2f, %.2f)\n", timeStamp, point.deviceId, point.state, point.local.x, point.local.y); + DALI_LOG_INFO(gTouchEventLogFilter, Debug::General, "%d: Device %d: Button state %d (%.2f, %.2f)\n", timeStamp, point.GetDeviceId(), point.GetState(), point.GetLocalPosition().x, point.GetLocalPosition().y); // First the touch and/or hover event & related gesture events are queued if(type == Integration::TouchEventCombiner::DispatchTouch || type == Integration::TouchEventCombiner::DispatchBoth) diff --git a/adaptors/wayland/input/text/imf/imf-manager-impl-wl.cpp b/adaptors/wayland/input/text/imf/imf-manager-impl-wl.cpp index 731763e..612a522 100644 --- a/adaptors/wayland/input/text/imf/imf-manager-impl-wl.cpp +++ b/adaptors/wayland/input/text/imf/imf-manager-impl-wl.cpp @@ -25,7 +25,7 @@ // INTERNAL INCLUDES #include #include - +#include namespace Dali { @@ -240,7 +240,7 @@ void ImfManager::NotifyCursorPosition() void ImfManager::DeleteSurroundingText( int index, unsigned int length ) { - DALI_LOG_INFO( gLogFilter, Debug::General, "ImfManager::DeleteSurroundingText %d %d \n" index, length ); + DALI_LOG_INFO( gLogFilter, Debug::General, "ImfManager::DeleteSurroundingText %d %d \n", index, length ); Dali::ImfManager::ImfEventData imfData( Dali::ImfManager::DELETESURROUNDING, std::string(),index, length ); Dali::ImfManager handle( this ); -- 2.7.4