From 6937f422d0272135931e8e1ebd903764fcdd1bf6 Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Sat, 20 Feb 2016 10:44:49 +0900 Subject: [PATCH] update namespace. interface -> viewmgr efl -> efl_viewmgr Change-Id: Ica7e4484a40ee8b1269cd383245f0d979da963f3 --- inc/main.h | 2 +- src/efl/mobile/ui_basic_key_listener.cpp | 3 ++- src/efl/mobile/ui_basic_key_listener.h | 2 +- src/efl/mobile/ui_basic_view.cpp | 3 ++- src/efl/mobile/ui_basic_view.h | 2 +- src/efl/ui_controller.cpp | 3 ++- src/efl/ui_controller.h | 4 ++-- src/efl/ui_key_listener.cpp | 3 ++- src/efl/ui_key_listener.h | 2 +- src/efl/ui_view.cpp | 3 ++- src/efl/ui_view.h | 4 ++-- src/efl/ui_viewmgr.cpp | 3 ++- src/efl/ui_viewmgr.h | 4 ++-- src/interface/ui_controller_interface.cpp | 2 ++ src/interface/ui_controller_interface.h | 4 ++++ src/interface/ui_view_interface.cpp | 2 ++ src/interface/ui_view_interface.h | 4 ++++ src/interface/ui_viewmgr_interface.cpp | 2 ++ src/interface/ui_viewmgr_interface.h | 4 ++++ 19 files changed, 40 insertions(+), 16 deletions(-) diff --git a/inc/main.h b/inc/main.h index 783f495..7de920e 100644 --- a/inc/main.h +++ b/inc/main.h @@ -33,7 +33,7 @@ #define PACKAGE "org.tizen.ui-viewmgr" #endif -using namespace efl; +using namespace efl_viewmgr; typedef struct appdata { ui_viewmgr *viewmgr; diff --git a/src/efl/mobile/ui_basic_key_listener.cpp b/src/efl/mobile/ui_basic_key_listener.cpp index 5fe7c98..993aca4 100644 --- a/src/efl/mobile/ui_basic_key_listener.cpp +++ b/src/efl/mobile/ui_basic_key_listener.cpp @@ -16,7 +16,8 @@ */ #include "ui_viewmanager.h" -using namespace efl; +using namespace efl_viewmgr; +using namespace viewmgr; static const char *KEY_BACK = "XF86Back"; static const char *KEY_MENU = "XF86Menu"; diff --git a/src/efl/mobile/ui_basic_key_listener.h b/src/efl/mobile/ui_basic_key_listener.h index 58d6ff8..203ebb5 100644 --- a/src/efl/mobile/ui_basic_key_listener.h +++ b/src/efl/mobile/ui_basic_key_listener.h @@ -19,7 +19,7 @@ #include "../ui_viewmanager.h" -namespace efl +namespace efl_viewmgr { class ui_viewmgr; diff --git a/src/efl/mobile/ui_basic_view.cpp b/src/efl/mobile/ui_basic_view.cpp index 8fca093..7d060c7 100644 --- a/src/efl/mobile/ui_basic_view.cpp +++ b/src/efl/mobile/ui_basic_view.cpp @@ -20,7 +20,8 @@ #define EDJ_PATH "/opt/usr/apps/org.tizen.ui-viewmgr/res/ui-viewmgr.edj" #define GROUP "elm/layout/tizen_view/default" -using namespace efl; +using namespace efl_viewmgr; +using namespace viewmgr; bool ui_basic_view::destroy_layout() { diff --git a/src/efl/mobile/ui_basic_view.h b/src/efl/mobile/ui_basic_view.h index 6d81437..06268a6 100644 --- a/src/efl/mobile/ui_basic_view.h +++ b/src/efl/mobile/ui_basic_view.h @@ -19,7 +19,7 @@ #include "../ui_viewmanager.h" -namespace efl +namespace efl_viewmgr { class ui_basic_view: public ui_view diff --git a/src/efl/ui_controller.cpp b/src/efl/ui_controller.cpp index 4f16828..dfb9f36 100644 --- a/src/efl/ui_controller.cpp +++ b/src/efl/ui_controller.cpp @@ -16,7 +16,8 @@ */ #include "ui_viewmanager.h" -using namespace efl; +using namespace efl_viewmgr; +using namespace viewmgr; ui_view * ui_controller::get_view() { diff --git a/src/efl/ui_controller.h b/src/efl/ui_controller.h index 9228b10..485b3c0 100644 --- a/src/efl/ui_controller.h +++ b/src/efl/ui_controller.h @@ -19,9 +19,9 @@ #include "../interface/ui_viewmanager_interface.h" -namespace efl +namespace efl_viewmgr { -class ui_controller: public ui_controller_interface +class ui_controller: public viewmgr::ui_controller_interface { public: virtual ~ui_controller(); diff --git a/src/efl/ui_key_listener.cpp b/src/efl/ui_key_listener.cpp index ec33380..5b12bef 100644 --- a/src/efl/ui_key_listener.cpp +++ b/src/efl/ui_key_listener.cpp @@ -16,7 +16,8 @@ */ #include "ui_viewmanager.h" -using namespace efl; +using namespace efl_viewmgr; +using namespace viewmgr; static const char *KEY_BACK = "XF86Back"; diff --git a/src/efl/ui_key_listener.h b/src/efl/ui_key_listener.h index 7d94ac5..7921b57 100644 --- a/src/efl/ui_key_listener.h +++ b/src/efl/ui_key_listener.h @@ -20,7 +20,7 @@ #include #include "../interface/ui_viewmanager_interface.h" -namespace efl +namespace efl_viewmgr { class ui_viewmgr; diff --git a/src/efl/ui_view.cpp b/src/efl/ui_view.cpp index a14f74b..22c395e 100644 --- a/src/efl/ui_view.cpp +++ b/src/efl/ui_view.cpp @@ -16,7 +16,8 @@ */ #include "ui_viewmanager.h" -using namespace efl; +using namespace efl_viewmgr; +using namespace viewmgr; ui_view::ui_view(ui_controller *controller, const char *name) : ui_view_interface(controller, name) diff --git a/src/efl/ui_view.h b/src/efl/ui_view.h index 6a16b5c..5b6c0eb 100644 --- a/src/efl/ui_view.h +++ b/src/efl/ui_view.h @@ -23,11 +23,11 @@ #define CONVERT_TO_EO(T) static_cast((T)) #define CONVERT_TO_T(EO) static_cast((EO)) -namespace efl +namespace efl_viewmgr { class ui_controller; -class ui_view: public ui_view_interface +class ui_view: public viewmgr::ui_view_interface { friend class ui_viewmgr; diff --git a/src/efl/ui_viewmgr.cpp b/src/efl/ui_viewmgr.cpp index 20caf98..020ffc6 100644 --- a/src/efl/ui_viewmgr.cpp +++ b/src/efl/ui_viewmgr.cpp @@ -16,7 +16,8 @@ */ #include "ui_viewmanager.h" -using namespace efl; +using namespace efl_viewmgr; +using namespace viewmgr; bool ui_viewmgr::set_indicator(ui_view_indicator indicator) { diff --git a/src/efl/ui_viewmgr.h b/src/efl/ui_viewmgr.h index 2a9c23a..f19190f 100644 --- a/src/efl/ui_viewmgr.h +++ b/src/efl/ui_viewmgr.h @@ -21,12 +21,12 @@ #include "../interface/ui_viewmanager_interface.h" #include "ui_key_listener.h" -namespace efl +namespace efl_viewmgr { class ui_view; -class ui_viewmgr: public ui_viewmgr_interface +class ui_viewmgr: public viewmgr::ui_viewmgr_interface { friend class ui_view; diff --git a/src/interface/ui_controller_interface.cpp b/src/interface/ui_controller_interface.cpp index c62bf20..c9a952b 100644 --- a/src/interface/ui_controller_interface.cpp +++ b/src/interface/ui_controller_interface.cpp @@ -16,6 +16,8 @@ */ #include "ui_viewmanager_interface.h" +using namespace viewmgr; + void ui_controller_interface::set_view(ui_view_interface *view) { if (this->view) diff --git a/src/interface/ui_controller_interface.h b/src/interface/ui_controller_interface.h index 28ea496..cd7a806 100644 --- a/src/interface/ui_controller_interface.h +++ b/src/interface/ui_controller_interface.h @@ -17,6 +17,8 @@ #ifndef UI_CONTROLLER_INTERFACE_H_ #define UI_CONTROLLER_INTERFACE_H_ +namespace viewmgr { + class ui_view_interface; /** @@ -110,4 +112,6 @@ public: virtual void destroy() = 0; }; +} + #endif /* UI_CONTROLLER_INTERFACE_H_ */ diff --git a/src/interface/ui_view_interface.cpp b/src/interface/ui_view_interface.cpp index fad60b2..6fd0436 100644 --- a/src/interface/ui_view_interface.cpp +++ b/src/interface/ui_view_interface.cpp @@ -16,6 +16,8 @@ */ #include "ui_viewmanager_interface.h" +using namespace viewmgr; + void ui_view_interface::set_event_block(bool block) { this->event_block = block; diff --git a/src/interface/ui_view_interface.h b/src/interface/ui_view_interface.h index 8d10364..8250834 100644 --- a/src/interface/ui_view_interface.h +++ b/src/interface/ui_view_interface.h @@ -23,6 +23,8 @@ using namespace std; typedef void* T; +namespace viewmgr { + class ui_viewmgr_interface; class ui_controller_interface; @@ -255,4 +257,6 @@ public: } }; +} + #endif /* UI_VIEW_INTERFACE_H_ */ diff --git a/src/interface/ui_viewmgr_interface.cpp b/src/interface/ui_viewmgr_interface.cpp index 392ab9a..14e544e 100644 --- a/src/interface/ui_viewmgr_interface.cpp +++ b/src/interface/ui_viewmgr_interface.cpp @@ -16,6 +16,8 @@ */ #include "ui_viewmanager_interface.h" +using namespace viewmgr; + bool ui_viewmgr_interface::connect_view(ui_view_interface *view) { if (view->viewmgr) diff --git a/src/interface/ui_viewmgr_interface.h b/src/interface/ui_viewmgr_interface.h index ed025fd..986826c 100644 --- a/src/interface/ui_viewmgr_interface.h +++ b/src/interface/ui_viewmgr_interface.h @@ -21,6 +21,8 @@ using namespace std; +namespace viewmgr { + class ui_view_interface; /** @@ -245,4 +247,6 @@ public: }; +} + #endif /* UI_VIEWMGR_INTERFACE_H_ */ -- 2.7.4