mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 16:01:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

components: remove initVarForm calls in classes derived from CComponentsForm

Browse Source 
Origin commit data
------------------
Commit: 062b10be2a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-27 (Wed, 27 Nov 2013)
This commit is contained in:
[CST] Focus
2013-11-27 18:54:11 +04:00
parent 5ff35e4515
commit b476a667c6
9 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,9 +37,10 @@
class CComponentsForm : public CComponentsItem class CComponentsForm : public CComponentsItem
{ {
private:
void initVarForm();
protected: protected:
std::vector<CComponentsItem*> v_cc_items; std::vector<CComponentsItem*> v_cc_items;
void initVarForm();
void paintForm(bool do_save_bg); void paintForm(bool do_save_bg);
///generates next possible index for an item, see also cc_item_index, getIndex(), setIndex() ///generates next possible index for an item, see also cc_item_index, getIndex(), setIndex()
int genIndex(); int genIndex();

1
src/gui/components/cc_frm_button.cpp
View File

@@ -88,7 +88,6 @@ CComponentsButton::CComponentsButton( const int x_pos, const int y_pos, const i
void CComponentsButton::initVarButton() void CComponentsButton::initVarButton()
{ {
initVarForm();
cc_item_type = CC_ITEMTYPE_BUTTON; cc_item_type = CC_ITEMTYPE_BUTTON;
cc_btn_icon_obj = NULL; cc_btn_icon_obj = NULL;
cc_btn_capt_obj = NULL; cc_btn_capt_obj = NULL;

1
src/gui/components/cc_frm_clock.cpp
View File

@@ -70,7 +70,6 @@ CComponentsFrmClock::CComponentsFrmClock( const int x_pos, const int y_pos, cons
void CComponentsFrmClock::initVarClock() void CComponentsFrmClock::initVarClock()
{ {
initVarForm();
cc_item_type = CC_ITEMTYPE_FRM_CLOCK; cc_item_type = CC_ITEMTYPE_FRM_CLOCK;
corner_rad = RADIUS_SMALL; corner_rad = RADIUS_SMALL;

1
src/gui/components/cc_frm_ext_text.cpp
View File

@@ -77,7 +77,6 @@ void CComponentsExtTextForm::initVarExtTextForm(const int x_pos, const int y_pos
fb_pixel_t text_color, fb_pixel_t text_color,
fb_pixel_t color_frame, fb_pixel_t color_body, fb_pixel_t color_shadow) fb_pixel_t color_frame, fb_pixel_t color_body, fb_pixel_t color_shadow)
{ {
initVarForm();
cc_item_type = CC_ITEMTYPE_FRM_EXT_TEXT; cc_item_type = CC_ITEMTYPE_FRM_EXT_TEXT;
x = x_pos; x = x_pos;
y = y_pos; y = y_pos;

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

@@ -90,8 +90,6 @@ CComponentsHeader::CComponentsHeader( const int x_pos, const int y_pos, const in
void CComponentsHeader::initVarHeader() void CComponentsHeader::initVarHeader()
{ {
//CComponentsForm
initVarForm();
cc_item_type = CC_ITEMTYPE_FRM_HEADER; cc_item_type = CC_ITEMTYPE_FRM_HEADER;
col_body = COL_MENUHEAD_PLUS_0; col_body = COL_MENUHEAD_PLUS_0;
corner_rad = RADIUS_LARGE, corner_rad = RADIUS_LARGE,

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

@@ -60,8 +60,6 @@ CComponentsIconForm::CComponentsIconForm(const int x_pos, const int y_pos, const
void CComponentsIconForm::initVarIconForm() void CComponentsIconForm::initVarIconForm()
{ {
//CComponentsForm
initVarForm();
cc_item_type = CC_ITEMTYPE_FRM_ICONFORM; 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 //set default width and height to 0, this causes a dynamic adaptation of width and height of form

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

@@ -95,7 +95,6 @@ void CSignalBar::initSBItems()
void CSignalBar::initVarSigBar() void CSignalBar::initVarSigBar()
{ {
initVarForm();
corner_rad = 0; corner_rad = 0;
corner_type = 0; corner_type = 0;
append_h_offset = 2; append_h_offset = 2;
@@ -313,7 +312,6 @@ CSignalBox::CSignalBox(const int& xpos, const int& ypos, const int& w, const int
void CSignalBox::initVarSigBox() void CSignalBox::initVarSigBox()
{ {
initVarForm();
corner_rad = 0; corner_rad = 0;
sbx_frontend = NULL; sbx_frontend = NULL;

1
src/gui/components/cc_frm_window.cpp
View File

@@ -125,7 +125,6 @@ CComponentsWindow::~CComponentsWindow()
void CComponentsWindow::initVarWindow() void CComponentsWindow::initVarWindow()
{ {
//CComponentsForm //CComponentsForm
initVarForm();
cc_item_type = CC_ITEMTYPE_FRM_WINDOW; cc_item_type = CC_ITEMTYPE_FRM_WINDOW;
//using current screen settings for default dimensions //using current screen settings for default dimensions

2
src/gui/volumebar.cpp
View File

@@ -44,8 +44,6 @@ CVolumeBar::CVolumeBar()
void CVolumeBar::initVarVolumeBar() void CVolumeBar::initVarVolumeBar()
{ {
//init inherited variables
initVarForm();
col_body = COL_MENUCONTENT_PLUS_0; col_body = COL_MENUCONTENT_PLUS_0;
vb_item_offset = 4; vb_item_offset = 4;