remove explicit namespace usage.

Removed explicit namespace usage in open headers.
This won't make apps in trouble if they were using duplicated name classes among different libraries.

Let apps choose those classes specifically by themseleves.

Change-Id: I620b7183a93ee14e021ed6a1741a556bea83a89e

diff --git a/src/examples/efl/cpp/main.h b/src/examples/efl/cpp/main.h
index 814b83c7d6c9c1a1002c0c2f12f19223f72d4965..fd553b16633927d9dac145f7e2be310707e87cdb 100644 (file)
--- a/src/examples/efl/cpp/main.h
+++ b/src/examples/efl/cpp/main.h
@@ -31,6 +31,8 @@
 #define PACKAGE "ui-viewmgr"
 #endif
 
+using namespace efl_viewmanager;
+
 Evas_Object *createLandscapeContent(Evas_Object *parent, const char *text, Evas_Smart_Cb _prevBtnClickedCb, Evas_Smart_Cb _nextBtnClickedCb);
 Evas_Object *createContent(Evas_Object *parent, const char *text, Evas_Smart_Cb _prevBtnClickedCb, Evas_Smart_Cb _nexBtnClickedCb);
 Evas_Object *createScrollingContent(Evas_Object *parent);

diff --git a/src/include/efl/UiBaseOverlay.h b/src/include/efl/UiBaseOverlay.h
index 9538e9339d9cecb58b333722b082ff512c824721..ce8a413e1b7cd7e3bd0216d1456e398cb274faf6 100644 (file)
--- a/src/include/efl/UiBaseOverlay.h
+++ b/src/include/efl/UiBaseOverlay.h
@@ -32,7 +32,7 @@ class UiBaseView;
  *         UiBaseView. UiBaseOverlay is nothing more than UiIfaceOverlay in behavior perspective. It just comes out with renaming class for adapting with
  *         other EFL base classes.
  */
