components: cleanup destructors - remove calls to functions,

already called inside base classes destructors
This commit is contained in:
[CST] Focus
2013-11-29 12:18:43 +04:00
parent 8aa819642d
commit dd7c7fc7ae
8 changed files with 0 additions and 21 deletions

View File

@@ -77,8 +77,6 @@ void CComponentsDetailLine::initVarDline()
CComponentsDetailLine::~CComponentsDetailLine() CComponentsDetailLine::~CComponentsDetailLine()
{ {
hide(); //restore background
clear();
} }
// y_top (=y) // y_top (=y)

View File

@@ -76,8 +76,6 @@ void CComponentsForm::cleanCCForm()
#endif #endif
clearCCItems(); clearCCItems();
clearSavedScreen();
clear();
} }

View File

@@ -87,7 +87,6 @@ void CComponentsFrmClock::initVarClock()
CComponentsFrmClock::~CComponentsFrmClock() CComponentsFrmClock::~CComponentsFrmClock()
{ {
cleanCCForm();
if (activeClock) if (activeClock)
stopThread(); stopThread();
} }

View File

@@ -126,7 +126,6 @@ CComponentsHeader::~CComponentsHeader()
printf("[~CComponentsHeader] [%s - %d] delete...\n", __FUNCTION__, __LINE__); printf("[~CComponentsHeader] [%s - %d] delete...\n", __FUNCTION__, __LINE__);
#endif #endif
v_cch_btn.clear(); v_cch_btn.clear();
cleanCCForm();
} }
void CComponentsHeader::setCaption(const std::string& caption, const int& align_mode) void CComponentsHeader::setCaption(const std::string& caption, const int& align_mode)

View File

@@ -119,7 +119,6 @@ CComponentsWindow::~CComponentsWindow()
#ifdef DEBUG_CC #ifdef DEBUG_CC
printf("[~CComponentsWindow] [%s - %d] delete...\n", __FUNCTION__, __LINE__); printf("[~CComponentsWindow] [%s - %d] delete...\n", __FUNCTION__, __LINE__);
#endif #endif
cleanCCForm();
} }
void CComponentsWindow::initVarWindow() void CComponentsWindow::initVarWindow()

View File

@@ -66,22 +66,12 @@ CComponentsInfoBox::CComponentsInfoBox(const int x_pos, const int y_pos, const i
CComponentsInfoBox::~CComponentsInfoBox() CComponentsInfoBox::~CComponentsInfoBox()
{ {
#if 0 // called from base (CComponentsText) dtor
hide();
clearSavedScreen();
clearCCText();
clear();
#endif
delete pic; delete pic;
delete cctext; delete cctext;
} }
void CComponentsInfoBox::initVarInfobox() void CComponentsInfoBox::initVarInfobox()
{ {
//CComponents, CComponentsItem, CComponentsText
#if 0 // called from base (CComponentsText) ctor
initVarText();
#endif
cc_item_type = CC_ITEMTYPE_TEXT_INFOBOX; cc_item_type = CC_ITEMTYPE_TEXT_INFOBOX;
//CComponentsInfoBox //CComponentsInfoBox

View File

@@ -78,9 +78,7 @@ CComponentsText::CComponentsText( const int x_pos, const int y_pos, const int w,
CComponentsText::~CComponentsText() CComponentsText::~CComponentsText()
{ {
hide(); hide();
clearSavedScreen();
clearCCText(); clearCCText();
clear();
} }

View File

@@ -67,8 +67,6 @@ CComponentsPIP::~CComponentsPIP()
{ {
hide(); hide();
videoDecoder->Pig(-1, -1, -1, -1); videoDecoder->Pig(-1, -1, -1, -1);
clearSavedScreen();
clear();
} }
void CComponentsPIP::paint(bool do_save_bg) void CComponentsPIP::paint(bool do_save_bg)