From ebcf2dd3f18ae40cd305e2e52326fc46c5dfbb55 Mon Sep 17 00:00:00 2001 From: striper Date: Sat, 26 Nov 2011 23:45:26 +0000 Subject: [PATCH] - follow-up patch for rev. 1909 - fix warning in moviebrowser.cpp git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1918 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- src/gui/moviebrowser.h | 2 +- src/gui/widget/mountchooser.cpp | 2 +- src/gui/widget/mountchooser.h | 2 +- src/gui/zapit_setup.cpp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gui/moviebrowser.h b/src/gui/moviebrowser.h index 65f7c75c4..d12180ba5 100644 --- a/src/gui/moviebrowser.h +++ b/src/gui/moviebrowser.h @@ -448,7 +448,7 @@ class CMenuSelector : public CMenuItem class CMenuWidgetSelection : public CMenuWidget { public: - CMenuWidgetSelection(const neutrino_locale_t Name, const std::string & Icon = "", const int mwidth = 400, const int mheight = 576) : CMenuWidget( Name,Icon,mwidth, mheight){;}; + CMenuWidgetSelection(const neutrino_locale_t Name, const std::string & Icon = "", const int mwidth = 30) : CMenuWidget(Name, Icon, mwidth){;}; int getSelectedLine(void){return exit_pressed ? -1 : selected;}; }; diff --git a/src/gui/widget/mountchooser.cpp b/src/gui/widget/mountchooser.cpp index d71a7988d..84b15f1d9 100644 --- a/src/gui/widget/mountchooser.cpp +++ b/src/gui/widget/mountchooser.cpp @@ -41,7 +41,7 @@ #include #include -CMountChooser::CMountChooser(const neutrino_locale_t Name, const std::string & Icon, int * chosenIndex, char * chosenLocalDir, const char * const selectedLocalDir, const int mwidth, const int mheight) +CMountChooser::CMountChooser(const neutrino_locale_t Name, const std::string & Icon, int * chosenIndex, char * chosenLocalDir, const char * const selectedLocalDir, const int mwidth) : CMenuWidget(Name, Icon,mwidth,mheight), index(chosenIndex), localDir(chosenLocalDir) { char indexStr[2]; diff --git a/src/gui/widget/mountchooser.h b/src/gui/widget/mountchooser.h index 555029210..d8a558b0a 100644 --- a/src/gui/widget/mountchooser.h +++ b/src/gui/widget/mountchooser.h @@ -56,7 +56,7 @@ class CMountChooser : public CMenuWidget public: - CMountChooser(const neutrino_locale_t Name, const std::string & Icon = "", int * chosenIndex = NULL, char * chosenLocalDir = NULL, const char * const selectedLocalDir = "", const int mwidth = 80, const int mheight = 576); + CMountChooser(const neutrino_locale_t Name, const std::string & Icon = "", int * chosenIndex = NULL, char * chosenLocalDir = NULL, const char * const selectedLocalDir = "", const int mwidth = 80); int exec(CMenuTarget* parent, const std::string & actionKey); void setSelectedItem(int selection); diff --git a/src/gui/zapit_setup.cpp b/src/gui/zapit_setup.cpp index 023d635fb..336b3b5f9 100644 --- a/src/gui/zapit_setup.cpp +++ b/src/gui/zapit_setup.cpp @@ -149,11 +149,11 @@ extern CBouquetManager *g_bouquetManager; void CSelectChannelWidget::InitZapitChannelHelper(CZapitClient::channelsMode mode) { std::vector toDelete; - CMenuWidget mctv(LOCALE_TIMERLIST_BOUQUETSELECT, NEUTRINO_ICON_SETTINGS, width, height); + CMenuWidget mctv(LOCALE_TIMERLIST_BOUQUETSELECT, NEUTRINO_ICON_SETTINGS, width); mctv.addIntroItems(); for (int i = 0; i < (int) g_bouquetManager->Bouquets.size(); i++) { - CMenuWidget* mwtv = new CMenuWidget(LOCALE_TIMERLIST_CHANNELSELECT, NEUTRINO_ICON_SETTINGS, width, height); + CMenuWidget* mwtv = new CMenuWidget(LOCALE_TIMERLIST_CHANNELSELECT, NEUTRINO_ICON_SETTINGS, width); toDelete.push_back(mwtv); mwtv->addIntroItems(); ZapitChannelList channels = (mode == CZapitClient::MODE_RADIO) ? g_bouquetManager->Bouquets[i]->radioChannels : g_bouquetManager->Bouquets[i]->tvChannels;