mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-30 17:01:15 +02:00
cc_frm_window: rename member initVarWindow() -> init()
One step to unify member names
This commit is contained in:
@@ -59,7 +59,7 @@ using namespace std;
|
|||||||
//sub class CComponentsWindow inherit from CComponentsForm
|
//sub class CComponentsWindow inherit from CComponentsForm
|
||||||
CComponentsWindow::CComponentsWindow(CComponentsForm *parent)
|
CComponentsWindow::CComponentsWindow(CComponentsForm *parent)
|
||||||
{
|
{
|
||||||
initVarWindow(0, 0, 800, 600, "", "", parent, CC_SHADOW_OFF, COL_FRAME_PLUS_0, COL_MENUCONTENT_PLUS_0, COL_SHADOW_PLUS_0);
|
init(0, 0, 800, 600, "", "", parent, CC_SHADOW_OFF, COL_FRAME_PLUS_0, COL_MENUCONTENT_PLUS_0, COL_SHADOW_PLUS_0);
|
||||||
}
|
}
|
||||||
|
|
||||||
CComponentsWindow::CComponentsWindow( const int& x_pos, const int& y_pos, const int& w, const int& h,
|
CComponentsWindow::CComponentsWindow( const int& x_pos, const int& y_pos, const int& w, const int& h,
|
||||||
@@ -72,7 +72,7 @@ CComponentsWindow::CComponentsWindow( const int& x_pos, const int& y_pos, const
|
|||||||
fb_pixel_t color_shadow)
|
fb_pixel_t color_shadow)
|
||||||
{
|
{
|
||||||
string s_caption = locale_caption != NONEXISTANT_LOCALE ? g_Locale->getText(locale_caption) : "";
|
string s_caption = locale_caption != NONEXISTANT_LOCALE ? g_Locale->getText(locale_caption) : "";
|
||||||
initVarWindow(x_pos, y_pos, w, h, s_caption, iconname, parent, shadow_mode, color_frame, color_body, color_shadow);
|
init(x_pos, y_pos, w, h, s_caption, iconname, parent, shadow_mode, color_frame, color_body, color_shadow);
|
||||||
}
|
}
|
||||||
|
|
||||||
CComponentsWindow::CComponentsWindow( const int& x_pos, const int& y_pos, const int& w, const int& h,
|
CComponentsWindow::CComponentsWindow( const int& x_pos, const int& y_pos, const int& w, const int& h,
|
||||||
@@ -84,7 +84,7 @@ CComponentsWindow::CComponentsWindow( const int& x_pos, const int& y_pos, const
|
|||||||
fb_pixel_t color_body,
|
fb_pixel_t color_body,
|
||||||
fb_pixel_t color_shadow)
|
fb_pixel_t color_shadow)
|
||||||
{
|
{
|
||||||
initVarWindow(x_pos, y_pos, w, h, caption, iconname, parent, shadow_mode, color_frame, color_body, color_shadow);
|
init(x_pos, y_pos, w, h, caption, iconname, parent, shadow_mode, color_frame, color_body, color_shadow);
|
||||||
}
|
}
|
||||||
|
|
||||||
CComponentsWindowMax::CComponentsWindowMax( const string& caption,
|
CComponentsWindowMax::CComponentsWindowMax( const string& caption,
|
||||||
@@ -116,7 +116,7 @@ CComponentsWindowMax::CComponentsWindowMax( neutrino_locale_t locale_caption,
|
|||||||
cc_item_type.name = "cc_window_max_localized";
|
cc_item_type.name = "cc_window_max_localized";
|
||||||
}
|
}
|
||||||
|
|
||||||
void CComponentsWindow::initVarWindow( const int& x_pos, const int& y_pos, const int& w, const int& h,
|
void CComponentsWindow::init( const int& x_pos, const int& y_pos, const int& w, const int& h,
|
||||||
const string& caption,
|
const string& caption,
|
||||||
const string& iconname,
|
const string& iconname,
|
||||||
CComponentsForm *parent,
|
CComponentsForm *parent,
|
||||||
|
@@ -109,7 +109,7 @@ class CComponentsWindow : public CComponentsForm, CCHeaderTypes
|
|||||||
///initialze all window objects at once
|
///initialze all window objects at once
|
||||||
void initCCWItems();
|
void initCCWItems();
|
||||||
///initialize all attributes
|
///initialize all attributes
|
||||||
void initVarWindow( const int& x_pos, const int& y_pos, const int& w, const int& h,
|
void init( const int& x_pos, const int& y_pos, const int& w, const int& h,
|
||||||
const std::string& caption,
|
const std::string& caption,
|
||||||
const std::string& iconname,
|
const std::string& iconname,
|
||||||
CComponentsForm *parent,
|
CComponentsForm *parent,
|
||||||
|
Reference in New Issue
Block a user