mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-02 18:31:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

CComponents: rename hide() to hideCC()

Browse Source 
There are too many name conflicts with hide-members in other classes.
This commit is contained in:
Thilo Graf
2013-10-24 21:39:04 +02:00
parent f7798affc6
commit 6ee7fac1a5
26 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/components/cc_base.cpp
View File

@@ -42,7 +42,7 @@ CComponents::CComponents()
CComponents::~CComponents()
{
hide();
hideCC();
clearSavedScreen();
clear();
}
@@ -172,11 +172,11 @@ inline fb_pixel_t* CComponents::getScreen(int ax, int ay, int dx, int dy)
}
//restore screen from buffer
inline void CComponents::hide()
inline void CComponents::hideCC()
{
for(size_t i =0; i< v_fbdata.size() ;i++) {
if (v_fbdata[i].pixbuf != NULL){
frameBuffer->waitForIdle("CComponents::hide()");
frameBuffer->waitForIdle("CComponents::hideCC()");
frameBuffer->RestoreScreen(v_fbdata[i].x, v_fbdata[i].y, v_fbdata[i].dx, v_fbdata[i].dy, v_fbdata[i].pixbuf);
delete[] v_fbdata[i].pixbuf;
v_fbdata[i].pixbuf = NULL;

4
src/gui/components/cc_base.h
View File

@@ -197,7 +197,7 @@ class CComponents
inline virtual void setShadowOnOff(bool has_shadow){shadow = has_shadow;};
///hide current screen and restore background
virtual void hide();
virtual void hideCC();
///erase current screen without restore of background, it's similar to paintBackgroundBoxRel() from CFrameBuffer
virtual void kill();
///returns paint mode, true=item was painted
@@ -251,7 +251,7 @@ class CComponentsItem : public CComponents
///abstract: paint item, arg: do_save_bg see paintInit() above
virtual void paint(bool do_save_bg = CC_SAVE_SCREEN_YES) = 0;
///hides item, arg: no_restore see hideCCItem() above
virtual void hide(bool no_restore = false);
virtual void hideCC(bool no_restore = false);
///get the current item type, see attribute cc_item_type above
virtual int getItemType();

2
src/gui/components/cc_detailsline.cpp
View File

@@ -80,7 +80,7 @@ void CComponentsDetailLine::initVarDline()
CComponentsDetailLine::~CComponentsDetailLine()
{
hide(); //restore background
hideCC(); //restore background
clear();
}

6
src/gui/components/cc_frm.cpp
View File

@@ -366,14 +366,14 @@ void CComponentsForm::paintCCItems()
}
}
void CComponentsForm::hide(bool no_restore)
void CComponentsForm::hideCC(bool no_restore)
{
// hack: ensure hiding of minitv during hide of forms and inherited classes,
// because the handling of minitv items are different to other item types
// and need an explizit call of hide()
// and need an explizit call of hideCC()
for(size_t i=0; i<v_cc_items.size(); i++) {
if (v_cc_items[i]->getItemType() == CC_ITEMTYPE_PIP){
v_cc_items[i]->hide();
v_cc_items[i]->hideCC();
break;
}
}

2
src/gui/components/cc_frm.h
View File

@@ -54,7 +54,7 @@ class CComponentsForm : public CComponentsItem
virtual ~CComponentsForm();
void paint(bool do_save_bg = CC_SAVE_SCREEN_YES);
void hide(bool no_restore = false);
void hideCC(bool no_restore = false);
virtual void addCCItem(CComponentsItem* cc_Item);
virtual void insertCCItem(const uint& cc_item_id, CComponentsItem* cc_Item);
virtual void removeCCItem(const uint& cc_item_id);

2
src/gui/components/cc_frm_signalbars.h
View File

@@ -225,7 +225,7 @@ void CSampleClass::hide ()
//other code;
//Note: not required if signalbox is added to a CC-Container!
signalbox->hide(true);
signalbox->hideCC(true);
delete signalbox;
signalbox = NULL;

2
src/gui/components/cc_item.cpp
View File

@@ -124,7 +124,7 @@ void CComponentsItem::hideCCItem(bool no_restore)
}
}
void CComponentsItem::hide(bool no_restore)
void CComponentsItem::hideCC(bool no_restore)
{
hideCCItem(no_restore);
}

2
src/gui/components/cc_item_infobox.cpp
View File

