From dd7c7fc7ae484f1ee750c1ec6370c312f6db1d69 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Fri, 29 Nov 2013 12:18:43 +0400
Subject: [PATCH] components: cleanup destructors - remove calls to functions,
 already called inside base classes destructors

---
 src/gui/components/cc_detailsline.cpp  |  2 --
 src/gui/components/cc_frm.cpp          |  2 --
 src/gui/components/cc_frm_clock.cpp    |  1 -
 src/gui/components/cc_frm_header.cpp   |  1 -
 src/gui/components/cc_frm_window.cpp   |  1 -
 src/gui/components/cc_item_infobox.cpp | 10 ----------
 src/gui/components/cc_item_text.cpp    |  2 --
 src/gui/components/cc_item_tvpic.cpp   |  2 --
 8 files changed, 21 deletions(-)

diff --git a/src/gui/components/cc_detailsline.cpp b/src/gui/components/cc_detailsline.cpp
index 8c20ccd9a..8b319ce21 100644
--- a/src/gui/components/cc_detailsline.cpp
+++ b/src/gui/components/cc_detailsline.cpp
@@ -77,8 +77,6 @@ void CComponentsDetailLine::initVarDline()
 
 CComponentsDetailLine::~CComponentsDetailLine()
 {
-	hide(); //restore background
-	clear();
 }
 
 //		y_top (=y)
diff --git a/src/gui/components/cc_frm.cpp b/src/gui/components/cc_frm.cpp
index 83507f889..02d2c764b 100644
--- a/src/gui/components/cc_frm.cpp
+++ b/src/gui/components/cc_frm.cpp
@@ -76,8 +76,6 @@ void CComponentsForm::cleanCCForm()
 #endif
 
 	clearCCItems();
-	clearSavedScreen();
-	clear();
 }
 
 
diff --git a/src/gui/components/cc_frm_clock.cpp b/src/gui/components/cc_frm_clock.cpp
index 11d983f4c..dc05cece0 100644
--- a/src/gui/components/cc_frm_clock.cpp
+++ b/src/gui/components/cc_frm_clock.cpp
@@ -87,7 +87,6 @@ void CComponentsFrmClock::initVarClock()
 
 CComponentsFrmClock::~CComponentsFrmClock()
 {
-	cleanCCForm();
 	if (activeClock)
 		stopThread();
 }
diff --git a/src/gui/components/cc_frm_header.cpp b/src/gui/components/cc_frm_header.cpp
index 0975ae630..c73da039b 100644
--- a/src/gui/components/cc_frm_header.cpp
+++ b/src/gui/components/cc_frm_header.cpp
@@ -126,7 +126,6 @@ CComponentsHeader::~CComponentsHeader()
 	printf("[~CComponentsHeader]   [%s - %d] delete...\n", __FUNCTION__, __LINE__);
 #endif
 	v_cch_btn.clear();
-	cleanCCForm();	
 }
 
 void CComponentsHeader::setCaption(const std::string& caption, const int& align_mode)
diff --git a/src/gui/components/cc_frm_window.cpp b/src/gui/components/cc_frm_window.cpp
index 0be93d647..5fa98de8a 100644
--- a/src/gui/components/cc_frm_window.cpp
+++ b/src/gui/components/cc_frm_window.cpp
@@ -119,7 +119,6 @@ CComponentsWindow::~CComponentsWindow()
 #ifdef DEBUG_CC
 	printf("[~CComponentsWindow]   [%s - %d] delete...\n", __FUNCTION__, __LINE__);
 #endif
-	cleanCCForm();
 }
 
 void CComponentsWindow::initVarWindow()
diff --git a/src/gui/components/cc_item_infobox.cpp b/src/gui/components/cc_item_infobox.cpp
index af3027911..77ff00bd5 100644
--- a/src/gui/components/cc_item_infobox.cpp
+++ b/src/gui/components/cc_item_infobox.cpp
@@ -66,22 +66,12 @@ CComponentsInfoBox::CComponentsInfoBox(const int x_pos, const int y_pos, const i
 
 CComponentsInfoBox::~CComponentsInfoBox()
 {
-#if 0 // called from base (CComponentsText) dtor
-	hide();
-	clearSavedScreen();
-	clearCCText();
-	clear();
-#endif
 	delete pic;
 	delete cctext;
 }
 
 void CComponentsInfoBox::initVarInfobox()
 {
-	//CComponents, CComponentsItem,  CComponentsText
-#if 0 // called from base (CComponentsText) ctor
-	initVarText();
-#endif
 	cc_item_type = CC_ITEMTYPE_TEXT_INFOBOX;
 
 	//CComponentsInfoBox
diff --git a/src/gui/components/cc_item_text.cpp b/src/gui/components/cc_item_text.cpp
index 797deae31..4e6db142c 100644
--- a/src/gui/components/cc_item_text.cpp
+++ b/src/gui/components/cc_item_text.cpp
@@ -78,9 +78,7 @@ CComponentsText::CComponentsText(	const int x_pos, const int y_pos, const int w,
 CComponentsText::~CComponentsText()
 {
 	hide();
-	clearSavedScreen();
 	clearCCText();
-	clear();
 }
 
 
diff --git a/src/gui/components/cc_item_tvpic.cpp b/src/gui/components/cc_item_tvpic.cpp
index 388e2821a..19dc1faa0 100644
--- a/src/gui/components/cc_item_tvpic.cpp
+++ b/src/gui/components/cc_item_tvpic.cpp
@@ -67,8 +67,6 @@ CComponentsPIP::~CComponentsPIP()
 {
  	hide();
  	videoDecoder->Pig(-1, -1, -1, -1);
- 	clearSavedScreen();
- 	clear();
 }
 
 void CComponentsPIP::paint(bool do_save_bg)