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

Mark unused vars as comment

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@104 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 1b13da2617
Author: mws <mws@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-21 (Mon, 21 Dec 2009)
This commit is contained in:
mws
2009-12-21 16:23:09 +00:00
parent 4e814f593e
commit c62aa94983
87 changed files with 1685 additions and 1684 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gui/widget/drawable.cpp
View File

@@ -42,7 +42,7 @@
#include <neutrino.h>
Drawable::Drawable()
{
{
}
Drawable::~Drawable()
@@ -66,7 +66,7 @@ Drawable::DType Drawable::getType(void)
// ------------------------------------------------------------------------------
DText::DText(std::string& text)
DText::DText(std::string& text)
{
m_text = text;
init();
@@ -81,14 +81,14 @@ DText::DText(const char *text)
void DText::init()
{
m_width = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getRenderWidth(m_text, true); // UTF-8
m_height = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
m_height = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
}
void DText::draw(CFBWindow *window, int x, int y, int width)
{
window->RenderString(g_Font[SNeutrinoSettings::FONT_TYPE_MENU], x, y + m_height, width,
m_text.c_str(), (CFBWindow::color_t)COL_MENUCONTENT, 0, true); // UTF-8
m_text.c_str(), (CFBWindow::color_t)COL_MENUCONTENT, 0, true); // UTF-8
}
void DText::print(void)
@@ -115,7 +115,7 @@ void DIcon::init()
m_width = 16;
}
void DIcon::draw(CFBWindow *window, int x, int y, int width)
void DIcon::draw(CFBWindow *window, int x, int y, int /*width*/)
{
window->paintIcon(m_icon.c_str(), x, y);
}
@@ -132,11 +132,11 @@ DPagebreak::DPagebreak()
m_width = 0;
}
void DPagebreak::draw(CFBWindow *window, int x, int y, int width)
void DPagebreak::draw(CFBWindow */*window*/, int /*x*/, int /*y*/, int /*width*/)
{
// window->RenderString(g_Font[SNeutrinoSettings::FONT_TYPE_MENU],
// x, y + m_height, width, "<pagebreak>",
// (CFBWindow::color_t)COL_MENUCONTENT, 0, true); // UTF-8
// window->RenderString(g_Font[SNeutrinoSettings::FONT_TYPE_MENU],
// x, y + m_height, width, "<pagebreak>",
// (CFBWindow::color_t)COL_MENUCONTENT, 0, true); // UTF-8
}
void DPagebreak::print(void)

2
src/gui/widget/keychooser.h
View File

@@ -94,7 +94,7 @@ class CKeyChooserItemNoKey : public CMenuTarget
key=Key;
};
int exec(CMenuTarget* parent, const std::string & actionKey)
int exec(CMenuTarget* /*parent*/, const std::string & /*actionKey*/)
{
*key=CRCInput::RC_nokey;
return menu_return::RETURN_REPAINT;

6
src/gui/widget/listbox.cpp
View File

@@ -124,13 +124,13 @@ int CListBox::getItemHeight()
return fheight;
}
void CListBox::paintItem(unsigned int itemNr, int paintNr, bool selected)
void CListBox::paintItem(unsigned int /*itemNr*/, int paintNr, bool selected)
{
int ypos = y+ theight + paintNr*getItemHeight();
uint8_t color;
fb_pixel_t bgcolor;
if (selected)
{
color = COL_MENUCONTENTSELECTED;
@@ -146,7 +146,7 @@ void CListBox::paintItem(unsigned int itemNr, int paintNr, bool selected)
g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x + 10, ypos+ fheight, width-20, "demo", color);
}
int CListBox::exec(CMenuTarget* parent, const std::string & actionKey)
int CListBox::exec(CMenuTarget* parent, const std::string & /*actionKey*/)
{
neutrino_msg_t msg;
neutrino_msg_data_t data;

8
src/gui/widget/listbox.h
View File

@@ -48,7 +48,7 @@ class CListBox : public CMenuWidget
unsigned int selected;
unsigned int liststart;
unsigned int listmaxshow;
int ButtonHeight;
//----------------------------
@@ -59,7 +59,7 @@ class CListBox : public CMenuWidget
virtual void paintFoot();
virtual void hide();
//------hier Methoden <20>berschreiben-------
//------Fernbedienungsevents--------------
@@ -68,7 +68,7 @@ class CListBox : public CMenuWidget
virtual void onYellowKeyPressed(){};
virtual void onBlueKeyPressed(){};
virtual void onOkKeyPressed(){};
virtual void onOtherKeyPressed( int key ){};
virtual void onOtherKeyPressed( int /*key*/ ){};
//------gibt die Anzahl der Listenitems---
virtual unsigned int getItemCount();
@@ -81,7 +81,7 @@ class CListBox : public CMenuWidget
void setModified(void);
public:
CListBox(const char * const Caption);
CListBox(const char * const Caption);
virtual int exec(CMenuTarget* parent, const std::string & actionKey);
};

