From 5fc16d4d160418036e915129ba1c7f941b7d3d76 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Sat, 26 Nov 2011 09:31:53 +0000 Subject: [PATCH] Change new class member name to more unique, this prevents possible conflicts - with strict compile at least one was in bouqueteditor_channels.cpp git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1910 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/bdd958ba74e76b8d6ed00324514468274b5c9a69 Author: [CST] Focus Date: 2011-11-26 (Sat, 26 Nov 2011) ------------------ This commit was generated by Migit --- src/gui/widget/menue.cpp | 6 +++--- src/gui/widget/menue.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index 24836ec5d..a0f69ae84 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -327,14 +327,14 @@ CMenuWidget::CMenuWidget(const char* Name, const std::string & Icon, const int m void CMenuWidget::Init(const std::string & Icon, const int mwidth, const mn_widget_id_t &w_index) { - m = CMenuGlobal::getInstance(); //create CMenuGlobal instance only here + mglobal = CMenuGlobal::getInstance(); //create CMenuGlobal instance only here frameBuffer = CFrameBuffer::getInstance(); iconfile = Icon; //handle select values widget_index = w_index; preselected = NO_WIDGET_ID; - selected = (widget_index == NO_WIDGET_ID ? preselected : m->v_selected[widget_index]); + selected = (widget_index == NO_WIDGET_ID ? preselected : mglobal->v_selected[widget_index]); min_width = 0; width = 0; /* is set in paint() */ @@ -755,7 +755,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &) } if (widget_index > -1) - m->v_selected[widget_index] = selected; + mglobal->v_selected[widget_index] = selected; frameBuffer->Unlock(); return retval; diff --git a/src/gui/widget/menue.h b/src/gui/widget/menue.h index bacfb747d..6562d6c2d 100644 --- a/src/gui/widget/menue.h +++ b/src/gui/widget/menue.h @@ -390,7 +390,7 @@ class CMenuWidget : public CMenuTarget { private: mn_widget_id_t widget_index; - CMenuGlobal *m; + CMenuGlobal *mglobal; protected: std::string nameString; neutrino_locale_t name;