From 3bef5be320f114a2133c2b0ac977adda8ec26c9f Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Wed, 27 Nov 2013 19:07:51 +0400 Subject: [PATCH] components: remove initVarHeader calls in classes derived from CComponentsHeader Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/90c76a2985b8ccc991035c988a4f197696d988fa Author: [CST] Focus Date: 2013-11-27 (Wed, 27 Nov 2013) Origin message was: ------------------ components: remove initVarHeader calls in classes derived from CComponentsHeader --- src/gui/components/cc_frm.h | 4 ++-- src/gui/components/cc_frm_footer.cpp | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/gui/components/cc_frm.h b/src/gui/components/cc_frm.h index 0db55a79b..f97e15e23 100644 --- a/src/gui/components/cc_frm.h +++ b/src/gui/components/cc_frm.h @@ -113,6 +113,8 @@ class CComponentsIconForm : public CComponentsForm class CComponentsHeader : public CComponentsForm { + private: + void initVarHeader(); protected: CComponentsPicture * cch_icon_obj; CComponentsText * cch_text_obj; @@ -132,8 +134,6 @@ class CComponentsHeader : public CComponentsForm void initDefaultButtons(); void initButtonFormSize(); - void initVarHeader(); - public: enum { diff --git a/src/gui/components/cc_frm_footer.cpp b/src/gui/components/cc_frm_footer.cpp index 0a07cbf5e..8ad8ff113 100644 --- a/src/gui/components/cc_frm_footer.cpp +++ b/src/gui/components/cc_frm_footer.cpp @@ -65,9 +65,6 @@ CComponentsFooter::CComponentsFooter( const int x_pos, const int y_pos, const in void CComponentsFooter::initVarFooter() { - //CComponentsHeader - initVarHeader(); - cc_item_type = CC_ITEMTYPE_FOOTER; corner_rad = RADIUS_LARGE; corner_type = CORNER_BOTTOM;