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

Revert "Fix compiler warnings (-Wconversion)"

Browse Source 
This reverts commit 8919d0aba0.

I have a different, simpler version in my tree. Keep only the
(unsigned char) cast in timerlist.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: f625a18324
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-26 (Sun, 26 Jan 2014)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2014-01-26 00:32:23 +01:00
parent 1a6c5ee351
commit 6e82ac31e4
6 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/bedit/bouqueteditor_bouquets.cpp
View File

@@ -124,11 +124,11 @@ void CBEBouquetWidget::paint()
if (sbc < 1)
sbc = 1;
int sbh = ((sb - 4) * 1024) / sbc;
float sbh= (sb- 4)/ sbc;
int sbs= (selected/listmaxshow);
//scrollbar
frameBuffer->paintBoxRel(x+width-13, ypos+2+(sbs*sbh)/1024, 11, sbh/1024, COL_MENUCONTENT_PLUS_3);
frameBuffer->paintBoxRel(x+ width- 13, ypos+ 2+ int(sbs* sbh) , 11, int(sbh), COL_MENUCONTENT_PLUS_3);
}
void CBEBouquetWidget::paintHead()

5
src/gui/bookmarkmanager.cpp
View File

@@ -456,9 +456,10 @@ void CBookmarkManager::paint()
int sbc= ((bookmarks.size()- 1)/ listmaxshow)+ 1;
if (sbc < 1)
sbc = 1;
int sbh = ((sb - 4) * 1024) / sbc;
frameBuffer->paintBoxRel(x+width-13, ypos+2+(page_nr*sbh)/1024, 11, sbh/1024, COL_MENUCONTENT_PLUS_3);
float sbh= (sb- 4)/ sbc;
frameBuffer->paintBoxRel(x+ width- 13, ypos+ 2+ int(page_nr * sbh) , 11, int(sbh), COL_MENUCONTENT_PLUS_3);
}
paintFoot();

4
src/gui/bouquetlist.cpp
View File

@@ -634,8 +634,8 @@ void CBouquetList::paint()
frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_MENUCONTENT_PLUS_1);
int sbc= ((bsize - 1)/ listmaxshow)+ 1; /* bsize is > 0, so sbc is also > 0 */
int sbh = ((sb - 4) * 1024) / sbc;
float sbh= (sb - 4)/ sbc;
int sbs= (selected/listmaxshow);
frameBuffer->paintBoxRel(x+width-13, ypos+2+(sbs*sbh)/1024, 11, sbh/1024, COL_MENUCONTENT_PLUS_3);
frameBuffer->paintBoxRel(x+ width- 13, ypos+ 2+ int(sbs* sbh) , 11, int(sbh), COL_MENUCONTENT_PLUS_3);
}

4
src/gui/eventlist.cpp
View File

@@ -921,10 +921,10 @@ void CNeutrinoEventList::paint(t_channel_id channel_id)
if (sbc < 1)
sbc = 1;
int sbh = ((sb - 4) * 1024) / sbc;
float sbh= (sb- 4)/ sbc;
int sbs= (selected/listmaxshow);
frameBuffer->paintBoxRel(x+width-13, ypos+2+(sbs*sbh)/1024, 11, sbh/1024, COL_MENUCONTENT_PLUS_3);
frameBuffer->paintBoxRel(x+ width- 13, ypos+ 2+ int(sbs* sbh) , 11, int(sbh), COL_MENUCONTENT_PLUS_3);
}

4
src/gui/pictureviewer.cpp
View File

@@ -760,10 +760,10 @@ void CPictureViewerGui::paint()
if (sbc < 1)
sbc = 1;
int sbh = ((sb - 4) * 1024) / sbc;
float sbh= (sb- 4)/ sbc;
int sbs= (selected/listmaxshow);
frameBuffer->paintBoxRel(x+width-13, ypos+2+(sbs*sbh)/1024, 11, sbh/1024, COL_MENUCONTENT_PLUS_3);
frameBuffer->paintBoxRel(x+ width- 13, ypos+ 2+ int(sbs* sbh) , 11, int(sbh), COL_MENUCONTENT_PLUS_3);
paintFoot();
paintInfo();

4
src/gui/timerlist.cpp
View File

@@ -917,9 +917,9 @@ void CTimerList::paint()
frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_MENUCONTENT_PLUS_1);
int sbc= ((timerlist.size()- 1)/ listmaxshow)+ 1;
int sbh = ((sb - 4) * 1024) / sbc;
float sbh= (sb- 4)/ sbc;
frameBuffer->paintBoxRel(x+width-13, ypos+2+(page_nr*sbh)/1024, 11, sbh/1024, COL_MENUCONTENT_PLUS_3, RADIUS_SMALL);
frameBuffer->paintBoxRel(x+ width- 13, ypos+ 2+ int(page_nr * sbh) , 11, int(sbh), COL_MENUCONTENT_PLUS_3, RADIUS_SMALL);
}
paintFoot();