c++: code refactoring.

use a macro function for nice code.

Change-Id: I39de537bdcdde4f2781aba42a166df91d480a838

diff --git a/src/include/efl/UiBaseView.h b/src/include/efl/UiBaseView.h
index e12444a19596faf5326388283f5a9e0267bc0dc4..1894443d9ef7101dbc02e84c951a1315305c7fbf 100644 (file)
--- a/src/include/efl/UiBaseView.h
+++ b/src/include/efl/UiBaseView.h
@@ -133,11 +133,9 @@ protected:
 
 private:
        _UI_DECLARE_PRIVATE_IMPL(UiBaseView);
+       _UI_DISABLE_DEFAULT_CTOR(UiBaseView);
        _UI_DISABLE_COPY_AND_ASSIGN(UiBaseView);
        _UI_DECLARE_FRIENDS(UiBaseViewmgr);
-
-       //Don't generate by compiler.
-       UiBaseView() = delete;
 };
 
 }

diff --git a/src/include/efl/UiBaseViewmgr.h b/src/include/efl/UiBaseViewmgr.h
index f9199439c181b9e95ab89f3395663570230c047e..ae36b68b94745123146f4e249e53c8315c71d103 100644 (file)
--- a/src/include/efl/UiBaseViewmgr.h
+++ b/src/include/efl/UiBaseViewmgr.h
@@ -206,11 +206,9 @@ protected:
 
 private:
        _UI_DECLARE_PRIVATE_IMPL(UiBaseViewmgr);
+       _UI_DISABLE_DEFAULT_CTOR(UiBaseViewmgr);
        _UI_DISABLE_COPY_AND_ASSIGN(UiBaseViewmgr);
        _UI_DECLARE_FRIENDS(UiBaseView);
-
-       //Don't generate by compiler.
-       UiBaseViewmgr() = delete;
 };
 
 }

diff --git a/src/include/efl/mobile/UiApp.h b/src/include/efl/mobile/UiApp.h
index 614fd1b7c59153db2e254b8e765c78a1f7663bd5..99cfc3e3648577b280310a711db5d9faaeb3d0b9 100644 (file)
--- a/src/include/efl/mobile/UiApp.h
+++ b/src/include/efl/mobile/UiApp.h
@@ -62,10 +62,8 @@ public:
        static UiApp *getInstance();
 
 private:
+       _UI_DISABLE_DEFAULT_CTOR(UiApp);
        _UI_DISABLE_COPY_AND_ASSIGN(UiApp);
-
-       //Don't generate by compiler.
-       UiApp() = delete;
 };
 
 }

diff --git a/src/include/efl/mobile/UiKeyListener.h b/src/include/efl/mobile/UiKeyListener.h
index 10264c89eccac8a6e93b0ce23171b2fd9b3f6751..fb3383d661a8c97f96a0d282f9e0f7d432a5a6ed 100644 (file)
--- a/src/include/efl/mobile/UiKeyListener.h
+++ b/src/include/efl/mobile/UiKeyListener.h
@@ -53,8 +53,8 @@ public:
         */
        virtual void extendEventProc(UiBaseView *view, Evas_Event_Key_Down *ev) override;
 
-       //Don't generate by compiler.
-       UiKeyListener() = delete;
+private:
+       _UI_DISABLE_DEFAULT_CTOR(UiKeyListener);
 };
 
 }

diff --git a/src/include/efl/mobile/UiMenu.h b/src/include/efl/mobile/UiMenu.h
index 2dc5a9dcf8acc7c29100ae440931e5310c289c8f..d49d32f56032b14594a0bcc13d7941f229680b59 100644 (file)
--- a/src/include/efl/mobile/UiMenu.h
+++ b/src/include/efl/mobile/UiMenu.h
@@ -119,11 +119,9 @@ protected:
 
 private:
        _UI_DECLARE_PRIVATE_IMPL(UiMenu);
+       _UI_DISABLE_DEFAULT_CTOR(UiMenu);
        _UI_DISABLE_COPY_AND_ASSIGN(UiMenu);
        _UI_DECLARE_FRIENDS(UiView);
-
-       //Don't generate by compiler.
-       UiMenu() = delete;
 };
 
 }

