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

gui/widget/buttons: remove unused parameters

Browse Source 
Origin commit data
------------------
Commit: cc4010716a
Author: Thilo Graf <dbt@novatux.de>
Date: 2022-02-17 (Thu, 17 Feb 2022)
This commit is contained in:
Thilo Graf
2022-02-17 07:11:09 +01:00
committed by vanhofen
parent 5f021312eb
commit f1b35ccbd7
4 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/epgview.cpp
View File

@@ -1727,9 +1727,9 @@ void CEpgData::showTimerEventBar (bool pshow, bool adzap, bool mp_info)
EpgButtons[TV_BUTTONS][3].button = NEUTRINO_ICON_BUTTON_DUMMY_SMALL; EpgButtons[TV_BUTTONS][3].button = NEUTRINO_ICON_BUTTON_DUMMY_SMALL;
if (g_settings.recording_type != CNeutrinoApp::RECORDING_OFF) if (g_settings.recording_type != CNeutrinoApp::RECORDING_OFF)
::paintButtons(x, y, w, MaxButtons, EpgButtons[TV_BUTTONS], w, h, "", false, COL_MENUFOOT_TEXT, adzap ? adzap_button.c_str() : NULL, 2); ::paintButtons(x, y, w, MaxButtons, EpgButtons[TV_BUTTONS], w, h, false, COL_MENUFOOT_TEXT, adzap ? adzap_button.c_str() : NULL, 2);
else // don't show recording button else // don't show recording button
::paintButtons(x, y, w, MaxButtons, &EpgButtons[TV_BUTTONS][1], w, h, "", false, COL_MENUFOOT_TEXT, adzap ? adzap_button.c_str() : NULL, 1); ::paintButtons(x, y, w, MaxButtons, &EpgButtons[TV_BUTTONS][1], w, h, false, COL_MENUFOOT_TEXT, adzap ? adzap_button.c_str() : NULL, 1);
} }
} }

4
src/gui/pictureviewer.cpp
View File

@@ -180,8 +180,8 @@ int CPictureViewerGui::exec(CMenuTarget* parent, const std::string & actionKey)
item_height = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight(); item_height = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
//get footer_height from paintButtons //get footer_height from paintButtons
buttons1_height = ::paintButtons(0, 0, 0, PictureViewerButtons1Count, PictureViewerButtons1, 0, 0, "", false, COL_MENUFOOT_TEXT, NULL, 0, false); buttons1_height = ::paintButtons(0, 0, 0, PictureViewerButtons1Count, PictureViewerButtons1, 0, 0, false, COL_MENUFOOT_TEXT, NULL, 0, false);
buttons2_height = ::paintButtons(0, 0, 0, PictureViewerButtons2Count, PictureViewerButtons2, 0, 0, "", false, COL_MENUFOOT_TEXT, NULL, 0, false); buttons2_height = ::paintButtons(0, 0, 0, PictureViewerButtons2Count, PictureViewerButtons2, 0, 0, false, COL_MENUFOOT_TEXT, NULL, 0, false);
footer_height = buttons1_height + buttons2_height; footer_height = buttons1_height + buttons2_height;
listmaxshow = (height - header_height - footer_height - OFFSET_SHADOW)/item_height; listmaxshow = (height - header_height - footer_height - OFFSET_SHADOW)/item_height;

4
src/gui/widget/buttons.cpp
View File

@@ -296,13 +296,11 @@ int paintButtons( const int &x,
const struct button_label * const content, const struct button_label * const content,
const int &maxwidth, const int &maxwidth,
const int &footerheight, const int &footerheight,
std::string /* just to make sure nobody uses anything below */,
bool vertical_paint, bool vertical_paint,
const uint32_t fcolor, const uint32_t fcolor,
const char * alt_buttontext, const char * alt_buttontext,
const uint &buttontext_id, const uint &buttontext_id,
bool show, bool show)
const std::vector<neutrino_locale_t>& /*all_buttontext_id*/)
{ {
CFrameBuffer *frameBuffer = CFrameBuffer::getInstance(); CFrameBuffer *frameBuffer = CFrameBuffer::getInstance();
Font * font = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_FOOT]; Font * font = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_FOOT];

4
src/gui/widget/buttons.h
View File

@@ -79,12 +79,10 @@ int paintButtons( const int &x,
const struct button_label * const content, const struct button_label * const content,
const int &maxwidth, const int &maxwidth,
const int &footerheight = 0, const int &footerheight = 0,
std::string tmp = "", /* just to make sure compilation breaks */
bool vertical_paint = false, bool vertical_paint = false,
const uint32_t fcolor = COL_MENUFOOT_TEXT, const uint32_t fcolor = COL_MENUFOOT_TEXT,
const char * alt_buttontext = NULL, const char * alt_buttontext = NULL,
const uint &buttontext_id = 0, const uint &buttontext_id = 0,
bool show = true, bool show = true);
const std::vector<neutrino_locale_t>& all_buttontext_id = std::vector<neutrino_locale_t>());
#endif /* __gui_widget_buttons_h__ */ #endif /* __gui_widget_buttons_h__ */