From 0d10e59a28a458fdeff260516580cbaee5d953a5 Mon Sep 17 00:00:00 2001 From: Baptiste DURAND Date: Tue, 18 Feb 2014 19:52:37 +0100 Subject: [PATCH] fix: use EINA_* booleans instread of TRUE/FALSE This fix FTBFS on efl-1.8 Bug-Tizen: TIVI-2726 Change-Id: I21bf13b2dffb94e4f98c7d3c613f5a00b7759e40 Signed-off-by: Philippe Coval Signed-off-by: Baptiste DURAND --- src/wrt-client/splash_screen_support.cpp | 2 +- src/wrt-launcher/wrt-launcher.cpp | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/wrt-client/splash_screen_support.cpp b/src/wrt-client/splash_screen_support.cpp index bdfb34d..90631f0 100644 --- a/src/wrt-client/splash_screen_support.cpp +++ b/src/wrt-client/splash_screen_support.cpp @@ -59,7 +59,7 @@ SplashScreenSupport::SplashScreenSupport(Evas_Object* parent, const char* image_ evas_object_color_set(m_splashScreenBg, 255, 255, 255, 255); m_splashScreen = elm_image_add(m_splashScreenBg); - elm_image_no_scale_set(m_splashScreen, FALSE); + elm_image_no_scale_set(m_splashScreen, EINA_FALSE); if (elm_image_file_set(m_splashScreen, image_path, NULL)) { diff --git a/src/wrt-launcher/wrt-launcher.cpp b/src/wrt-launcher/wrt-launcher.cpp index 5c9fc0d..66e4824 100644 --- a/src/wrt-launcher/wrt-launcher.cpp +++ b/src/wrt-launcher/wrt-launcher.cpp @@ -103,16 +103,16 @@ static bool attachDbConnection() } Catch(DPL::DB::SqlConnection::Exception::Base) { LogDebug("Fail to connect DB"); - return FALSE; + return false; } } - return TRUE; + return true; } static bool display_widget_info() { if (!attachDbConnection()) { - return FALSE; + return false; } WidgetDAOReadOnlyList widgetList; @@ -121,7 +121,7 @@ static bool display_widget_info() widgetList = WrtDB::WidgetDAOReadOnly::getWidgetList(); } Catch (WrtDB::WidgetDAOReadOnly::Exception::DatabaseError) { LogError("Fail to get WidgetList"); - return FALSE; + return false; } printf("%3s %32s %16s %64s %16s %24s\n", @@ -345,7 +345,7 @@ int main(int argc, char* argv[]) } Catch(DPL::DB::SqlConnection::Exception::Base) { LogDebug("Fail to connect DB"); - return FALSE; + return false; } } DPL::OptionalString normal_str = DPL::FromUTF8String(temp_arg); @@ -398,7 +398,7 @@ int main(int argc, char* argv[]) if (SERVICE_ERROR_NONE != ret) { LogError("Fail to set debug mode [" << ret << "]"); service_destroy(serviceHandle); - return FALSE; + return false; } // set pid @@ -407,7 +407,7 @@ int main(int argc, char* argv[]) if (SERVICE_ERROR_NONE != ret) { LogError("Fail to set pid [" << ret << "]"); service_destroy(serviceHandle); - return FALSE; + return false; } ecore_init(); -- 2.7.4