-class UiBaseOverlay: public UiIfaceOverlay
+class UiBaseOverlay: public ui_viewmanager::UiIfaceOverlay
 {
 protected:
        /**

diff --git a/src/include/efl/UiBaseView.h b/src/include/efl/UiBaseView.h
index 545ba812df8661398779456a9cd6a4df573ed0af..72ddf853d46823b13530ab2f1c436b4a814585cb 100644 (file)
--- a/src/include/efl/UiBaseView.h
+++ b/src/include/efl/UiBaseView.h
@@ -28,7 +28,7 @@ namespace efl_viewmanager
  *  @brief This is a base class of EFL view. Typically, this view extends UiIfaceView and implements basic behaviors for EFL view in all profiles.
  *         A view must have one Evas_Object content instance which represents a view for a current screen.
  */
-class UiBaseView: public UiIfaceView
+class UiBaseView: public ui_viewmanager::UiIfaceView
 {
 public:
        /**

diff --git a/src/include/efl/UiBaseViewManager.h b/src/include/efl/UiBaseViewManager.h
index 5f68d9af7d7e73cf4df31e302d96265ca7a93a25..cc28255d2b0da2047d6756cb8417e45df5ebd05b 100644 (file)
--- a/src/include/efl/UiBaseViewManager.h
+++ b/src/include/efl/UiBaseViewManager.h
@@ -28,8 +28,6 @@
 #include "UiBaseViewmgr.h"
 #include "UiBaseView.h"
 
-#define UI_BASE_VIEWMGR dynamic_cast<UiBaseViewmgr *>(UiIfaceViewmgr::getInstance())
-
-using namespace efl_viewmanager;
+#define UI_BASE_VIEWMGR dynamic_cast<efl_viewmanager::UiBaseViewmgr *>(ui_viewmanager::UiIfaceViewmgr::getInstance())
 
 #endif /* UI_BASE_VIEWMANAGER_H */

diff --git a/src/include/efl/UiBaseViewmgr.h b/src/include/efl/UiBaseViewmgr.h
index 37ebbe717512b0f0beb4f3f4c07c81f12b84e515..8b89e44787360c2d72905eb9bcb26cea213b80cd 100644 (file)
--- a/src/include/efl/UiBaseViewmgr.h
+++ b/src/include/efl/UiBaseViewmgr.h
@@ -35,7 +35,7 @@ class UiBaseView;
  *
  *  @warning viewmgr will remove its window, conformant and default layout when it's destroyed.
  */
-class UiBaseViewmgr: public UiIfaceViewmgr
+class UiBaseViewmgr: public ui_viewmanager::UiIfaceViewmgr
 {
 public:
        /**

diff --git a/src/include/efl/mobile/UiApp.h b/src/include/efl/mobile/UiApp.h
index da0b436ad421df8e2b6a643c89bae1b09aa6bb26..ab8febd0c795e94fe5785f4a0871b5605972a384 100644 (file)
--- a/src/include/efl/mobile/UiApp.h
+++ b/src/include/efl/mobile/UiApp.h
@@ -33,7 +33,7 @@ class UiViewmgr;
  *         interfaces such as low_baterry(), low_meomory(), lang_changed(), region_changed() and so on. UiIfaceApp create an unique UiViewmgr instance
  *         internally, and manage its life.
 */
-class UiApp : public UiIfaceApp
+class UiApp : public ui_viewmanager::UiIfaceApp
 {
 public:
        /**

diff --git a/src/include/efl/mobile/UiKeyListener.h b/src/include/efl/mobile/UiKeyListener.h
index 306a4ce2212955c7995dd2ef96919901866c3f08..d77faebc7467b12af037a4238df29c17c1e77912 100644 (file)
--- a/src/include/efl/mobile/UiKeyListener.h
+++ b/src/include/efl/mobile/UiKeyListener.h
@@ -29,7 +29,7 @@ class UiViewmgr;
  *  @brief This class extends to UiBaseKeyListener to support an additional HW Menu key for mobile profile. Basically, HW Menu key will be propagated to
  *         the top view and UiView::on_menu() will be triggered.
   */
-class UiKeyListener : public UiBaseKeyListener
+class UiKeyListener : public efl_viewmanager::UiBaseKeyListener
 {
 public:
        /**

diff --git a/src/include/efl/mobile/UiMenu.h b/src/include/efl/mobile/UiMenu.h
index d2e7703f55513ac44d93f1c440405e6e2af8847d..99d9f3f8a0097594a944aba0d47d25ec5b42bc7a 100644 (file)
--- a/src/include/efl/mobile/UiMenu.h
+++ b/src/include/efl/mobile/UiMenu.h
@@ -33,7 +33,7 @@ class UiView;
  *
  *  @warning UiMenu and its content, Elm_Ctxpopup will be deleted by its owned UiView on the proper time. So you can just leave its instance to it.
  */
-class UiMenu: public UiBaseOverlay
+class UiMenu: public efl_viewmanager::UiBaseOverlay
 {
 public:
        /**

diff --git a/src/include/efl/mobile/UiMobileViewManager.h b/src/include/efl/mobile/UiMobileViewManager.h
index 627cc7d709624be411a37ca96b70f5f664c2f1cd..a4e895cc97cb61ed34080fbdc1bc7059f80a4c8d 100644 (file)
--- a/src/include/efl/mobile/UiMobileViewManager.h
+++ b/src/include/efl/mobile/UiMobileViewManager.h
@@ -26,6 +26,6 @@
 #include "UiPopup.h"
 #include "UiApp.h"
 
-#define UI_VIEWMGR (UiApp::getInstance()->getViewmgr())
+#define UI_VIEWMGR (efl_viewmanager::UiApp::getInstance()->getViewmgr())
 
 #endif /* UI_MOBILE_VIEWMANAGER_H */

diff --git a/src/include/efl/mobile/UiPopup.h b/src/include/efl/mobile/UiPopup.h
index ddeefd4f5fe1cfbdee0851f08504f90fd2fdfad9..def34248e6530cc87c8b99da0276c38c7c5a5497 100644 (file)
--- a/src/include/efl/mobile/UiPopup.h
+++ b/src/include/efl/mobile/UiPopup.h
@@ -35,7 +35,7 @@ class UiView;
  *
  *  @warning UiPopup and its content, Elm_Popup will be deleted by its owned UiView on the proper time. So you can just leave its instance to it.
  */
-class UiPopup : public UiBaseOverlay
+class UiPopup : public efl_viewmanager::UiBaseOverlay
 {
 public:
        /**

diff --git a/src/include/efl/mobile/UiStandardView.h b/src/include/efl/mobile/UiStandardView.h
index be171bcc5254bcdfa5edc56e8f5ab217a115a7e9..3bcee511f61027c363e5cfa24e0258ac96b3c168 100644 (file)
--- a/src/include/efl/mobile/UiStandardView.h
+++ b/src/include/efl/mobile/UiStandardView.h
@@ -33,7 +33,7 @@ namespace efl_viewmanager
  *          to the system profile, when this view is pushed into a UiViewmgr, it will internally create a software back key that triggers popping the view.
  *
  */
-class UiStandardView: public UiView
+class UiStandardView: public efl_viewmanager::UiView
 {
 public:
        /**

diff --git a/src/include/efl/mobile/UiView.h b/src/include/efl/mobile/UiView.h
index 06cbcb60b571946738133045730cd1383d9d48f6..5091d772540fadb890a9e9afe4a4285a51e78d17 100644 (file)
--- a/src/include/efl/mobile/UiView.h
+++ b/src/include/efl/mobile/UiView.h
@@ -33,7 +33,7 @@ class UiKeyListener;
  *         Basically, UiView implements basics for running together with overlays such as UiMenu and UiPopup. You can use this UiView as an empty ui form
  *         view.
  */
-class UiView: public UiBaseView
+class UiView: public efl_viewmanager::UiBaseView
 {
 public:
        /**

diff --git a/src/include/efl/mobile/UiViewmgr.h b/src/include/efl/mobile/UiViewmgr.h
index 6b9012af5c5ab3a3e784dadcce44d039f894fb11..fcb5a9f02a3afef9efed8f8e276690332077372a 100644 (file)
--- a/src/include/efl/mobile/UiViewmgr.h
+++ b/src/include/efl/mobile/UiViewmgr.h
@@ -32,7 +32,7 @@ class UiApp;
  *         EFL view manager in mobile profile. UiViewmgr is nothing more than UiBaseViewmgr in behavior perspective. It just comes out with renaming class
  *         for adapting with other EFL mobile classes.
  */
-class UiViewmgr: public UiBaseViewmgr
+class UiViewmgr: public efl_viewmanager::UiBaseViewmgr
 {
 protected:
        //Don't allow to create UiViewmgr instance

diff --git a/src/include/interface/UiIfaceViewManager.h b/src/include/interface/UiIfaceViewManager.h
index 2e3038613bb59b377b73549f50769671e84e31fb..f3b28ff2936f1fe59f848a5aef22f0596a42b79a 100644 (file)
--- a/src/include/interface/UiIfaceViewManager.h
+++ b/src/include/interface/UiIfaceViewManager.h
@@ -18,6 +18,7 @@
 #define _UI_IFACE_VIEWMANAGER_H_
 
 #include <dlog.h>
+#include <app.h>
 
 #define UI_EFL 1
 
@@ -52,10 +53,6 @@
        #endif
 #endif
 
-
-
-
-#include <app.h>
 #include "UiIfaceTypes.h"
 #include "UiIfaceRotatable.h"
 #include "UiIfaceOverlay.h"
@@ -63,7 +60,4 @@
 #include "UiIfaceViewmgr.h"
 #include "UiIfaceApp.h"
 
-using namespace ui_viewmanager;
-
-
 #endif /* UI_IFACE_VIEWMANAGER_H */

diff --git a/src/lib/efl/UiBaseKeyListener.cpp b/src/lib/efl/UiBaseKeyListener.cpp
index 01a91065333e88b006c4c142db54b516280c727c..374553dce2247ded57c91c673021f286240799e4 100644 (file)
--- a/src/lib/efl/UiBaseKeyListener.cpp
+++ b/src/lib/efl/UiBaseKeyListener.cpp
@@ -16,6 +16,9 @@
  */
 #include "../../include/efl/UiBaseViewManager.h"
 
+using namespace ui_viewmanager;
+using namespace efl_viewmanager;
+
 /***********************************************************************************************/
 /* Internal class Implementation                                                               */
 /***********************************************************************************************/

diff --git a/src/lib/efl/UiBaseOverlay.cpp b/src/lib/efl/UiBaseOverlay.cpp
index 1465af6e0e755fd36daf3e1ab0909c1bd2a28bf4..f3840eb52119261a895a25f2029342fbfb827592 100644 (file)
--- a/src/lib/efl/UiBaseOverlay.cpp
+++ b/src/lib/efl/UiBaseOverlay.cpp
@@ -16,6 +16,9 @@
  */
 #include "../../include/efl/UiBaseViewManager.h"
 
+using namespace ui_viewmanager;
+using namespace efl_viewmanager;
+
 UiBaseOverlay::UiBaseOverlay(UiBaseView *view)
                : UiIfaceOverlay(view)
 {

diff --git a/src/lib/efl/UiBaseView.cpp b/src/lib/efl/UiBaseView.cpp
index daf0666a769741381a3194d484a32d8b6be4b7fa..c661bd0d66a9cc77989e6606ebb1ee6bf336feff 100644 (file)
--- a/src/lib/efl/UiBaseView.cpp
+++ b/src/lib/efl/UiBaseView.cpp
@@ -16,6 +16,8 @@
  */
 #include "../../include/efl/UiBaseViewManager.h"
 
+using namespace ui_viewmanager;
+using namespace efl_viewmanager;
 
 /***********************************************************************************************/
 /* Internal class Implementation                                                               */

diff --git a/src/lib/efl/UiBaseViewmgr.cpp b/src/lib/efl/UiBaseViewmgr.cpp
index 658551255be091415b9d902f79094c930d26a6f0..eea2048931d2b540186e07492b00830da26a6d18 100644 (file)
--- a/src/lib/efl/UiBaseViewmgr.cpp
+++ b/src/lib/efl/UiBaseViewmgr.cpp
@@ -14,11 +14,12 @@
  *  limitations under the License.
  *
  */
-
 #include <map>
 #include <string>
 #include "../../include/efl/UiBaseViewManager.h"
 
+using namespace ui_viewmanager;
+using namespace efl_viewmanager;
 using namespace std;
 
 /***********************************************************************************************/

diff --git a/src/lib/efl/mobile/UiApp.cpp b/src/lib/efl/mobile/UiApp.cpp
index d352bc0287145f7c76439ef4f60785e0f19f376a..66688fec51da213d8a77e298540d5ac578bc65a3 100644 (file)
--- a/src/lib/efl/mobile/UiApp.cpp
+++ b/src/lib/efl/mobile/UiApp.cpp
@@ -16,6 +16,9 @@
  */
 #include "../../../include/efl/mobile/UiMobileViewManager.h"
 
+using namespace ui_viewmanager;
+using namespace efl_viewmanager;
+
 /***********************************************************************************************/
 /* Internal class Implementation                                                               */
 /***********************************************************************************************/

diff --git a/src/lib/efl/mobile/UiKeyListener.cpp b/src/lib/efl/mobile/UiKeyListener.cpp
index 9a80c69e86ebe6b7e9cf775d1db0a71434838a6d..3be92d148c07a64d438e89f9930a1aa338e07f22 100644 (file)
--- a/src/lib/efl/mobile/UiKeyListener.cpp
+++ b/src/lib/efl/mobile/UiKeyListener.cpp
@@ -16,6 +16,9 @@
  */
 #include "../../../include/efl/mobile/UiMobileViewManager.h"
 
+using namespace ui_viewmanager;
+using namespace efl_viewmanager;
+
 static const char *KEY_MENU = "XF86Menu";
 static const char *KEY_MENU2 = "XF86Send";
 

diff --git a/src/lib/efl/mobile/UiMenu.cpp b/src/lib/efl/mobile/UiMenu.cpp
index dc48da2e5d2b19b54cdf3f5924fab8d821a334d4..60f73b1ffba74a148c4c9ff7a4d1a66d2f38190b 100644 (file)
--- a/src/lib/efl/mobile/UiMenu.cpp
+++ b/src/lib/efl/mobile/UiMenu.cpp
@@ -16,6 +16,9 @@
  */
 #include "../../../include/efl/mobile/UiMobileViewManager.h"
 
+using namespace ui_viewmanager;
+using namespace efl_viewmanager;
+
 static void _ctxpopupDismissedCb(void *data, Evas_Object *obj, void *event_info)
 {
        evas_object_hide(obj);

diff --git a/src/lib/efl/mobile/UiPopup.cpp b/src/lib/efl/mobile/UiPopup.cpp
index 9d9ce4698b6747b974af737e5f1c08ee3d164874..b878f0e894cae2665398ffeefe4308de979d9386 100644 (file)
--- a/src/lib/efl/mobile/UiPopup.cpp
+++ b/src/lib/efl/mobile/UiPopup.cpp
@@ -16,6 +16,9 @@
  */
 #include "../../../include/efl/mobile/UiMobileViewManager.h"
 
+using namespace ui_viewmanager;
+using namespace efl_viewmanager;
+
 static bool _updatePopup(UiPopup *popup)
 {
        Elm_Win *win = popup->getBase();

diff --git a/src/lib/efl/mobile/UiStandardView.cpp b/src/lib/efl/mobile/UiStandardView.cpp
index 2c28b2d7a23e618d8df6846f65abc2d69e407c7c..b37c0807e3795ff7b78e330aa0d6dc5ae2ef508e 100644 (file)
--- a/src/lib/efl/mobile/UiStandardView.cpp
+++ b/src/lib/efl/mobile/UiStandardView.cpp
@@ -16,6 +16,9 @@
  */
 #include "../../../include/efl/mobile/UiMobileViewManager.h"
 
+using namespace ui_viewmanager;
+using namespace efl_viewmanager;
+
 /***********************************************************************************************/
 /* Internal class Implementation                                                               */
 /***********************************************************************************************/

diff --git a/src/lib/efl/mobile/UiView.cpp b/src/lib/efl/mobile/UiView.cpp
index 38813ea47e6a85d96d3627adaa3ab6a08e194f22..ee74d314f5ce2c2aad6838eca1577aa4fb3c345e 100644 (file)
--- a/src/lib/efl/mobile/UiView.cpp
+++ b/src/lib/efl/mobile/UiView.cpp
@@ -17,6 +17,9 @@
 #include <list>
 #include "../../../include/efl/mobile/UiMobileViewManager.h"
 
+using namespace ui_viewmanager;
+using namespace efl_viewmanager;
+
 /***********************************************************************************************/
 /* Internal class Implementation                                                               */
 /***********************************************************************************************/

diff --git a/src/lib/efl/mobile/UiViewmgr.cpp b/src/lib/efl/mobile/UiViewmgr.cpp
index 4c90722f56fefea3597b05fc6fdb1ccf55c515ff..1756fcebedc9de23c3bf63d41167d277be58dc9e 100644 (file)
--- a/src/lib/efl/mobile/UiViewmgr.cpp
+++ b/src/lib/efl/mobile/UiViewmgr.cpp
@@ -16,6 +16,9 @@
  */
 #include "../../../include/efl/mobile/UiMobileViewManager.h"
 
+using namespace ui_viewmanager;
+using namespace efl_viewmanager;
+
 /***********************************************************************************************/
 /* Internal class Implementation                                                               */
 /***********************************************************************************************/

diff --git a/src/lib/interface/UiIfaceApp.cpp b/src/lib/interface/UiIfaceApp.cpp
index 642c568db2c9998d5688fc00cc538fcb20f99251..441532f4a4d45eea9d2f06983be5de3f8a91a702 100644 (file)
--- a/src/lib/interface/UiIfaceApp.cpp
+++ b/src/lib/interface/UiIfaceApp.cpp
@@ -17,6 +17,8 @@
 #include <system_settings.h>
 #include "../../include/interface/UiIfaceViewManager.h"
 
+using namespace ui_viewmanager;
+
 /***********************************************************************************************/
 /* Internal class Implementation                                                               */
 /***********************************************************************************************/

diff --git a/src/lib/interface/UiIfaceOverlay.cpp b/src/lib/interface/UiIfaceOverlay.cpp
index 4b4abf5b3b6ec44e5797586d1be5c56e663cc773..9b547ed049ba347fbc65d6e11dfde0bd2108d383 100644 (file)
--- a/src/lib/interface/UiIfaceOverlay.cpp
+++ b/src/lib/interface/UiIfaceOverlay.cpp
@@ -17,6 +17,7 @@
 
 #include "../../include/interface/UiIfaceViewManager.h"
 
+using namespace ui_viewmanager;
 
 /***********************************************************************************************/
 /* Internal class Implementation                                                               */

diff --git a/src/lib/interface/UiIfaceView.cpp b/src/lib/interface/UiIfaceView.cpp
index a5fb65f130ca3f8c04ed3c2855949e5f941116de..b973ae6c773fd3ac987d3a228dd1b77cdd52a75e 100644 (file)
--- a/src/lib/interface/UiIfaceView.cpp
+++ b/src/lib/interface/UiIfaceView.cpp
@@ -19,6 +19,7 @@
 
 #include <string>
 
+using namespace ui_viewmanager;
 using namespace std;
 
 /***********************************************************************************************/

diff --git a/src/lib/interface/UiIfaceViewmgr.cpp b/src/lib/interface/UiIfaceViewmgr.cpp
index c500f709b114d610ca8a998f66856496f021741c..f7d0f15c49ce078c072041db73c108c836adfc8d 100644 (file)
--- a/src/lib/interface/UiIfaceViewmgr.cpp
+++ b/src/lib/interface/UiIfaceViewmgr.cpp
@@ -20,6 +20,7 @@
 
 #include "../../include/interface/UiIfaceViewManager.h"
 
+using namespace ui_viewmanager;
 using namespace std;
 
 /***********************************************************************************************/