update namespace.

interface -> viewmgr
efl -> efl_viewmgr

Change-Id: Ica7e4484a40ee8b1269cd383245f0d979da963f3

diff --git a/inc/main.h b/inc/main.h
index 783f49509b7866ccca86d910e1881b2cb301e281..7de920e73f478c5efc20c16b74048343be17d11c 100644 (file)
--- 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 5fe7c98d027a1fe86726dbb34c99de5cb6120b99..993aca4789a61720de539bd8f1d267b0355c64da 100644 (file)
--- 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 58d6ff8d02bba1fa6b5904f5f50cabc7476663fb..203ebb54f5ac69d2f82ba6386b36697106f77408 100644 (file)
--- 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 8fca093794873671a68db34e8d947300321a11e3..7d060c7cc9dafa8fe030bfd3a11165b86f68f8ac 100644 (file)
--- 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 6d81437b358f10ec68c4e33d81a7c631e22400c1..06268a6e4ab174616c40ae91ec8843195ba7b882 100644 (file)
--- 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 4f168282fea7fcea06b9333d42a6608495ba8f0a..dfb9f3676c003e9cc1eb7946153db083d2437f1b 100644 (file)
--- 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 9228b10621a3d8e6791c520f8fa7b0448b4c4614..485b3c038ae35c7e6cdb572dd464e8b18ad2030f 100644 (file)
--- 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 ec333806aeb7ebeaae2429db4988f7a337a5f2f2..5b12befd94cd24119848afbac6959938267ddefe 100644 (file)
--- 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 7d94ac59c065cf10c9f90b2357e3e767fa1f2383..7921b5763db5409a8f4f24d4d8c913cbc3559ae3 100644 (file)
--- a/src/efl/ui_key_listener.h
+++ b/src/efl/ui_key_listener.h
@@ -20,7 +20,7 @@
 #include <Elementary.h>
 #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 a14f74b12d8359888924161ad9c27d1fa0ec3ed8..22c395ed9220b86a85d73f1f5afa27717c9f2fd0 100644 (file)
--- 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 6a16b5c57e68bc9ef4753d186a2eb320f867ed2d..5b6c0ebf0f842372213b111521de532707d7dba0 100644 (file)
--- a/src/efl/ui_view.h
+++ b/src/efl/ui_view.h
@@ -23,11 +23,11 @@
 #define CONVERT_TO_EO(T) static_cast<Evas_Object *>((T))
 #define CONVERT_TO_T(EO) static_cast<T>((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 20caf98d868785cf6bf1a1998e315752ca50ba33..020ffc61dbd08925285396217831ba102135851a 100644 (file)
--- 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 2a9c23a75d5a47336e3469d9b2af4e148fd62e3d..f19190f049309cbe550132fb831da6cd761bddf2 100644 (file)
--- 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 c62bf203687e4499bd1060cc59d0fbd37c9ba38e..c9a952b3547b4258b506f1d233e08a00d58330cd 100644 (file)
--- 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 28ea496a7d83a806584e3e563856fba0ae0e8e7a..cd7a806e6f392f0d93b8752d3363817289b8ded6 100644 (file)
--- 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 fad60b2616875307bf51ffd77ff73732e8a425c4..6fd0436c1ec3f49c16601e2a72c4af7263bda5b7 100644 (file)
--- 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 8d10364715b3bbc50913fdc9e2dbd9d92736dc8a..8250834d021b22b21456c3312640938a8edbd421 100644 (file)
--- 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 392ab9af85b88b5155945ac1b4e09bb3c9638926..14e544e895f917b5516626e6c1626da3b3409634 100644 (file)
--- 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 ed025fd9d2eaead899d5a4b11843ad103c675350..986826c49da51ff297c65ebbbee13cbb94758dd4 100644 (file)
--- 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_ */