diff --git a/epggrid.c b/epggrid.c index 2c789ae..9be5c77 100644 --- a/epggrid.c +++ b/epggrid.c @@ -20,7 +20,7 @@ cEpgGrid::~cEpgGrid(void) { void cEpgGrid::SetViewportHeight() { int viewportHeightOld = viewportHeight; if ( column->Start() > StartTime() ) { - viewportHeight = (min((int)EndTime(), column->Stop()) - column->Start()) /60; + viewportHeight = (std::min((int)EndTime(), column->Stop()) - column->Start()) /60; } else if ( column->Stop() < EndTime() ) { viewportHeight = (column->Stop() - StartTime()) /60; if (viewportHeight < 0) viewportHeight = 0; diff --git a/recmenuitem.c b/recmenuitem.c index 4531483..5362be5 100644 --- a/recmenuitem.c +++ b/recmenuitem.c @@ -557,7 +557,7 @@ void cRecMenuItemSelect::Draw(void) { void cRecMenuItemSelect::DrawValue(void) { pixmapVal->Fill(clrTransparent); std::string textVal = strings[currentVal]; - int iconSize = min(128, height); + int iconSize = std::min(128, height); int textX = width - font->Width(textVal.c_str()) - iconSize; int textY = (height - font->Height()) / 2; pixmapVal->DrawText(cPoint(textX, textY), textVal.c_str(), colorText, clrTransparent, font); @@ -664,7 +664,7 @@ void cRecMenuItemSelectDirectory::Draw(void) { void cRecMenuItemSelectDirectory::DrawValue(void) { pixmapVal->Fill(clrTransparent); - int iconSize = min(128, height); + int iconSize = std::min(128, height); int textX = std::max(width - font->Width(folders[currentVal].c_str()) - iconSize, 10 + font->Width(*text) + 2 * iconSize); int textY = (height - font->Height()) / 2; pixmapVal->DrawText(cPoint(textX, textY), folders[currentVal].c_str(), colorText, clrTransparent, font, width - textX - iconSize, font->Height(), taTop | taRight); @@ -967,7 +967,7 @@ char *cRecMenuItemText::GetSMSKeys(int num) { if (specialChar) addition = 1; Utf8FromArray(startCharUtf8, p, numChars+addition); - int maxChars = min(numChars+1+addition, 8); + int maxChars = std::min(numChars+1+addition, 8); char *smskey = new char[maxChars]; Utf8Strn0Cpy(smskey, p, maxChars); return smskey; @@ -2163,7 +2163,7 @@ void cRecMenuItemDayChooser::SetSizes(void) { if (charWidth > maxWidth) maxWidth = charWidth; } - daysSize = min(maxWidth + 15, height - 4); + daysSize = std::min(maxWidth + 15, height - 4); daysX = width - 10 - 7 * daysSize; daysY = (height - daysSize) / 2; } diff --git a/view.c b/view.c index 59e940b..cff0afe 100644 --- a/view.c +++ b/view.c @@ -254,7 +254,7 @@ void cView::DrawFloatingContent(std::string *infoText, cTvMedia *img, cTvMedia * int textLinesFull = wTextFull.Lines(); int textHeight = lineHeight * (textLinesTall + textLinesFull) + 2*border; int yText = border; - CreateContent(max(textHeight, imgHeight + 2*border)); + CreateContent(std::max(textHeight, imgHeight + 2*border)); for (int i=0; i < textLinesTall; i++) { pixmapContent->DrawText(cPoint(border, yText), wTextTall.GetLine(i), theme.Color(clrFont), clrTransparent, font); yText += lineHeight;