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

infoicons: avoid extern CInfoIcons; use getInstance() instead of this

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5a34b06137
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-03 (Wed, 03 Jan 2018)

Origin message was:
------------------
- infoicons: avoid extern CInfoIcons; use getInstance() instead of this

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2018-01-03 10:49:50 +01:00
parent 0043b082c9
commit cfa5aa6414
10 changed files with 25 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/infoviewer.cpp
View File

@@ -83,7 +83,6 @@
//NI InfoIcons
#include "gui/infoicons.h"
extern CInfoIcons *InfoIcons; /* neutrino.cpp */
extern CRemoteControl *g_RemoteControl; /* neutrino.cpp */
extern CBouquetList * bouquetList; /* neutrino.cpp */
@@ -794,7 +793,7 @@ void CInfoViewer::showTitle(CZapitChannel * channel, const bool calledFromNumZap
//NI InfoIcons
if (!g_settings.mode_icons && g_settings.mode_icons_skin == INFOICONS_INFOVIEWER)
InfoIcons->paintIcons(true);
CInfoIcons::getInstance()->paintIcons(true);
if (showButtonBar) {
infoViewerBB->paintshowButtonBar(noTimer);
@@ -1384,9 +1383,9 @@ void CInfoViewer::killRadiotext()
CInfoClock::getInstance()->enableInfoClock(true);
//NI InfoIcons
if (!g_settings.mode_icons && g_settings.mode_icons_skin == INFOICONS_INFOVIEWER)
InfoIcons->paintIcons(true);
CInfoIcons::getInstance()->paintIcons(true);
else
InfoIcons->enableInfoIcons(true);
CInfoIcons::getInstance()->enableInfoIcons(true);
}
void CInfoViewer::showRadiotext()
@@ -1409,9 +1408,9 @@ void CInfoViewer::showRadiotext()
CInfoClock::getInstance()->enableInfoClock(false);
//NI InfoIcons
if (!g_settings.mode_icons && g_settings.mode_icons_skin == INFOICONS_INFOVIEWER)
InfoIcons->hideIcons();
CInfoIcons::getInstance()->hideIcons();
else
InfoIcons->enableInfoIcons(false);
CInfoIcons::getInstance()->enableInfoIcons(false);
int rt_font = SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO;
int item_h = g_Font[rt_font]->getHeight();
@@ -2163,7 +2162,7 @@ void CInfoViewer::killTitle()
//NI InfoIcons
if (!g_settings.mode_icons && g_settings.mode_icons_skin == INFOICONS_INFOVIEWER)
InfoIcons->hideIcons();
CInfoIcons::getInstance()->hideIcons();
}
showButtonBar = false;
CInfoClock::getInstance()->enableInfoClock();