diff --git a/src/include/efl/mobile/UiPopup.h b/src/include/efl/mobile/UiPopup.h
index b3e28011cb3f0cb8adefb0ba1098662652ca58ac..76ea35e52d660507431f49f6f01d0e692a198afe 100644 (file)
--- a/src/include/efl/mobile/UiPopup.h
+++ b/src/include/efl/mobile/UiPopup.h
@@ -122,10 +122,8 @@ protected:
 
 private:
        _UI_DECLARE_PRIVATE_IMPL(UiPopup);
+       _UI_DISABLE_DEFAULT_CTOR(UiPopup);
        _UI_DISABLE_COPY_AND_ASSIGN(UiPopup);
-
-       //Don't generate by compiler.
-       UiPopup() = delete;
 };
 
 }

diff --git a/src/include/efl/mobile/UiStandardView.h b/src/include/efl/mobile/UiStandardView.h
index 59d3e199c20679017bc6f6719da99a1e9ab6c8a2..673e69cc0275e8fcb1da03b7cb4ccde7bf875c4d 100644 (file)
--- a/src/include/efl/mobile/UiStandardView.h
+++ b/src/include/efl/mobile/UiStandardView.h
@@ -216,10 +216,8 @@ protected:
 
 private:
        _UI_DECLARE_PRIVATE_IMPL(UiStandardView);
+       _UI_DISABLE_DEFAULT_CTOR(UiStandardView);
        _UI_DISABLE_COPY_AND_ASSIGN(UiStandardView);
-
-       //Don't generate by compiler.
-       UiStandardView() = delete;
 };
 
 }

diff --git a/src/include/efl/mobile/UiView.h b/src/include/efl/mobile/UiView.h
index 3f14e08e84ea2a6ac7e891b3a9cf6a60055b74a0..4a01421b7e4bcf676b1662e30064d68fdb800bbf 100644 (file)
--- a/src/include/efl/mobile/UiView.h
+++ b/src/include/efl/mobile/UiView.h
@@ -143,13 +143,11 @@ private:
        void _disconnectPopup(UiPopup *popup);
 
        _UI_DECLARE_PRIVATE_IMPL(UiView);
+       _UI_DISABLE_DEFAULT_CTOR(UiView);
        _UI_DISABLE_COPY_AND_ASSIGN(UiView);
        _UI_DECLARE_FRIENDS(UiMenu);
        _UI_DECLARE_FRIENDS(UiPopup);
        _UI_DECLARE_FRIENDS(UiKeyListener);
-
-       //Don't generate by compiler.
-       UiView() = delete;
 };
 
 }

diff --git a/src/include/efl/mobile/UiViewmgr.h b/src/include/efl/mobile/UiViewmgr.h
index 722f1e7ae002e0c8495341562d57bf831139dd28..804d954b48adf6a4a7f2487799eae740249a38d8 100644 (file)
--- a/src/include/efl/mobile/UiViewmgr.h
+++ b/src/include/efl/mobile/UiViewmgr.h
@@ -48,11 +48,9 @@ protected:
 
 private:
        _UI_DISABLE_COPY_AND_ASSIGN(UiViewmgr);
+       _UI_DISABLE_DEFAULT_CTOR(UiViewmgr);
        _UI_DECLARE_FRIENDS(UiView);
        _UI_DECLARE_FRIENDS(UiApp);
-
-       //Don't generate by compiler.
-       UiViewmgr() = delete;
 };
 }
 

diff --git a/src/include/interface/UiIfaceViewManager.h b/src/include/interface/UiIfaceViewManager.h
index f3b28ff2936f1fe59f848a5aef22f0596a42b79a..bdff91ce25ef41e0100de8d4b43398c3853c09a6 100644 (file)
--- a/src/include/interface/UiIfaceViewManager.h
+++ b/src/include/interface/UiIfaceViewManager.h
@@ -45,6 +45,9 @@
        A(const A&) = delete; \
        const A& operator=(const A&) = delete
 
+#define _UI_DISABLE_DEFAULT_CTOR(A) \
+       A() = delete
+
 #ifdef __GNUC__
        #if __GNUC__ >= 4
                #ifndef EAPI