From 3aa91ac91fed4a68f29e420a686f32a2c7dcb9f9 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Fri, 21 Apr 2017 23:06:02 +0200 Subject: [PATCH] CComponentsHeader/CChannelList: unify methode names Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/9ef6c49a233aff6cc8548006e989734327b2c1b7 Author: Thilo Graf Date: 2017-04-21 (Fri, 21 Apr 2017) --- src/gui/channellist.cpp | 12 ++++++------ src/gui/components/cc_frm_header.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 65213ea5d..2e6ad72b1 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -1682,10 +1682,10 @@ void CChannelList::showChannelLogo() return; if(g_settings.channellist_show_channellogo){ header->setChannelLogo((*chanlist)[selected]->getChannelID(), (*chanlist)[selected]->getName()); - header->getLogoObject()->hide(); - header->getLogoObject()->clearSavedScreen(); - header->getLogoObject()->allowPaint(true); - header->getLogoObject()->paint(); + header->getChannelLogoObject()->hide(); + header->getChannelLogoObject()->clearSavedScreen(); + header->getChannelLogoObject()->allowPaint(true); + header->getChannelLogoObject()->paint(); } } @@ -2155,9 +2155,9 @@ void CChannelList::paintHead() if(g_settings.channellist_show_channellogo){ //ensure to have clean background - header->getLogoObject()->hide(); + header->getChannelLogoObject()->hide(); header->setChannelLogo((*chanlist)[selected]->getChannelID(), (*chanlist)[selected]->getName()); - header->getLogoObject()->allowPaint(false); + header->getChannelLogoObject()->allowPaint(false); } header->paint(CC_SAVE_SCREEN_NO); showChannelLogo(); diff --git a/src/gui/components/cc_frm_header.h b/src/gui/components/cc_frm_header.h index 17e9f5dba..1a0f1c8d4 100644 --- a/src/gui/components/cc_frm_header.h +++ b/src/gui/components/cc_frm_header.h @@ -326,7 +326,7 @@ class CComponentsHeader : public CComponentsForm, public CCTextScreen /**Methode to get channel logo object for direct access to its properties and methodes * @return CComponentsChannelLogoScalable* */ - CComponentsChannelLogoScalable* getLogoObject(){return cch_logo_obj;} + CComponentsChannelLogoScalable* getChannelLogoObject(){return cch_logo_obj;} }; //! Sub class of CComponentsHeader.