diff --git a/channelgroups.c b/channelgroups.c index 793b75e..06e3285 100644 --- a/channelgroups.c +++ b/channelgroups.c @@ -69,7 +69,7 @@ const char* cChannelGroups::GetPrev(int group) { const char* cChannelGroups::GetNext(int group) { if (group > -1) { - if ((group+1) < channelGroups.size()) + if ((group+1) < (int)channelGroups.size()) return channelGroups[group+1].GetName(); } return ""; @@ -89,7 +89,7 @@ int cChannelGroups::GetNextGroupChannelNumber(const cChannel *channel) { int currentGroup = GetGroup(channel); if (currentGroup == -1) return 0; - if ((currentGroup+1) < channelGroups.size()) { + if ((currentGroup+1) < (int)channelGroups.size()) { return channelGroups[currentGroup+1].StartChannel(); } return 0; diff --git a/channeljump.h b/channeljump.h index 6bb988f..86dec2e 100644 --- a/channeljump.h +++ b/channeljump.h @@ -10,8 +10,8 @@ private: int channel; cChannelGroups *channelGroups; int maxChannels; - int startTime; - int timeout; + long unsigned int startTime; + long unsigned int timeout; cPixmap *pixmapBack; cPixmap *pixmapText; void SetPixmaps(void); @@ -26,4 +26,4 @@ public: int GetChannel(void) { return channel; }; }; -#endif //__TVGUIDE_CHANNELJUMP_H \ No newline at end of file +#endif //__TVGUIDE_CHANNELJUMP_H diff --git a/grid.h b/grid.h index d717047..1e4b350 100644 --- a/grid.h +++ b/grid.h @@ -20,38 +20,38 @@ protected: bool hasTimer; bool hasSwitchTimer; bool intersects(cGrid *neighbor); - virtual time_t Duration(void) {}; + virtual time_t Duration(void) { return 0; }; virtual void drawText(void) {}; bool dummy; public: cGrid(cChannelColumn *c); virtual ~cGrid(void); cChannelColumn *column; - virtual void SetViewportHeight() {}; - virtual void PositionPixmap() {}; + virtual void SetViewportHeight(void) {}; + virtual void PositionPixmap(void) {}; virtual void setText(void) {}; - void Draw(); - void SetDirty() {dirty = true;}; - void SetActive() {dirty = true; active = true;}; - void SetInActive() {dirty = true; active = false;}; + void Draw(void); + void SetDirty(void) {dirty = true;}; + void SetActive(void) {dirty = true; active = true;}; + void SetInActive(void) {dirty = true; active = false;}; void SetColor(bool color) {isColor1 = color;}; - bool IsColor1() {return isColor1;}; + bool IsColor1(void) {return isColor1;}; bool isFirst(void); - virtual const cEvent *GetEvent() {}; + virtual const cEvent *GetEvent(void) { return NULL; }; bool Match(time_t t); - virtual time_t StartTime() {}; - virtual time_t EndTime() {}; + virtual time_t StartTime(void) { return 0; }; + virtual time_t EndTime(void) { return 0; }; virtual void SetStartTime(time_t start) {}; virtual void SetEndTime(time_t end) {}; int calcOverlap(cGrid *neighbor); - virtual void SetTimer() {}; - virtual void SetSwitchTimer() {}; + virtual void SetTimer(void) {}; + virtual void SetSwitchTimer(void) {}; virtual cString getText(void) { return cString("");}; virtual cString getTimeString(void) { return cString("");}; bool Active(void) { return active; }; - bool HasTimer() {return hasTimer;}; - bool HasSwitchTimer() {return hasSwitchTimer;}; - bool isDummy() { return dummy; }; + bool HasTimer(void) {return hasTimer;}; + bool HasSwitchTimer(void) {return hasSwitchTimer;}; + bool isDummy(void) { return dummy; }; virtual void debug() {}; }; diff --git a/imagecache.c b/imagecache.c index 1dc4ef4..bc1a88f 100644 --- a/imagecache.c +++ b/imagecache.c @@ -351,7 +351,7 @@ cImage *cImageCache::GetLogo(const cChannel *channel) { } else { bool success = LoadLogo(channel); if (success) { - if ((tvguideConfig.limitLogoCache) && (logoCache.size() >= tvguideConfig.numLogosMax)) { + if ((tvguideConfig.limitLogoCache) && ((int)logoCache.size() >= tvguideConfig.numLogosMax)) { //logo cache is full, don't cache anymore if (tempStaticLogo) { delete tempStaticLogo; diff --git a/imageloader.c b/imageloader.c index 6ca5d69..67b910c 100644 --- a/imageloader.c +++ b/imageloader.c @@ -173,7 +173,7 @@ void cImageLoader::CreateGradient(tColor back, tColor blend, int width, int heig for (int x = 0; x < width; x++) { for (int y = 0; y < height; y++) { PixelPacket *pixel = pixels + y * width + x; - int opacity = (maxw / width * x + maxh - maxh / height * y) / 2; + unsigned int opacity = (maxw / width * x + maxh - maxh / height * y) / 2; pixel->opacity = (opacity <= MaxRGB) ? opacity : MaxRGB; } } @@ -183,4 +183,4 @@ void cImageLoader::CreateGradient(tColor back, tColor blend, int width, int heig imgback.composite(imgblend, 0, 0, OverCompositeOp); buffer = imgback; -} \ No newline at end of file +} diff --git a/imagemagickwrapper.c b/imagemagickwrapper.c index 753b678..6198dfc 100644 --- a/imagemagickwrapper.c +++ b/imagemagickwrapper.c @@ -145,7 +145,7 @@ void cImageMagickWrapper::CreateGradient(tColor back, tColor blend, int width, i for (int x = 0; x < width; x++) { for (int y = 0; y < height; y++) { PixelPacket *pixel = pixels + y * width + x; - int opacity = (maxw / width * x + maxh - maxh / height * y) / 2; + unsigned int opacity = (maxw / width * x + maxh - maxh / height * y) / 2; pixel->opacity = (opacity <= MaxRGB) ? opacity : MaxRGB; } } @@ -159,4 +159,4 @@ void cImageMagickWrapper::CreateGradient(tColor back, tColor blend, int width, i void cImageMagickWrapper::CreateBackground(tColor back, tColor blend, int width, int height) { CreateGradient(back, blend, width, height, 0.8, 0.8); -} \ No newline at end of file +} diff --git a/recmenus.c b/recmenus.c index 0559aed..ab501ae 100644 --- a/recmenus.c +++ b/recmenus.c @@ -85,7 +85,7 @@ cRecMenuItem *cRecMenuAskFolder::GetMenuItem(int number) { if (number == 0) { cRecMenuItem *result = new cRecMenuItemButton(tr("root video folder"), rmsInstantRecord, false, false, true); return result; - } else if ((number > 0) && (number < folders.size()+1)) { + } else if ((number > 0) && (number < (int)folders.size() + 1)) { cRecMenuItem *result = new cRecMenuItemButton(folders[number-1].c_str(), rmsInstantRecord, false, false, true); return result; } @@ -99,7 +99,7 @@ int cRecMenuAskFolder::GetTotalNumMenuItems(void) { std::string cRecMenuAskFolder::GetFolder(void) { std::string folder = ""; int folderActive = GetActive(); - if (folderActive > 0 && folderActive < folders.size() + 1) + if (folderActive > 0 && folderActive < (int)folders.size() + 1) folder = folders[folderActive - 1]; return folder; } @@ -275,7 +275,7 @@ cRecMenuTimerConflict::cRecMenuTimerConflict(cTVGuideTimerConflict *conflict) { } cRecMenuItem *cRecMenuTimerConflict::GetMenuItem(int number) { - if ((number >= 0) && (number < conflict->timerIDs.size())) { + if ((number >= 0) && (number < (int)conflict->timerIDs.size())) { #if VDRVERSNUM >= 20301 LOCK_TIMERS_READ; const cTimer *timer = Timers->Get(conflict->timerIDs[number]); @@ -677,7 +677,7 @@ int cRecMenuSearchTimerTemplates::GetTotalNumMenuItems(void) { TVGuideEPGSearchTemplate cRecMenuSearchTimerTemplates::GetTemplate(void) { TVGuideEPGSearchTemplate templ; int tmplActive = GetActive() - 1; - if (tmplActive >= 0 && tmplActive < templates.size()) + if (tmplActive >= 0 && tmplActive < (int)templates.size()) templ = templates[tmplActive]; return templ; } diff --git a/view.c b/view.c index e4ca179..8391a2f 100644 --- a/view.c +++ b/view.c @@ -122,7 +122,6 @@ void cView::DrawHeader(void) { //REC Icon eTimerMatch timerMatch=tmNone; #if VDRVERSNUM >= 20301 -// LOCK_TIMERS_READ; const cTimer *ti; #else cTimer *ti; @@ -284,7 +283,7 @@ void cView::CreateFloatingTextWrapper(cTextWrapper *twNarrow, cTextWrapper *twFu std::stringstream sstrTextTall; std::stringstream sstrTextFull; - for (int i=0; i