From 0b83d05e4266fe78ec48389abdb12e49307998f2 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Sun, 27 Oct 2019 16:24:47 +0100 Subject: [PATCH] cc_frm_window: rename member initVarWindow() -> init() One step to unify member names --- src/gui/components/cc_frm_window.cpp | 8 ++++---- src/gui/components/cc_frm_window.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gui/components/cc_frm_window.cpp b/src/gui/components/cc_frm_window.cpp index ca1385136..cd2af2258 100644 --- a/src/gui/components/cc_frm_window.cpp +++ b/src/gui/components/cc_frm_window.cpp @@ -59,7 +59,7 @@ using namespace std; //sub class CComponentsWindow inherit from CComponentsForm 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, @@ -72,7 +72,7 @@ CComponentsWindow::CComponentsWindow( const int& x_pos, const int& y_pos, const fb_pixel_t color_shadow) { 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, @@ -84,7 +84,7 @@ CComponentsWindow::CComponentsWindow( const int& x_pos, const int& y_pos, const fb_pixel_t color_body, 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, @@ -116,7 +116,7 @@ CComponentsWindowMax::CComponentsWindowMax( neutrino_locale_t locale_caption, 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& iconname, CComponentsForm *parent, diff --git a/src/gui/components/cc_frm_window.h b/src/gui/components/cc_frm_window.h index cec4c04c8..07ebed2f3 100644 --- a/src/gui/components/cc_frm_window.h +++ b/src/gui/components/cc_frm_window.h @@ -109,7 +109,7 @@ class CComponentsWindow : public CComponentsForm, CCHeaderTypes ///initialze all window objects at once void initCCWItems(); ///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& iconname, CComponentsForm *parent,