From 062b10be2ae8feec760a26d573ffe9e84ac4a550 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Wed, 27 Nov 2013 18:54:11 +0400
Subject: [PATCH] components: remove initVarForm calls in classes derived from
 CComponentsForm

---
 src/gui/components/cc_frm.h              | 3 ++-
 src/gui/components/cc_frm_button.cpp     | 1 -
 src/gui/components/cc_frm_clock.cpp      | 1 -
 src/gui/components/cc_frm_ext_text.cpp   | 1 -
 src/gui/components/cc_frm_header.cpp     | 2 --
 src/gui/components/cc_frm_icons.cpp      | 2 --
 src/gui/components/cc_frm_signalbars.cpp | 2 --
 src/gui/components/cc_frm_window.cpp     | 1 -
 src/gui/volumebar.cpp                    | 2 --
 9 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/gui/components/cc_frm.h b/src/gui/components/cc_frm.h
index 9b92e1645..0db55a79b 100644
--- a/src/gui/components/cc_frm.h
+++ b/src/gui/components/cc_frm.h
@@ -37,9 +37,10 @@
 
 class CComponentsForm : public CComponentsItem
 {
+	private:
+		void initVarForm();
 	protected:
 		std::vector<CComponentsItem*>	v_cc_items;			
-		void initVarForm();
 		void paintForm(bool do_save_bg);
 		///generates next possible index for an item, see also cc_item_index, getIndex(), setIndex()
 		int genIndex();
diff --git a/src/gui/components/cc_frm_button.cpp b/src/gui/components/cc_frm_button.cpp
index 7846ef20d..639cfe683 100644
--- a/src/gui/components/cc_frm_button.cpp
+++ b/src/gui/components/cc_frm_button.cpp
@@ -88,7 +88,6 @@ CComponentsButton::CComponentsButton( 	const int x_pos, const int y_pos, const i
 
 void CComponentsButton::initVarButton()
 {
-	initVarForm();
 	cc_item_type 	= CC_ITEMTYPE_BUTTON;
 	cc_btn_icon_obj	= NULL;
 	cc_btn_capt_obj = NULL;
diff --git a/src/gui/components/cc_frm_clock.cpp b/src/gui/components/cc_frm_clock.cpp
index d9b308ab7..11d983f4c 100644
--- a/src/gui/components/cc_frm_clock.cpp
+++ b/src/gui/components/cc_frm_clock.cpp
@@ -70,7 +70,6 @@ CComponentsFrmClock::CComponentsFrmClock( const int x_pos, const int y_pos, cons
 
 void CComponentsFrmClock::initVarClock()
 {
-	initVarForm();
 	cc_item_type 		= CC_ITEMTYPE_FRM_CLOCK;
 	corner_rad		= RADIUS_SMALL;
 
diff --git a/src/gui/components/cc_frm_ext_text.cpp b/src/gui/components/cc_frm_ext_text.cpp
index ce7c83c4e..d44c940d0 100644
--- a/src/gui/components/cc_frm_ext_text.cpp
+++ b/src/gui/components/cc_frm_ext_text.cpp
@@ -77,7 +77,6 @@ void CComponentsExtTextForm::initVarExtTextForm(const int x_pos, const int y_pos
 						fb_pixel_t text_color,
 						fb_pixel_t color_frame, fb_pixel_t color_body, fb_pixel_t color_shadow)
 {
-	initVarForm();
 	cc_item_type 	= CC_ITEMTYPE_FRM_EXT_TEXT;
 	x = x_pos;
 	y = y_pos;
diff --git a/src/gui/components/cc_frm_header.cpp b/src/gui/components/cc_frm_header.cpp
index ea447f548..0975ae630 100644
--- a/src/gui/components/cc_frm_header.cpp
+++ b/src/gui/components/cc_frm_header.cpp
@@ -90,8 +90,6 @@ CComponentsHeader::CComponentsHeader(	const int x_pos, const int y_pos, const in
 
 void CComponentsHeader::initVarHeader()
 {
-	//CComponentsForm
-	initVarForm();
 	cc_item_type 		= CC_ITEMTYPE_FRM_HEADER;
 	col_body 		= COL_MENUHEAD_PLUS_0;
 	corner_rad		= RADIUS_LARGE,
diff --git a/src/gui/components/cc_frm_icons.cpp b/src/gui/components/cc_frm_icons.cpp
index 5bb8fe615..4bb19468a 100644
--- a/src/gui/components/cc_frm_icons.cpp
+++ b/src/gui/components/cc_frm_icons.cpp
@@ -60,8 +60,6 @@ CComponentsIconForm::CComponentsIconForm(const int x_pos, const int y_pos, const
 
 void CComponentsIconForm::initVarIconForm()
 {
-	//CComponentsForm
-	initVarForm();
 	cc_item_type 	= CC_ITEMTYPE_FRM_ICONFORM;
 
 	//set default width and height to 0, this causes a dynamic adaptation of width and height of form
diff --git a/src/gui/components/cc_frm_signalbars.cpp b/src/gui/components/cc_frm_signalbars.cpp
index 7e3b30bdb..2f6bf0ce0 100644
--- a/src/gui/components/cc_frm_signalbars.cpp
+++ b/src/gui/components/cc_frm_signalbars.cpp
@@ -95,7 +95,6 @@ void CSignalBar::initSBItems()
 
 void CSignalBar::initVarSigBar()
 {
-	initVarForm();
 	corner_rad 	= 0;
 	corner_type 	= 0;
 	append_h_offset = 2;
@@ -313,7 +312,6 @@ CSignalBox::CSignalBox(const int& xpos, const int& ypos, const int& w, const int
 
 void CSignalBox::initVarSigBox()
 {
-	initVarForm();
 	corner_rad	= 0;
 
 	sbx_frontend 	= NULL;
diff --git a/src/gui/components/cc_frm_window.cpp b/src/gui/components/cc_frm_window.cpp
index beb623906..0be93d647 100644
--- a/src/gui/components/cc_frm_window.cpp
+++ b/src/gui/components/cc_frm_window.cpp
@@ -125,7 +125,6 @@ CComponentsWindow::~CComponentsWindow()
 void CComponentsWindow::initVarWindow()
 {
 	//CComponentsForm
-	initVarForm();
 	cc_item_type 	= CC_ITEMTYPE_FRM_WINDOW;
 
 	//using current screen settings for default dimensions
diff --git a/src/gui/volumebar.cpp b/src/gui/volumebar.cpp
index 781ea51f8..8578541b0 100644
--- a/src/gui/volumebar.cpp
+++ b/src/gui/volumebar.cpp
@@ -44,8 +44,6 @@ CVolumeBar::CVolumeBar()
 
 void CVolumeBar::initVarVolumeBar()
 {
-	//init inherited variables
-	initVarForm();
 	col_body 	= COL_MENUCONTENT_PLUS_0;
 
 	vb_item_offset 	= 4;