From 34249fc1d9b0f1cbb149072e0130ee47e521a6ac Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Wed, 8 Jan 2014 10:14:26 +0100 Subject: [PATCH] CComponentsFrmClock: fix shaodow warning size is a member name of CComponentsForm Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/4e1caf8afe3a9f74abb4319ab31973a50bef5be8 Author: Thilo Graf Date: 2014-01-08 (Wed, 08 Jan 2014) --- src/gui/components/cc_frm_clock.cpp | 4 ++-- src/gui/components/cc_frm_clock.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/components/cc_frm_clock.cpp b/src/gui/components/cc_frm_clock.cpp index ab7323424..c3d6e6bfe 100644 --- a/src/gui/components/cc_frm_clock.cpp +++ b/src/gui/components/cc_frm_clock.cpp @@ -353,10 +353,10 @@ void CComponentsFrmClock::paint(bool do_save_bg) paintForm(do_save_bg); } -void CComponentsFrmClock::setClockFontSize(int size) +void CComponentsFrmClock::setClockFontSize(int font_size) { int tmp_w = 0; - dyn_font_size = size; + dyn_font_size = font_size; cl_font = CNeutrinoFonts::getInstance()->getDynFont(tmp_w, dyn_font_size, "", CNeutrinoFonts::FONT_STYLE_BOLD, CNeutrinoFonts::FONT_ID_INFOCLOCK); } diff --git a/src/gui/components/cc_frm_clock.h b/src/gui/components/cc_frm_clock.h index d08336310..f9065f877 100644 --- a/src/gui/components/cc_frm_clock.h +++ b/src/gui/components/cc_frm_clock.h @@ -100,7 +100,7 @@ class CComponentsFrmClock : public CComponentsForm ///set font type or font size for segments virtual void setClockFont(int font); - virtual void setClockFontSize(int size); + virtual void setClockFontSize(int font_size); ///set text color virtual void setTextColor(fb_pixel_t color_text){ cl_col_text = color_text;};