From: Hermet Park <hermet@hermet.pe.kr>
Date: Thu, 28 Apr 2016 11:46:55 +0000 (+0900)
Subject: clean up code.
X-Git-Tag: submit/tizen/20160617.075742~51
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F28%2F67828%2F2;p=platform%2Fcore%2Fuifw%2Fui-viewmgr.git

clean up code.

This is first step for sorting up public interfaces.

no logic changes.

Change-Id: I9404aaeeb33441123f41f32baddf2ca3cfe0cec9
---

diff --git a/packaging/ui-viewmgr.spec b/packaging/ui-viewmgr.spec
index cafb173..6f4fde9 100644
--- a/packaging/ui-viewmgr.spec
+++ b/packaging/ui-viewmgr.spec
@@ -66,9 +66,9 @@ cp %{_builddir}/%{buildsubdir}/LICENSE %{buildroot}/usr/share/license/%{name}
 
 %files devel
 %defattr(-,root,root,-)
+%{_includedir}/ui-viewmgr/*.h
 %{_includedir}/ui-viewmgr/interface/*.h
 %{_includedir}/ui-viewmgr/efl/*.h
 %{_includedir}/ui-viewmgr/efl/mobile/*.h
-%{_includedir}/ui-viewmgr/*.h
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/ui-viewmgr.pc
diff --git a/src/examples/efl/main.h b/src/examples/efl/main.h
index 8b8b45c..019651a 100644
--- a/src/examples/efl/main.h
+++ b/src/examples/efl/main.h
@@ -15,7 +15,7 @@
  *
  */
 #include <dlog.h>
-#include "ui_viewmanager.h"
+#include <ui_viewmanager.h>
 
 //uncomment if you want debug
 #ifndef TIZEN_ENGINEER_MODE
@@ -31,8 +31,6 @@
 #define PACKAGE "ui-viewmgr"
 #endif
 
-using namespace efl_viewmgr;
-
 Evas_Object *create_landscape_content(Evas_Object *parent, const char *text, Evas_Smart_Cb prev_btn_clicked_cb, Evas_Smart_Cb next_btn_clicked_cb);
 Evas_Object *create_content(Evas_Object *parent, const char *text, Evas_Smart_Cb prev_btn_clicked_cb, Evas_Smart_Cb next_btn_clicked_cb);
 Evas_Object *create_scrolling_content(Evas_Object *parent);
diff --git a/src/include/CMakeLists.txt b/src/include/CMakeLists.txt
index d45646b..1b56e6c 100644
--- a/src/include/CMakeLists.txt
+++ b/src/include/CMakeLists.txt
@@ -4,6 +4,6 @@ INSTALL(
         PATTERN "interface/*.h"
         PATTERN "efl/*.h"
         PATTERN "efl/mobile/*.h"
-        PATTERN "ui_viewmanager.h"
+        PATTERN "*.h"
         )
 
diff --git a/src/include/efl/mobile/ui_app.h b/src/include/efl/mobile/ui_app.h
index 880dcd5..78f0361 100644
--- a/src/include/efl/mobile/ui_app.h
+++ b/src/include/efl/mobile/ui_app.h
@@ -14,17 +14,15 @@
  *  limitations under the License.
  *
  */
-#ifndef UI_APP_H
-#define UI_APP_H
+#ifndef _UI_APP_H_
+#define _UI_APP_H_
 
