mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-17 10:23:37 +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

9
src/gui/timeosd.cpp
View File

@@ -38,7 +38,6 @@
//NI InfoIcons
#include <gui/infoicons.h>
extern CInfoIcons *InfoIcons;
CTimeOSD::CTimeOSD():CComponentsFrmClock( 1, 1, NULL, "%H:%M:%S", NULL, false, 1, NULL, CC_SHADOW_ON)
@@ -158,21 +157,21 @@ void CTimeOSD::switchMode(int position, int duration)
switch (m_mode) {
case MODE_ASC:
case MODE_TMP:
InfoIcons->enableInfoIcons(false); //NI InfoIcons
CInfoIcons::getInstance()->enableInfoIcons(false); //NI InfoIcons
m_mode = MODE_DESC;
CComponents::kill();
break;
case MODE_DESC:
InfoIcons->enableInfoIcons(false); //NI InfoIcons
CInfoIcons::getInstance()->enableInfoIcons(false); //NI InfoIcons
m_mode = MODE_BAR;
CComponents::kill();
break;
case MODE_BAR:
InfoIcons->enableInfoIcons(true); //NI InfoIcons
CInfoIcons::getInstance()->enableInfoIcons(true); //NI InfoIcons
KillAndResetTimescale();
return;
default:
InfoIcons->enableInfoIcons(false); //NI InfoIcons
CInfoIcons::getInstance()->enableInfoIcons(false); //NI InfoIcons
m_mode = MODE_ASC;
}