From: Hermet Park Date: Tue, 5 Jul 2016 12:09:29 +0000 (+0900) Subject: c++: code refactoring. X-Git-Tag: submit/tizen/20160707.233627~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b7177893ca2013f727092d0de60f96f7d60f8323;p=platform%2Fcore%2Fuifw%2Fui-viewmgr.git 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 e12444a..1894443 100644 --- 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 f919943..ae36b68 100644 --- 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 614fd1b..99cfc3e 100644 --- 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 10264c8..fb3383d 100644 --- 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 2dc5a9d..d49d32f 100644 --- 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 b3e2801..76ea35e 100644 --- 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 59d3e19..673e69c 100644 --- 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 3f14e08..4a01421 100644 --- 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 722f1e7..804d954 100644 --- 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 f3b28ff..bdff91c 100644 --- 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