10
src/gui/widget/menue.cpp
View File

@@ -271,7 +271,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
}
else if(msg==CRCInput::RC_page_down) {
pos = (int) page_start[current_page + 1];// - 1;
if(pos >= (int) items.size())
if(pos >= (int) items.size())
pos = items.size()-1;
for (unsigned int count=pos ; count < items.size(); count++) {
CMenuItem* item = items[pos];
@@ -405,7 +405,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
while ( msg!=CRCInput::RC_timeout );
hide();
if ( fadeIn || fadeOut ) {
if ( fadeIn || fadeOut ) {
g_RCInput->killTimer(fadeTimer);
frameBuffer->setBlendLevel(g_settings.gtx_alpha1, g_settings.gtx_alpha2);
}
@@ -1077,7 +1077,7 @@ int CMenuForwarder::getWidth(void) const
option_text = option;
else if (option_string)
option_text = option_string->c_str();
if (option_text != NULL)
tw += 10 + g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getRenderWidth(option_text, true);
@@ -1222,7 +1222,7 @@ const char * CMenuSeparator::getString(void)
return g_Locale->getText(text);
}
int CMenuSeparator::paint(bool selected, bool last)
int CMenuSeparator::paint(bool selected, bool /*last*/)
{
int height;
CFrameBuffer * frameBuffer = CFrameBuffer::getInstance();
@@ -1320,7 +1320,7 @@ int CLockedMenuForwarder::exec(CMenuTarget* parent)
return CMenuForwarder::exec(parent);
}
int CMenuSelectorTarget::exec(CMenuTarget* parent, const std::string & actionKey)
int CMenuSelectorTarget::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
{
if (actionKey != "")
*m_select = atoi(actionKey.c_str());

12
src/gui/widget/menue.h
View File

@@ -55,7 +55,7 @@ class CChangeObserver
{
public:
virtual ~CChangeObserver(){}
virtual bool changeNotify(const neutrino_locale_t OptionName, void *Data)
virtual bool changeNotify(const neutrino_locale_t /*OptionName*/, void */*Data*/)
{
return false;
}
@@ -107,7 +107,7 @@ class CMenuItem
return false;
}
virtual int exec(CMenuTarget* parent)
virtual int exec(CMenuTarget* /*parent*/)
{
return 0;
}
@@ -153,7 +153,7 @@ class CMenuForwarder : public CMenuItem
virtual const char * getOption(void);
virtual const char * getName(void);
public:
CMenuForwarder(const neutrino_locale_t Text, const bool Active=true, const char * const Option=NULL, CMenuTarget* Target=NULL, const char * const ActionKey = NULL, const neutrino_msg_t DirectKey = CRCInput::RC_nokey, const char * const IconName = NULL);
@@ -191,7 +191,7 @@ class CAbstractMenuOptionChooser : public CMenuItem
{
return height;
}
bool isSelectable(void) const
{
return active;
@@ -214,7 +214,7 @@ class CMenuOptionNumberChooser : public CAbstractMenuOptionChooser
public:
CMenuOptionNumberChooser(const neutrino_locale_t name, int * const OptionValue, const bool Active, const int min_value, const int max_value, CChangeObserver * const Observ = NULL, const int print_offset = 0, const int special_value = 0, const neutrino_locale_t special_value_name = NONEXISTANT_LOCALE, const char * non_localized_name = NULL);
int paint(bool selected, bool last = false);
int exec(CMenuTarget* parent);
@@ -239,7 +239,7 @@ class CMenuOptionChooser : public CAbstractMenuOptionChooser
public:
CMenuOptionChooser(const neutrino_locale_t OptionName, int * const OptionValue, const struct keyval * const Options, const unsigned Number_Of_Options, const bool Active = false, CChangeObserver * const Observ = NULL, const neutrino_msg_t DirectKey = CRCInput::RC_nokey, const std::string & IconName= "", bool Pulldown = false);
CMenuOptionChooser(const char* OptionName, int * const OptionValue, const struct keyval * const Options, const unsigned Number_Of_Options, const bool Active = false, CChangeObserver * const Observ = NULL, const neutrino_msg_t DirectKey = CRCInput::RC_nokey, const std::string & IconName= "", bool Pulldown = false);
CMenuOptionChooser(const char* OptionName, int * const OptionValue, const struct keyval * const Options, const unsigned Number_Of_Options, const bool Active = false, CChangeObserver * const Observ = NULL, const neutrino_msg_t DirectKey = CRCInput::RC_nokey, const std::string & IconName= "", bool Pulldown = false);
void setOptionValue(const int newvalue);
int getOptionValue(void) const;

374
src/gui/widget/msgbox.cpp
View File

@@ -59,10 +59,10 @@
#define TITLE_ICON_WIDTH (40 - TEXT_BORDER_WIDTH)
#define MAX_WINDOW_WIDTH (g_settings.screen_EndX - g_settings.screen_StartX )
#define MAX_WINDOW_HEIGHT (g_settings.screen_EndY - g_settings.screen_StartY - 40)
#define MAX_WINDOW_HEIGHT (g_settings.screen_EndY - g_settings.screen_StartY - 40)
#define MIN_WINDOW_WIDTH (MAX_WINDOW_WIDTH>>1)
#define MIN_WINDOW_HEIGHT 40
#define MIN_WINDOW_HEIGHT 40
#define DEFAULT_TITLE_FONT g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]
#define DEFAULT_FOOT_FONT g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]
@@ -72,21 +72,21 @@
//////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////
// Function Name: CMsgBox
// Description:
// Parameters:
// Data IN/OUT:
// Return:
// Notes:
// Function Name: CMsgBox
// Description:
// Parameters:
// Data IN/OUT:
// Return:
// Notes:
//////////////////////////////////////////////////////////////////////
CMsgBox::CMsgBox( const char * text,
CMsgBox::CMsgBox( const char * text,
Font* fontText,
const int _mode,
const CBox* position,
const int _mode,
const CBox* position,
const char * title,
Font* fontTitle,
const char * icon,
int return_button ,
int return_button ,
const result_ default_result)
{
//TRACE("->CMsgBox::CMsgBox\r\n");
@@ -119,7 +119,7 @@ CMsgBox::CMsgBox( const char * text,
m_pcTextBox = new CTextBox( text,
fontText,
_mode,
_mode,
&m_cBoxFrameText);
if(_mode & AUTO_WIDTH || _mode & AUTO_HIGH)
@@ -144,12 +144,12 @@ CMsgBox::CMsgBox( const char * text,
}
//////////////////////////////////////////////////////////////////////
// Function Name: CMsgBox
// Description:
// Parameters:
// Data IN/OUT:
// Return:
// Notes:
// Function Name: CMsgBox
// Description:
// Parameters:
// Data IN/OUT:
// Return:
// Notes:
//////////////////////////////////////////////////////////////////////
CMsgBox::CMsgBox(const char * text)
{
@@ -161,12 +161,12 @@ CMsgBox::CMsgBox(const char * text)
}
//////////////////////////////////////////////////////////////////////
// Function Name: CMsgBox
// Description:
// Parameters:
// Data IN/OUT:
// Return:
// Notes:
// Function Name: CMsgBox
// Description:
// Parameters:
// Data IN/OUT:
// Return:
// Notes:
//////////////////////////////////////////////////////////////////////
CMsgBox::CMsgBox()
{
@@ -177,12 +177,12 @@ CMsgBox::CMsgBox()
}
//////////////////////////////////////////////////////////////////////
// Function Name: ~CMsgBox
// Description:
// Parameters:
// Data IN/OUT:
// Return:
// Notes:
// Function Name: ~CMsgBox
// Description:
// Parameters:
// Data IN/OUT:
// Return:
// Notes:
//////////////////////////////////////////////////////////////////////
CMsgBox::~CMsgBox()
{
@@ -201,12 +201,12 @@ CMsgBox::~CMsgBox()
}
//////////////////////////////////////////////////////////////////////
// Function Name: InitVar
// Description:
// Parameters:
// Data IN/OUT:
// Return:
// Notes:
// Function Name: InitVar
// Description:
// Parameters:
// Data IN/OUT:
// Return:
// Notes:
//////////////////////////////////////////////////////////////////////
void CMsgBox::initVar(void)
{
@@ -242,12 +242,12 @@ void CMsgBox::initVar(void)
}
//////////////////////////////////////////////////////////////////////
// Function Name: InitFramesRel
// Description:
// Parameters:
// Data IN/OUT:
// Return:
// Notes:
// Function Name: InitFramesRel
// Description:
// Parameters:
// Data IN/OUT:
// Return:
// Notes:
//////////////////////////////////////////////////////////////////////
void CMsgBox::initFramesRel(void)
{
@@ -312,16 +312,16 @@ void CMsgBox::initFramesRel(void)
m_cBoxFrameFootRel.iWidth,
m_cBoxFrameFootRel.iHeight
);
#endif
#endif
}
//////////////////////////////////////////////////////////////////////
// Function Name: RefreshFoot
// Description:
// Parameters:
// Data IN/OUT:
// Return:
// Notes:
// Function Name: RefreshFoot
// Description:
// Parameters:
// Data IN/OUT:
// Return:
// Notes:
//////////////////////////////////////////////////////////////////////
void CMsgBox::refreshFoot(void)
{
@@ -329,10 +329,10 @@ void CMsgBox::refreshFoot(void)
if( !(m_nMode & FOOT)) return;
// draw the background first
m_pcWindow->paintBoxRel( m_cBoxFrameFootRel.iX+m_cBoxFrame.iX,
m_cBoxFrameFootRel.iY+m_cBoxFrame.iY,
m_cBoxFrameFootRel.iWidth,
m_cBoxFrameFootRel.iHeight,
m_pcWindow->paintBoxRel( m_cBoxFrameFootRel.iX+m_cBoxFrame.iX,
m_cBoxFrameFootRel.iY+m_cBoxFrame.iY,
m_cBoxFrameFootRel.iWidth,
m_cBoxFrameFootRel.iHeight,
(CFBWindow::color_t)COL_MENUHEAD_PLUS_0);
//const char* text;
@@ -407,12 +407,12 @@ void CMsgBox::refreshFoot(void)
}
//////////////////////////////////////////////////////////////////////
// Function Name: RefreshTitle
// Description:
// Parameters:
// Data IN/OUT:
// Return:
// Notes:
// Function Name: RefreshTitle
// Description:
// Parameters:
// Data IN/OUT:
// Return:
// Notes:
//////////////////////////////////////////////////////////////////////
void CMsgBox::refreshTitle(void)
{
@@ -420,24 +420,24 @@ void CMsgBox::refreshTitle(void)
if( !(m_nMode & TITLE)) return;
// draw the background
m_pcWindow->paintBoxRel( m_cBoxFrameTitleRel.iX+m_cBoxFrame.iX,
m_cBoxFrameTitleRel.iY+m_cBoxFrame.iY,
m_cBoxFrameTitleRel.iWidth,
m_cBoxFrameTitleRel.iHeight,
m_pcWindow->paintBoxRel( m_cBoxFrameTitleRel.iX+m_cBoxFrame.iX,
m_cBoxFrameTitleRel.iY+m_cBoxFrame.iY,
m_cBoxFrameTitleRel.iWidth,
m_cBoxFrameTitleRel.iHeight,
(CFBWindow::color_t)COL_MENUHEAD_PLUS_0);
if (!m_cIcon.empty())
{
// draw icon and title text
m_pcWindow->paintIcon(m_cIcon.c_str(), m_cBoxFrameTitleRel.iX + 8+m_cBoxFrame.iX, m_cBoxFrameTitleRel.iY + 5+m_cBoxFrame.iY);
/*m_pcWindow->RenderString(*/
/*m_pcWindow->RenderString(*/
m_pcFontTitle->RenderString(
m_cBoxFrameTitleRel.iX + TITLE_ICON_WIDTH + TEXT_BORDER_WIDTH+m_cBoxFrame.iX,
m_cBoxFrameTitleRel.iHeight+3+m_cBoxFrame.iY,
m_cBoxFrameTitleRel.iWidth - TITLE_ICON_WIDTH + TEXT_BORDER_WIDTH,
m_cTitle.c_str(),
(CFBWindow::color_t)COL_MENUHEAD,
0,
m_cBoxFrameTitleRel.iX + TITLE_ICON_WIDTH + TEXT_BORDER_WIDTH+m_cBoxFrame.iX,
m_cBoxFrameTitleRel.iHeight+3+m_cBoxFrame.iY,
m_cBoxFrameTitleRel.iWidth - TITLE_ICON_WIDTH + TEXT_BORDER_WIDTH,
m_cTitle.c_str(),
(CFBWindow::color_t)COL_MENUHEAD,
0,
true); // UTF-8
}
else
@@ -445,40 +445,40 @@ void CMsgBox::refreshTitle(void)
// no icon available, just draw the title text
/*m_pcWindow->RenderString(*/
m_pcFontTitle->RenderString(
m_cBoxFrameTitleRel.iX + TEXT_BORDER_WIDTH+m_cBoxFrame.iX,
m_cBoxFrameTitleRel.iHeight+3+m_cBoxFrame.iY,
m_cBoxFrameTitleRel.iWidth - TEXT_BORDER_WIDTH,
m_cTitle.c_str(),
(CFBWindow::color_t)COL_MENUHEAD,
0,
m_cBoxFrameTitleRel.iX + TEXT_BORDER_WIDTH+m_cBoxFrame.iX,
m_cBoxFrameTitleRel.iHeight+3+m_cBoxFrame.iY,
m_cBoxFrameTitleRel.iWidth - TEXT_BORDER_WIDTH,
m_cTitle.c_str(),
(CFBWindow::color_t)COL_MENUHEAD,
0,
true); // UTF-8
}
}
//////////////////////////////////////////////////////////////////////
// Function Name: RefreshBorder
// Description:
// Parameters:
// Data IN/OUT:
// Return:
// Notes:
// Function Name: RefreshBorder
// Description:
// Parameters:
// Data IN/OUT:
// Return:
// Notes:
//////////////////////////////////////////////////////////////////////
void CMsgBox::refreshBorder(void)
{
if( !(m_nMode & BORDER && m_nWindowFrameBorderWidth > 0)) return;
//draw bottom shadow
m_pcWindow->paintBoxRel( m_nWindowFrameBorderWidth+m_cBoxFrame.iX,
m_cBoxFrame.iHeight - m_nWindowFrameBorderWidth+m_cBoxFrame.iY,
m_cBoxFrame.iWidth - m_nWindowFrameBorderWidth,
m_nWindowFrameBorderWidth,
m_pcWindow->paintBoxRel( m_nWindowFrameBorderWidth+m_cBoxFrame.iX,
m_cBoxFrame.iHeight - m_nWindowFrameBorderWidth+m_cBoxFrame.iY,
m_cBoxFrame.iWidth - m_nWindowFrameBorderWidth,
m_nWindowFrameBorderWidth,
COL_INFOBAR_SHADOW_PLUS_0);
//draw right shadow
m_pcWindow->paintBoxRel( m_cBoxFrame.iWidth - m_nWindowFrameBorderWidth+m_cBoxFrame.iX,
m_nWindowFrameBorderWidth+m_cBoxFrame.iY,
m_nWindowFrameBorderWidth,
m_cBoxFrame.iHeight - m_nWindowFrameBorderWidth,
m_pcWindow->paintBoxRel( m_cBoxFrame.iWidth - m_nWindowFrameBorderWidth+m_cBoxFrame.iX,
m_nWindowFrameBorderWidth+m_cBoxFrame.iY,
m_nWindowFrameBorderWidth,
m_cBoxFrame.iHeight - m_nWindowFrameBorderWidth,
COL_INFOBAR_SHADOW_PLUS_0);
}
@@ -488,12 +488,12 @@ void CMsgBox::refreshBorder(void)
//////////////////////////////////////////////////////////////////////
// Function Name: Hide
// Description:
// Parameters:
// Data IN/OUT:
// Return:
// Notes:
// Function Name: Hide
// Description:
// Parameters:
// Data IN/OUT:
// Return:
// Notes:
//////////////////////////////////////////////////////////////////////
bool CMsgBox::hide(void)
{
@@ -517,12 +517,12 @@ bool CMsgBox::hide(void)
}
//////////////////////////////////////////////////////////////////////
// Function Name: ScrollPageDown
// Description:
// Parameters:
// Data IN/OUT:
// Return:
// Notes:
// Function Name: ScrollPageDown
// Description:
// Parameters:
// Data IN/OUT:
// Return:
// Notes:
//////////////////////////////////////////////////////////////////////
void CMsgBox::scrollPageDown(const int pages)
{
@@ -535,12 +535,12 @@ void CMsgBox::scrollPageDown(const int pages)
};
//////////////////////////////////////////////////////////////////////
// Function Name: ScrollPageUp
// Description:
// Parameters:
// Data IN/OUT:
// Return:
// Notes:
// Function Name: ScrollPageUp
// Description:
// Parameters:
// Data IN/OUT:
// Return:
// Notes:
//////////////////////////////////////////////////////////////////////
void CMsgBox::scrollPageUp(const int pages)
{
@@ -552,12 +552,12 @@ void CMsgBox::scrollPageUp(const int pages)
};
//////////////////////////////////////////////////////////////////////
// Function Name: Paint
// Description:
// Parameters:
// Data IN/OUT:
// Return:
// Notes:
// Function Name: Paint
// Description:
// Parameters:
// Data IN/OUT:
// Return:
// Notes:
//////////////////////////////////////////////////////////////////////
bool CMsgBox::paint(void)
{
@@ -587,12 +587,12 @@ bool CMsgBox::paint(void)
}
//////////////////////////////////////////////////////////////////////
// Function Name: Refresh
// Description:
// Parameters:
// Data IN/OUT:
// Return:
// Notes:
// Function Name: Refresh
// Description:
// Parameters:
// Data IN/OUT:
// Return:
// Notes:
//////////////////////////////////////////////////////////////////////
void CMsgBox::refresh(void)
{
@@ -603,7 +603,7 @@ void CMsgBox::refresh(void)
TRACE(" return -> no window\r\n");
return;
}
//re-draw message box window
refreshTitle();
refreshFoot();
@@ -617,12 +617,12 @@ void CMsgBox::refresh(void)
}
//////////////////////////////////////////////////////////////////////
// Function Name: Exec
// Description:
// Parameters:
// Data IN/OUT:
// Return:
// Notes:
// Function Name: Exec
// Description:
// Parameters:
// Data IN/OUT:
// Return:
// Notes:
//////////////////////////////////////////////////////////////////////
int CMsgBox::exec( int timeout, int returnDefaultOnTimeout)
{
@@ -655,7 +655,7 @@ int CMsgBox::exec( int timeout, int returnDefaultOnTimeout)
if (msg == CRCInput::RC_timeout && returnDefaultOnTimeout)
{
// return default
// return default
loop = false;
}
else if ( ((msg == CRCInput::RC_timeout) ||
@@ -722,17 +722,17 @@ int CMsgBox::exec( int timeout, int returnDefaultOnTimeout)
hide();
#endif //VC
return res;
}
//////////////////////////////////////////////////////////////////////
// Function Name: SetText
// Description:
// Parameters:
// Data IN/OUT:
// Return:
// Notes:
// Function Name: SetText
// Description:
// Parameters:
// Data IN/OUT:
// Return:
// Notes:
//////////////////////////////////////////////////////////////////////
bool CMsgBox::setText(const std::string* newText)
{
@@ -759,18 +759,18 @@ bool CMsgBox::setText(const std::string* newText)
}
}
}
return(result);
};
//////////////////////////////////////////////////////////////////////
// Function Name: SetText
// Description:
// Parameters:
// Data IN/OUT:
// Return:
// Notes:
// Function Name: SetText
// Description:
// Parameters:
// Data IN/OUT:
// Return:
// Notes:
//////////////////////////////////////////////////////////////////////
int CMsgBox::result(void)
{
@@ -778,31 +778,31 @@ int CMsgBox::result(void)
}
//////////////////////////////////////////////////////////////////////
// Function Name: ShowMsg2UTF
// Description:
// Parameters:
// Data IN/OUT:
// Return:
// Notes:
// Function Name: ShowMsg2UTF
// Description:
// Parameters:
// Data IN/OUT:
// Return:
// Notes:
//////////////////////////////////////////////////////////////////////
int ShowMsg2UTF( const neutrino_locale_t Caption,
const char * const Text,
const CMsgBox::result_ Default,
const uint32_t ShowButtons,
const char * const Icon,
const int Width,
const int timeout,
const char * const Text,
const CMsgBox::result_ Default,
const uint32_t ShowButtons,
const char * const Icon,
const int Width,
const int timeout,
bool returnDefaultOnTimeout)
{
//TRACE("->CMsgBox::ShowTextUTF \r\n");
int result = ShowMsg2UTF( g_Locale->getText(Caption),
Text,
Default,
ShowButtons,
Icon,
Width,
timeout,
Text,
Default,
ShowButtons,
Icon,
Width,
timeout,
returnDefaultOnTimeout);
return (result);
@@ -810,40 +810,40 @@ int ShowMsg2UTF( const neutrino_locale_t Caption,
}
//////////////////////////////////////////////////////////////////////
// Function Name: ShowMsg2UTF
// Description:
// Parameters:
// Data IN/OUT:
// Return:
// Notes:
// Function Name: ShowMsg2UTF
// Description:
// Parameters:
// Data IN/OUT:
// Return:
// Notes:
//////////////////////////////////////////////////////////////////////
int ShowMsg2UTF( const char * const Title,
const char * const Text,
const CMsgBox::result_ Default,
const uint32_t ShowButtons,
const char * const Icon,
const int Width,
const int timeout,
const char * const Text,
const CMsgBox::result_ Default,
const uint32_t ShowButtons,
const char * const Icon,
const int /*Width*/,
const int timeout,
bool returnDefaultOnTimeout)
{
int mode = CMsgBox::SCROLL |
CMsgBox::TITLE |
CMsgBox::FOOT |
CMsgBox::BORDER;// |
//CMsgBox::NO_AUTO_LINEBREAK |
//CMsgBox::CENTER |
//CMsgBox::AUTO_WIDTH |
int mode = CMsgBox::SCROLL |
CMsgBox::TITLE |
CMsgBox::FOOT |
CMsgBox::BORDER;// |
//CMsgBox::NO_AUTO_LINEBREAK |
//CMsgBox::CENTER |
//CMsgBox::AUTO_WIDTH |
//CMsgBox::AUTO_HIGH;
CBox position ( g_settings.screen_StartX+30,
g_settings.screen_StartY+30,
g_settings.screen_EndX - g_settings.screen_StartX-60,
g_settings.screen_EndY - g_settings.screen_StartY-60);
g_settings.screen_EndY - g_settings.screen_StartY-60);
//TRACE("\r\n->ShowTextUTF %s\r\n",Text);
CMsgBox* msgBox = new CMsgBox( Text,
g_Font[SNeutrinoSettings::FONT_TYPE_MENU],
mode,
&position,
CMsgBox* msgBox = new CMsgBox( Text,
g_Font[SNeutrinoSettings::FONT_TYPE_MENU],
mode,
&position,
Title,
g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE],
Icon,
@@ -855,6 +855,6 @@ int ShowMsg2UTF( const char * const Title,
int res = msgBox->result();
delete msgBox;
return res;
}

2
src/gui/widget/progresswindow.cpp
View File

@@ -166,7 +166,7 @@ void CProgressWindow::paint()
showGlobalStatus(global_progress);
}
int CProgressWindow::exec(CMenuTarget* parent, const std::string & actionKey)
int CProgressWindow::exec(CMenuTarget* parent, const std::string & /*actionKey*/)
{
if(parent)
{

24
src/gui/widget/stringinput.cpp
View File

@@ -105,9 +105,9 @@ CStringInput::CStringInput(char * Head, char* Value, int Size, const neutrino_lo
init();
}
CStringInput::~CStringInput()
CStringInput::~CStringInput()
{
if (valueString != NULL)
if (valueString != NULL)
{
delete[] value;
}
@@ -116,7 +116,7 @@ CStringInput::~CStringInput()
}
}
void CStringInput::init()
void CStringInput::init()
{
width = (size*20)+40;
@@ -163,7 +163,7 @@ void CStringInput::NormalKeyPressed(const neutrino_msg_t key)
selected++;
paintChar(selected - 1);
}
paintChar(selected);
}
}
@@ -195,7 +195,7 @@ void CStringInput::keyRedPressed()
selected++;
paintChar(selected - 1);
}
paintChar(selected);
}
}
@@ -215,7 +215,7 @@ void CStringInput::keyBluePressed()
if (((value[selected] | 32) >= 'a') && ((value[selected] | 32) <= 'z'))
{
char newValue = value[selected] ^ 32;
if (index(validchars, newValue) != NULL)
if (index(validchars, newValue) != NULL)
{
value[selected] = newValue;
paintChar(selected);
@@ -368,7 +368,7 @@ int CStringInput::exec( CMenuTarget* parent, const std::string & )
selected++;
paintChar(selected - 1);
}
paintChar(selected);
}
else if (msg== CRCInput::RC_blue)
@@ -450,7 +450,7 @@ int CStringInput::exec( CMenuTarget* parent, const std::string & )
return res;
}
int CStringInput::handleOthers(const neutrino_msg_t msg, const neutrino_msg_data_t data)
int CStringInput::handleOthers(const neutrino_msg_t /*msg*/, const neutrino_msg_data_t /*data*/)
{
return messages_return::unhandled;
}
@@ -507,7 +507,7 @@ void CStringInput::paintChar(int pos, const char c)
uint8_t color;
fb_pixel_t bgcolor;
if (pos == selected)
{
color = COL_MENUCONTENTSELECTED;
@@ -566,7 +566,7 @@ void CStringInputSMS::initSMS(const char * const Valid_Chars)
if (strchr(Valid_Chars, CharList[i][k]) != NULL)
Chars[i][j++] = CharList[i][k];
if (j == 0)
Chars[i][j++] = ' '; // prevent empty char lists
Chars[i][j++] = ' '; // prevent empty char lists
arraySizes[i] = j;
}
@@ -642,7 +642,7 @@ void CStringInputSMS::keyDownPressed()
last_digit = -1;
int lastselected = selected;
selected = size - 1;
while (value[selected] == ' ')
@@ -654,7 +654,7 @@ void CStringInputSMS::keyDownPressed()
if (selected < (size - 1))
selected++;
paintChar(lastselected);
paintChar(selected);
}

10
src/gui/widget/stringinput_ext.h
View File

@@ -54,7 +54,7 @@ class CExtendedInput : public CMenuTarget
int hintPosY;
int hheight; // head font height
int mheight; // menu font height
int iheight;
int iheight;
std::vector<CExtendedInput_Item*> inputFields;
int selectedChar;
@@ -94,11 +94,11 @@ class CExtendedInput_Item
public:
virtual void setDataPointer(char* Data){data=Data;};
virtual void init(int &x, int &y){};
virtual void paint(int x, int y, bool focusGained){};
virtual void init(int &/*x*/, int &/*y*/){};
virtual void paint(int /*x*/, int /*y*/, bool /*focusGained*/){};
virtual bool isSelectable(){return true;};
virtual void keyPressed( int key ){};
virtual void keyPressed( int /*key*/ ){};
};
class CExtendedInput_Item_Spacer : public CExtendedInput_Item
@@ -130,7 +130,7 @@ class CExtendedInput_Item_Char : public CExtendedInput_Item
protected:
std::string allowedChars;
bool selectable;
bool isAllowedChar( char );
int getCharID( char );