mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-29 16:31:05 +02:00
components: cleanup destructors - remove calls to functions,
already called inside base classes destructors
Origin commit data
------------------
Branch: ni/coolstream
Commit: dd7c7fc7ae
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-29 (Fri, 29 Nov 2013)
------------------
This commit was generated by Migit
This commit is contained in:
@@ -77,8 +77,6 @@ void CComponentsDetailLine::initVarDline()
|
||||
|
||||
CComponentsDetailLine::~CComponentsDetailLine()
|
||||
{
|
||||
hide(); //restore background
|
||||
clear();
|
||||
}
|
||||
|
||||
// y_top (=y)
|
||||
|
@@ -76,8 +76,6 @@ void CComponentsForm::cleanCCForm()
|
||||
#endif
|
||||
|
||||
clearCCItems();
|
||||
clearSavedScreen();
|
||||
clear();
|
||||
}
|
||||
|
||||
|
||||
|
@@ -87,7 +87,6 @@ void CComponentsFrmClock::initVarClock()
|
||||
|
||||
CComponentsFrmClock::~CComponentsFrmClock()
|
||||
{
|
||||
cleanCCForm();
|
||||
if (activeClock)
|
||||
stopThread();
|
||||
}
|
||||
|
@@ -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)
|
||||
|
@@ -119,7 +119,6 @@ CComponentsWindow::~CComponentsWindow()
|
||||
#ifdef DEBUG_CC
|
||||
printf("[~CComponentsWindow] [%s - %d] delete...\n", __FUNCTION__, __LINE__);
|
||||
#endif
|
||||
cleanCCForm();
|
||||
}
|
||||
|
||||
void CComponentsWindow::initVarWindow()
|
||||
|
@@ -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
|
||||
|
@@ -78,9 +78,7 @@ CComponentsText::CComponentsText( const int x_pos, const int y_pos, const int w,
|
||||
CComponentsText::~CComponentsText()
|
||||
{
|
||||
hide();
|
||||
clearSavedScreen();
|
||||
clearCCText();
|
||||
clear();
|
||||
}
|
||||
|
||||
|
||||
|
@@ -67,8 +67,6 @@ CComponentsPIP::~CComponentsPIP()
|
||||
{
|
||||
hide();
|
||||
videoDecoder->Pig(-1, -1, -1, -1);
|
||||
clearSavedScreen();
|
||||
clear();
|
||||
}
|
||||
|
||||
void CComponentsPIP::paint(bool do_save_bg)
|
||||
|
Reference in New Issue
Block a user