@@ -66,7 +66,7 @@ CComponentsInfoBox::CComponentsInfoBox(const int x_pos, const int y_pos, const i
CComponentsInfoBox::~CComponentsInfoBox()
{
hide();
hideCC();
clearSavedScreen();
clearCCText();
delete pic;

2
src/gui/components/cc_item_picture.cpp
View File

@@ -201,7 +201,7 @@ void CComponentsPicture::paint(bool do_save_bg)
paintPicture();
}
void CComponentsPicture::hide(bool no_restore)
void CComponentsPicture::hideCC(bool no_restore)
{
hideCCItem(no_restore);
pic_painted = false;

2
src/gui/components/cc_item_picture.h
View File

@@ -83,7 +83,7 @@ class CComponentsPicture : public CComponentsItem
virtual inline bool isPicPainted(){return pic_painted;};
virtual void paint(bool do_save_bg = CC_SAVE_SCREEN_YES);
virtual void hide(bool no_restore = false);
virtual void hideCC(bool no_restore = false);
virtual inline void getPictureSize(int *pwidth, int *pheight){*pwidth=pic_width; *pheight=pic_height;};
virtual void setMaxWidth(const int w_max){pic_max_w = w_max;};
virtual void setMaxHeight(const int h_max){pic_max_h = h_max;};

4
src/gui/components/cc_item_text.cpp
View File

@@ -77,7 +77,7 @@ CComponentsText::CComponentsText( const int x_pos, const int y_pos, const int w,
CComponentsText::~CComponentsText()
{
hide();
hideCC();
clearSavedScreen();
clearCCText();
clear();
@@ -246,7 +246,7 @@ void CComponentsText::paint(bool do_save_bg)
paintText(do_save_bg);
}
void CComponentsText::hide(bool no_restore)
void CComponentsText::hideCC(bool no_restore)
{
if (ct_textbox)
ct_textbox->hide();

2
src/gui/components/cc_item_text.h
View File

@@ -92,7 +92,7 @@ class CComponentsText : public CComponentsItem, public CBox
///default members to paint a text box and hide painted text
///hide textbox
void hide(bool no_restore = false);
void hideCC(bool no_restore = false);
///paint text box, parameter do_save_bg: default = true, causes fill of backckrond pixel buffer
void paint(bool do_save_bg = CC_SAVE_SCREEN_YES);

4
src/gui/components/cc_item_tvpic.cpp
View File

@@ -66,7 +66,7 @@ CComponentsPIP::CComponentsPIP( const int x_pos, const int y_pos, const int perc
CComponentsPIP::~CComponentsPIP()
{
hide();
hideCC();
videoDecoder->Pig(-1, -1, -1, -1);
clearSavedScreen();
clear();
@@ -99,7 +99,7 @@ void CComponentsPIP::paint(bool do_save_bg)
}
void CComponentsPIP::hide(bool no_restore)
void CComponentsPIP::hideCC(bool no_restore)
{
videoDecoder->Pig(-1, -1, -1, -1);
hideCCItem(no_restore);

2
src/gui/components/cc_item_tvpic.h
View File

@@ -63,7 +63,7 @@ class CComponentsPIP : public CComponentsItem
///show tv box
void paint(bool do_save_bg = CC_SAVE_SCREEN_YES);
///remove tv box from screen
void hide(bool no_restore = false);
void hideCC(bool no_restore = false);
};
#endif

8
src/gui/components/unmaintained/cc_item_box.cpp
View File

@@ -43,7 +43,7 @@ CComponentsItemBox::CComponentsItemBox()
CComponentsItemBox::~CComponentsItemBox()
{
hide();
hideCC();
clearElements();
clearSavedScreen();
clear();
@@ -213,7 +213,7 @@ void CComponentsItemBox::refreshElement(size_t index, const std::string& element
case CC_ITEMBOX_PICTURE:
pic = static_cast<CComponentsPicture*>(v_element_data[index].handler1);
if (pic != NULL) {
pic->hide();
pic->hideCC();
delete pic;
}
v_element_data[index].element = element;
@@ -240,7 +240,7 @@ void CComponentsItemBox::paintImage(size_t index, bool newElement)
if ((newElement) || (pic == NULL)) {
if (pic != NULL) {
pic->hide();
pic->hideCC();
delete pic;
pic = NULL;
}
@@ -287,7 +287,7 @@ void CComponentsItemBox::paintText(size_t index, bool newElement)
if ((newElement) || (textbox == NULL)) {
if (textbox != NULL) {
textbox->hide();
textbox->hideCC();
delete textbox;
textbox = NULL;
}