-#include "../ui_base_viewmanager.h"
-
-namespace efl_viewmgr
+namespace efl_viewmanager
 {
 
 class ui_viewmgr;
 
-class ui_app : public viewmgr::singleton<ui_app>
+class ui_app : public singleton<ui_app>
 {
 private:
 	ui_viewmgr *viewmgr;
@@ -53,4 +51,4 @@ public:
 
 }
 
-#endif /* UI_APP_H */
+#endif /* _UI_APP_H_ */
diff --git a/src/include/efl/mobile/ui_key_listener.h b/src/include/efl/mobile/ui_key_listener.h
index 9d96066..94fd96e 100644
--- a/src/include/efl/mobile/ui_key_listener.h
+++ b/src/include/efl/mobile/ui_key_listener.h
@@ -14,12 +14,10 @@
  *  limitations under the License.
  *
  */
-#ifndef UI_KEY_HANDLER_H
-#define UI_KEY_HANDLER_H
+#ifndef _UI_KEY_LISTENER_H_
+#define _UI_KEY_LISTENER_H_
 
-#include "../ui_base_viewmanager.h"
-
-namespace efl_viewmgr
+namespace efl_viewmanager
 {
 class ui_viewmgr;
 
@@ -34,4 +32,4 @@ public:
 
 }
 
-#endif /* UI_KEY_HANDLER_H */
+#endif /* _UI_KEY_LISTENER_H_ */
diff --git a/src/include/efl/mobile/ui_menu.h b/src/include/efl/mobile/ui_menu.h
index 1f47be2..aaa547c 100644
--- a/src/include/efl/mobile/ui_menu.h
+++ b/src/include/efl/mobile/ui_menu.h
@@ -14,12 +14,10 @@
  *  limitations under the License.
  *
  */
-#ifndef UI_MENU_H
-#define UI_MENU_H
+#ifndef _UI_MENU_H_
+#define _UI_MENU_H_
 
-#include "../ui_base_viewmanager.h"
-
-namespace efl_viewmgr
+namespace efl_viewmanager
 {
 class ui_view;
 
@@ -45,4 +43,4 @@ public:
 
 }
 
-#endif /* UI_MENU_H */
+#endif /* _UI_MENU_H_ */
diff --git a/src/include/efl/mobile/ui_mobile_viewmanager.h b/src/include/efl/mobile/ui_mobile_viewmanager.h
new file mode 100644
index 0000000..ac85cbc
--- /dev/null
+++ b/src/include/efl/mobile/ui_mobile_viewmanager.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *               http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+#ifndef _UI_MOBILE_VIEWMANAGER_H_
+#define _UI_MOBILE_VIEWMANAGER_H_
+
+#include <system_settings.h>
+
+#include "../ui_base_viewmanager.h"
+#include "ui_view.h"
+#include "ui_key_listener.h"
+#include "ui_viewmgr.h"
+#include "ui_menu.h"
+#include "ui_popup.h"
+#include "ui_app.h"
+
+#define UI_VIEWMGR ui_app::get_instance()->get_viewmgr()
+
+
+#endif /* UI_MOBILE_VIEWMANAGER_H */
diff --git a/src/include/efl/mobile/ui_popup.h b/src/include/efl/mobile/ui_popup.h
index 17e0e7c..40f695b 100644
--- a/src/include/efl/mobile/ui_popup.h
+++ b/src/include/efl/mobile/ui_popup.h
@@ -14,12 +14,10 @@
  *  limitations under the License.
  *
  */
-#ifndef UI_POPUP_H
-#define UI_POPUP_H
+#ifndef _UI_POPUP_H_
+#define _UI_POPUP_H_
 
-#include "../ui_base_viewmanager.h"
-
-namespace efl_viewmgr
+namespace efl_viewmanager
 {
 class ui_popup : public ui_base_overlay
 {
@@ -42,4 +40,4 @@ public:
 
 }
 
-#endif /* UI_POPUP_H */
+#endif /* _UI_POPUP_H_ */
diff --git a/src/include/efl/mobile/ui_view.h b/src/include/efl/mobile/ui_view.h
index 5f0c7aa..4fe6d2f 100644
--- a/src/include/efl/mobile/ui_view.h
+++ b/src/include/efl/mobile/ui_view.h
@@ -14,12 +14,10 @@
  *  limitations under the License.
  *
  */
-#ifndef UI_VIEW
-#define UI_VIEW
+#ifndef _UI_VIEW_H_
+#define _UI_VIEW_H_
 
-#include "../ui_base_viewmanager.h"
-
-namespace efl_viewmgr
+namespace efl_viewmanager
 {
 
 class ui_menu;
@@ -110,4 +108,4 @@ public:
 
 }
 
-#endif /* UI_VIEW */
+#endif /* _UI_VIEW_H_ */
diff --git a/src/include/efl/mobile/ui_viewmanager.h b/src/include/efl/mobile/ui_viewmanager.h
deleted file mode 100644
index 28535b3..0000000
--- a/src/include/efl/mobile/ui_viewmanager.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *               http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-#include <dlog.h>
-#include <system_settings.h>
-
-#ifdef  LOG_TAG
-#undef  LOG_TAG
-#endif
-#define LOG_TAG "UI_VIEWMGR"
-
-#include "ui_view.h"
-#include "ui_key_listener.h"
-#include "ui_viewmgr.h"
-#include "ui_menu.h"
-#include "ui_popup.h"
-#include "ui_app.h"
-
-#define UI_VIEWMGR efl_viewmgr::ui_app::get_instance()->get_viewmgr()
diff --git a/src/include/efl/mobile/ui_viewmgr.h b/src/include/efl/mobile/ui_viewmgr.h
index e85d158..eea491b 100644
--- a/src/include/efl/mobile/ui_viewmgr.h
+++ b/src/include/efl/mobile/ui_viewmgr.h
@@ -14,13 +14,10 @@
  *  limitations under the License.
  *
  */
-#ifndef UI_VIEWMGR_H
-#define UI_VIEWMGR_H
+#ifndef _UI_VIEWMGR_H_
+#define _UI_VIEWMGR_H_
 
-#include <Elementary.h>
-#include "../ui_base_viewmanager.h"
-
-namespace efl_viewmgr
+namespace efl_viewmanager
 {
 
 class ui_view;
@@ -38,4 +35,4 @@ protected:
 };
 }
 
-#endif /* UI_VIEWMGR_H */
+#endif /* _UI_VIEWMGR_H_ */
diff --git a/src/include/efl/ui_base_key_listener.h b/src/include/efl/ui_base_key_listener.h
index 1ddd81c..cc0849d 100644
--- a/src/include/efl/ui_base_key_listener.h
+++ b/src/include/efl/ui_base_key_listener.h
@@ -14,13 +14,10 @@
  *  limitations under the License.
  *
  */
-#ifndef UI_BASE_KEY_LISTENER_H
-#define UI_BASE_KEY_LISTENER_H
+#ifndef _UI_BASE_KEY_LISTENER_H_
+#define _UI_BASE_KEY_LISTENER_H_
 
-#include <Elementary.h>
-#include "../interface/ui_iface_viewmanager.h"
-
-namespace efl_viewmgr
+namespace efl_viewmanager
 {
 class ui_base_viewmgr;
 class ui_base_view;
@@ -44,4 +41,4 @@ public:
 
 }
 
-#endif /* UI_BASE_KEY_LISTENER_H */
+#endif /* _UI_BASE_KEY_LISTENER_H_ */
diff --git a/src/include/efl/ui_base_overlay.h b/src/include/efl/ui_base_overlay.h
index 84d3bf2..5e4abc4 100644
--- a/src/include/efl/ui_base_overlay.h
+++ b/src/include/efl/ui_base_overlay.h
@@ -14,19 +14,16 @@
  *  limitations under the License.
  *
  */
-#ifndef UI_BASE_OVERLAY_H
-#define UI_BASE_OVERLAY_H
+#ifndef _UI_BASE_OVERLAY_H_
+#define _UI_BASE_OVERLAY_H_
 
-#include <Elementary.h>
-#include "../interface/ui_iface_viewmanager.h"
-
-namespace efl_viewmgr
+namespace efl_viewmanager
 {
 
 class ui_base_viewmgr;
 class ui_base_view;
 
-class ui_base_overlay: public viewmgr::ui_iface_overlay<Evas_Object *, ui_base_viewmgr>
+class ui_base_overlay: public ui_iface_overlay<Evas_Object *, ui_base_viewmgr>
 {
 protected:
 	ui_base_overlay(ui_base_view *view);
@@ -35,4 +32,4 @@ protected:
 
 }
 
-#endif /* UI_BASE_OVERLAY_H */
+#endif /* _UI_BASE_OVERLAY_H_ */
diff --git a/src/include/efl/ui_base_view.h b/src/include/efl/ui_base_view.h
index 3978941..fb62a9d 100644
--- a/src/include/efl/ui_base_view.h
+++ b/src/include/efl/ui_base_view.h
@@ -14,13 +14,10 @@
  *  limitations under the License.
  *
  */
-#ifndef UI_BASE_VIEW_H
-#define UI_BASE_VIEW_H
+#ifndef _UI_BASE_VIEW_H_
+#define _UI_BASE_VIEW_H_
 
-#include <Elementary.h>
-#include "../interface/ui_iface_viewmanager.h"
-
-namespace efl_viewmgr
+namespace efl_viewmanager
 {
 
 /**
@@ -35,7 +32,7 @@ namespace efl_viewmgr
  *  @warning When the transitions are finished, the view must to call ui_iface_viewmgr :: _push_finished(), ui_iface_viewmgr :: _pop_finished() in order that
  *           The ui_iface_viewmgr keeps the view states exactly.
  */
-class ui_base_view: public viewmgr::ui_iface_view<Evas_Object *, ui_base_viewmgr>
+class ui_base_view: public ui_iface_view<Evas_Object *, ui_base_viewmgr>
 {
 	friend class ui_base_viewmgr;
 
@@ -100,4 +97,4 @@ public:
 
 }
 
-#endif /* UI_BASE_VIEW_H */
+#endif /* _UI_BASE_VIEW_H_ */
diff --git a/src/include/efl/ui_base_viewmanager.h b/src/include/efl/ui_base_viewmanager.h
index e71d6be..2115d6f 100644
--- a/src/include/efl/ui_base_viewmanager.h
+++ b/src/include/efl/ui_base_viewmanager.h
@@ -14,16 +14,18 @@
  *  limitations under the License.
  *
  */
-#include <dlog.h>
-
-#ifdef  LOG_TAG
-#undef  LOG_TAG
-#endif
-#define LOG_TAG "UI_VIEWMGR"
-
-#define UI_BASE_VIEWMGR efl_viewmgr::ui_base_viewmgr::get_instance()
+#ifndef _UI_BASE_VIEWMANAGER_H_
+#define _UI_BASE_VIEWMANAGER_H_
 
+#include <Elementary.h>
+#include "../interface/ui_iface_viewmanager.h"
 #include "ui_base_overlay.h"
+#include "ui_base_key_listener.h"
 #include "ui_base_viewmgr.h"
 #include "ui_base_view.h"
-#include "ui_base_key_listener.h"
+
+#define UI_BASE_VIEWMGR ui_base_viewmgr::get_instance()
+
+using namespace efl_viewmanager;
+
+#endif /* UI_BASE_VIEWMANAGER_H */
diff --git a/src/include/efl/ui_base_viewmgr.h b/src/include/efl/ui_base_viewmgr.h
index f33a8e7..729d9a2 100644
--- a/src/include/efl/ui_base_viewmgr.h
+++ b/src/include/efl/ui_base_viewmgr.h
@@ -14,21 +14,17 @@
  *  limitations under the License.
  *
  */
-#ifndef UI_BASE_VIEWMGR_H
-#define UI_BASE_VIEWMGR_H
+#ifndef _UI_BASE_VIEWMGR_H_
+#define _UI_BASE_VIEWMGR_H_
 
 #include <map>
-#include <Elementary.h>
-#include "../interface/ui_iface_viewmanager.h"
-#include "ui_base_key_listener.h"
-
 
 //FIXME: ??
 #ifndef Elm_Conformant
 #define Elm_Conformant Evas_Object
 #endif
 
-namespace efl_viewmgr
+namespace efl_viewmanager
 {
 
 class ui_base_view;
@@ -44,7 +40,7 @@ class ui_base_view;
  *
  *  @warning viewmgr will remove all containing views when it's destroyed.
  */
-class ui_base_viewmgr: public viewmgr::ui_iface_viewmgr<Evas_Object *, ui_base_viewmgr>
+class ui_base_viewmgr: public ui_iface_viewmgr<Evas_Object *, ui_base_viewmgr>
 {
 	friend class ui_base_view;
 
@@ -239,4 +235,4 @@ public:
 };
 }
 
-#endif /* UI_BASE_VIEWMGR_H */
+#endif /* _UI_BASE_VIEWMGR_H_ */
diff --git a/src/include/interface/ui_iface_overlay.h b/src/include/interface/ui_iface_overlay.h
index bb9ac53..076c21b 100644
--- a/src/include/interface/ui_iface_overlay.h
+++ b/src/include/interface/ui_iface_overlay.h
@@ -14,10 +14,10 @@
  *  limitations under the License.
  *
  */
-#ifndef UI_IFACE_OVERLAY_H
-#define UI_IFACE_OVERLAY_H
+#ifndef _UI_IFACE_OVERLAY_H_
+#define _UI_IFACE_OVERLAY_H_
 
-namespace viewmgr
+namespace ui_viewmanager
 {
 
 template<typename T, typename T2>
@@ -92,4 +92,4 @@ void ui_iface_overlay<T, T2>::on_back()
 
 }
 
-#endif /* UI_IFACE_OVERLAY_H */
+#endif /* _UI_IFACE_OVERLAY_H_ */
diff --git a/src/include/interface/ui_iface_rotatable.h b/src/include/interface/ui_iface_rotatable.h
index f9f5dea..21f582b 100644
--- a/src/include/interface/ui_iface_rotatable.h
+++ b/src/include/interface/ui_iface_rotatable.h
@@ -14,10 +14,10 @@
  *  limitations under the License.
  *
  */
-#ifndef UI_IFACE_ROTATABLE_H_
-#define UI_IFACE_ROTATABLE_H_
+#ifndef _UI_IFACE_ROTATABLE_H_
+#define _UI_IFACE_ROTATABLE_H_
 
-namespace viewmgr
+namespace ui_viewmanager
 {
 class ui_iface_rotatable
 {
@@ -36,4 +36,4 @@ public:
 
 }
 
-#endif /* UI_IFACE_ROTATABLE_H_ */
+#endif /* _UI_IFACE_ROTATABLE_H_ */
diff --git a/src/include/interface/ui_iface_singleton.h b/src/include/interface/ui_iface_singleton.h
index bb6f6b0..fe944ef 100644
--- a/src/include/interface/ui_iface_singleton.h
+++ b/src/include/interface/ui_iface_singleton.h
@@ -1,7 +1,7 @@
-#ifndef UI_IFACE_SINGLETON_H
-#define UI_IFACE_SINGLETON_H
+#ifndef _UI_IFACE_SINGLETON_H_
+#define _UI_IFACE_SINGLETON_H_
 
-namespace viewmgr
+namespace ui_viewmanager
 {
 
 template<typename T>
@@ -42,4 +42,4 @@ T* singleton<T>::get_instance()
 
 }
 
-#endif /* UI_IFACE_SINGLETON_H_ */
+#endif /* _UI_IFACE_SINGLETON_H_ */
diff --git a/src/include/interface/ui_iface_view.h b/src/include/interface/ui_iface_view.h
index 7853e70..4deda6a 100644
--- a/src/include/interface/ui_iface_view.h
+++ b/src/include/interface/ui_iface_view.h
@@ -14,15 +14,14 @@
  *  limitations under the License.
  *
  */
-#ifndef UI_IFACE_VIEW_H_
-#define UI_IFACE_VIEW_H_
+#ifndef _UI_IFACE_VIEW_H_
+#define _UI_IFACE_VIEW_H_
 
 #include <string>
 
 using namespace std;
 
-namespace viewmgr {
-
+namespace ui_viewmanager {
 
 template<typename T, typename T2>
 class ui_iface_viewmgr;
@@ -405,4 +404,4 @@ void ui_iface_view<T, T2>::on_back()
 
 }
 
-#endif /* UI_IFACE_VIEW_H_ */
+#endif /* _UI_IFACE_VIEW_H_ */
diff --git a/src/include/interface/ui_iface_viewmanager.h b/src/include/interface/ui_iface_viewmanager.h
index 3b54dc6..35bcd7d 100644
--- a/src/include/interface/ui_iface_viewmanager.h
+++ b/src/include/interface/ui_iface_viewmanager.h
@@ -14,8 +14,8 @@
  *  limitations under the License.
  *
  */
-#ifndef UI_IFACE_VIEWMANAGER_H_
-#define UI_IFACE_VIEWMANAGER_H_
+#ifndef _UI_IFACE_VIEWMANAGER_H_
+#define _UI_IFACE_VIEWMANAGER_H_
 
 #include <app.h>
 #include <dlog.h>
@@ -51,4 +51,6 @@ enum ui_view_state
 #include "ui_iface_view.h"
 #include "ui_iface_viewmgr.h"
 
+using namespace ui_viewmanager;
+
 #endif /* UI_IFACE_VIEWMANAGER_H */
diff --git a/src/include/interface/ui_iface_viewmgr.h b/src/include/interface/ui_iface_viewmgr.h
index af03217..0da1bc8 100644
--- a/src/include/interface/ui_iface_viewmgr.h
+++ b/src/include/interface/ui_iface_viewmgr.h
@@ -14,14 +14,14 @@
  *  limitations under the License.
  *
  */
-#ifndef UI_IFACE_VIEWMGR_H_
-#define UI_IFACE_VIEWMGR_H_
+#ifndef _UI_IFACE_VIEWMGR_H_
+#define _UI_IFACE_VIEWMGR_H_
 
 #include <list>
 
 using namespace std;
 
-namespace viewmgr {
+namespace ui_viewmanager {
 
 template<typename T, typename T2>
 class ui_iface_view;
@@ -661,4 +661,4 @@ unsigned int ui_iface_viewmgr<T, T2>::get_view_count()
 
 }
 
-#endif /* UI_IFACE_VIEWMGR_H_ */
+#endif /* _UI_IFACE_VIEWMGR_H_ */
diff --git a/src/include/ui_viewmanager.h b/src/include/ui_viewmanager.h
index 632ebb6..92a7067 100644
--- a/src/include/ui_viewmanager.h
+++ b/src/include/ui_viewmanager.h
@@ -1 +1,17 @@
-#include "efl/mobile/ui_viewmanager.h"
+/*
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *               http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+#include "efl/mobile/ui_mobile_viewmanager.h"
diff --git a/src/lib/efl/mobile/ui_app.cpp b/src/lib/efl/mobile/ui_app.cpp
index 67a27ac..83343ea 100644
--- a/src/lib/efl/mobile/ui_app.cpp
+++ b/src/lib/efl/mobile/ui_app.cpp
@@ -14,10 +14,7 @@
  *  limitations under the License.
  *
  */
-#include "../../../include/efl/mobile/ui_viewmanager.h"
-
-using namespace efl_viewmgr;
-using namespace viewmgr;
+#include "../../../include/efl/mobile/ui_mobile_viewmanager.h"
 
 static bool app_create(void *data)
 {
diff --git a/src/lib/efl/mobile/ui_key_listener.cpp b/src/lib/efl/mobile/ui_key_listener.cpp
index 057cc2d..2011271 100644
--- a/src/lib/efl/mobile/ui_key_listener.cpp
+++ b/src/lib/efl/mobile/ui_key_listener.cpp
@@ -14,10 +14,7 @@
  *  limitations under the License.
  *
  */
-#include "../../../include/efl/mobile/ui_viewmanager.h"
-
-using namespace efl_viewmgr;
-using namespace viewmgr;
+#include "../../../include/efl/mobile/ui_mobile_viewmanager.h"
 
 static const char *KEY_MENU = "XF86Menu";
 static const char *KEY_MENU2 = "XF86Send";
diff --git a/src/lib/efl/mobile/ui_menu.cpp b/src/lib/efl/mobile/ui_menu.cpp
index 9529b25..81a791a 100644
--- a/src/lib/efl/mobile/ui_menu.cpp
+++ b/src/lib/efl/mobile/ui_menu.cpp
@@ -14,9 +14,7 @@
  *  limitations under the License.
  *
  */
-#include "../../../include/efl/mobile/ui_viewmanager.h"
-
-using namespace efl_viewmgr;
+#include "../../../include/efl/mobile/ui_mobile_viewmanager.h"
 
 static void ctxpopup_dismissed_cb(void *data, Evas_Object *obj, void *event_info)
 {
diff --git a/src/lib/efl/mobile/ui_popup.cpp b/src/lib/efl/mobile/ui_popup.cpp
index d3e6150..7a83feb 100644
--- a/src/lib/efl/mobile/ui_popup.cpp
+++ b/src/lib/efl/mobile/ui_popup.cpp
@@ -14,9 +14,7 @@
  *  limitations under the License.
  *
  */
-#include "../../../include/efl/mobile/ui_viewmanager.h"
-
-using namespace efl_viewmgr;
+#include "../../../include/efl/mobile/ui_mobile_viewmanager.h"
 
 static bool update_popup(ui_popup *popup)
 {
diff --git a/src/lib/efl/mobile/ui_view.cpp b/src/lib/efl/mobile/ui_view.cpp
index 1fb61ae..6fb430c 100644
--- a/src/lib/efl/mobile/ui_view.cpp
+++ b/src/lib/efl/mobile/ui_view.cpp
@@ -14,13 +14,10 @@
  *  limitations under the License.
  *
  */
-#include "../../../include/efl/mobile/ui_viewmanager.h"
+#include "../../../include/efl/mobile/ui_mobile_viewmanager.h"
 
 #define DEFAULT_GROUP "tizen_view/default"
 
-using namespace efl_viewmgr;
-using namespace viewmgr;
-
 typedef list<ui_popup*>::reverse_iterator popup_ritr;
 
 #define LAYOUT_VALIDATE() if (!layout) \
diff --git a/src/lib/efl/mobile/ui_viewmgr.cpp b/src/lib/efl/mobile/ui_viewmgr.cpp
index 4d2d208..96ac3db 100644
--- a/src/lib/efl/mobile/ui_viewmgr.cpp
+++ b/src/lib/efl/mobile/ui_viewmgr.cpp
@@ -14,10 +14,7 @@
  *  limitations under the License.
  *
  */
-#include "../../../include/efl/mobile/ui_viewmanager.h"
-
-using namespace efl_viewmgr;
-using namespace viewmgr;
+#include "../../../include/efl/mobile/ui_mobile_viewmanager.h"
 
 ui_viewmgr::ui_viewmgr(const char *pkg)
 		: ui_base_viewmgr(pkg, new ui_key_listener(this))
diff --git a/src/lib/efl/ui_base_key_listener.cpp b/src/lib/efl/ui_base_key_listener.cpp
index 68fe958..19d29d6 100644
--- a/src/lib/efl/ui_base_key_listener.cpp
+++ b/src/lib/efl/ui_base_key_listener.cpp
@@ -16,9 +16,6 @@
  */
 #include "../../include/efl/ui_base_viewmanager.h"
 
-using namespace efl_viewmgr;
-using namespace viewmgr;
-
 static const char *KEY_BACK = "XF86Back";
 static const char *KEY_BACK2 = "XF86Stop";
 
diff --git a/src/lib/efl/ui_base_overlay.cpp b/src/lib/efl/ui_base_overlay.cpp
index 7669fe1..fc117e9 100644
--- a/src/lib/efl/ui_base_overlay.cpp
+++ b/src/lib/efl/ui_base_overlay.cpp
@@ -16,9 +16,6 @@
  */
 #include "../../include/efl/ui_base_viewmanager.h"
 
-using namespace efl_viewmgr;
-using namespace viewmgr;
-
 ui_base_overlay::ui_base_overlay(ui_base_view *view)
 		: ui_iface_overlay(view)
 {
diff --git a/src/lib/efl/ui_base_view.cpp b/src/lib/efl/ui_base_view.cpp
index 4774364..51c6a4e 100644
--- a/src/lib/efl/ui_base_view.cpp
+++ b/src/lib/efl/ui_base_view.cpp
@@ -16,9 +16,6 @@
  */
 #include "../../include/efl/ui_base_viewmanager.h"
 
-using namespace efl_viewmgr;
-using namespace viewmgr;
-
 static void content_del_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
 	ui_base_view *view = static_cast<ui_base_view *>(data);
diff --git a/src/lib/efl/ui_base_viewmgr.cpp b/src/lib/efl/ui_base_viewmgr.cpp
index 707f206..b68de7d 100644
--- a/src/lib/efl/ui_base_viewmgr.cpp
+++ b/src/lib/efl/ui_base_viewmgr.cpp
@@ -16,9 +16,6 @@
  */
 #include "../../include/efl/ui_base_viewmanager.h"
 
-using namespace efl_viewmgr;
-using namespace viewmgr;
-
 bool ui_base_viewmgr::create_base_layout(Elm_Scroller *scroller, const char *style)
 {
 	char edj_path[PATH_MAX];