From dee8cb89339a72a6c4dca10c27d80f3cc950065e Mon Sep 17 00:00:00 2001
From: Francisco Santos <f1.santos@samsung.com>
Date: Tue, 29 Jul 2014 17:43:31 +0100
Subject: [PATCH] Remove dependency on DLOG.

Change-Id: I9e4aae623e72ce722da8bbbe4ba1479d2c0f59ed
---
 .../internal/controls/table-view/table-view-impl.cpp         | 12 +++++++-----
 .../internal/controls/text-input/text-input-impl.cpp         |  2 +-
 build/tizen/.gitignore                                       |  1 +
 build/tizen/configure.ac                                     |  1 -
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/base/dali-toolkit/internal/controls/table-view/table-view-impl.cpp b/base/dali-toolkit/internal/controls/table-view/table-view-impl.cpp
index b6ff462..7a60aa6 100644
--- a/base/dali-toolkit/internal/controls/table-view/table-view-impl.cpp
+++ b/base/dali-toolkit/internal/controls/table-view/table-view-impl.cpp
@@ -17,12 +17,14 @@
 
 // CLASS HEADER
 #include <dali-toolkit/internal/controls/table-view/table-view-impl.h>
-#include <dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h>
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/object/ref-object.h>
-#include <dlog.h>
 #include <sstream>
+#include <dali/public-api/object/ref-object.h>
+#include <dali/integration-api/debug.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h>
 
 using namespace Dali;
 using namespace std;
@@ -70,8 +72,8 @@ struct RelativeToWidthOrHeight
 // debugging support, very useful when new features are added or bugs are hunted down
 // currently not called from code so compiler will optimize these away, kept here for future debugging
 
-#define TABLEVIEW_TAG "DALI Toolkit::TableView"
-#define TV_LOG(fmt, args...) LOG(LOG_INFO, TABLEVIEW_TAG, fmt, ## args)
+#define TABLEVIEW_TAG "DALI Toolkit::TableView "
+#define TV_LOG(fmt, args...) Debug::LogMessage(Debug::DebugInfo, TABLEVIEW_TAG fmt, ## args)
 
 void PrintArray( Array2d<Dali::Toolkit::Internal::TableView::CellData>& array )
 {
diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-impl.cpp b/base/dali-toolkit/internal/controls/text-input/text-input-impl.cpp
index 7e2a1af..da3443f 100644
--- a/base/dali-toolkit/internal/controls/text-input/text-input-impl.cpp
+++ b/base/dali-toolkit/internal/controls/text-input/text-input-impl.cpp
@@ -2267,7 +2267,7 @@ ImfManager::ImfCallbackData TextInput::ImfEventReceived( Dali::ImfManager& imfMa
       }
       else
       {
-        if( std::abs( imfEvent.cursorOffset ) < mCursorPosition )
+        if( static_cast<std::size_t>(std::abs( imfEvent.cursorOffset )) < mCursorPosition )
         {
           toDelete = mCursorPosition + imfEvent.cursorOffset;
         }
diff --git a/build/tizen/.gitignore b/build/tizen/.gitignore
index ea033f1..7c9029f 100644
--- a/build/tizen/.gitignore
+++ b/build/tizen/.gitignore
@@ -1,6 +1,7 @@
 /gmon.out
 /aclocal.m4
 /autom4te.cache
+/compile
 /config.guess
 /config.log
 /config.status
diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac
index 20810b3..454053f 100644
--- a/build/tizen/configure.ac
+++ b/build/tizen/configure.ac
@@ -30,7 +30,6 @@ AC_SUBST(DALI_TOOLKIT_VERSION)
 
 PKG_CHECK_MODULES(DALICORE, dali-core)
 PKG_CHECK_MODULES(DALI, dali)
-PKG_CHECK_MODULES(DLOG, dlog)
 PKG_CHECK_MODULES(FRIBIDI, fribidi)
 
 DALI_TOOLKIT_CFLAGS=-DPLATFORM_TIZEN
-- 
2.7.4