mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 08:21:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

neutrino use check empty() instead of length() or size()

Browse Source
This commit is contained in:
Jacek Jendrzej
2015-01-03 17:51:08 +01:00
parent a92eb8f8e7
commit 8023a6317b
14 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/driver/lcdd.cpp
View File

@@ -466,8 +466,8 @@ void CLCD::showTextScreen(const std::string & big, const std::string & small, co
cname[namelines] = splitString(title, LCD_COLS, fonts.channelname, dumb, big_utf8);
title = removeLeadingSpaces(title.substr(cname[namelines].length()));
namelines++;
} while (title.length() > 0 && namelines < maxnamelines);
if (title.length() == 0)
} while (!title.empty() && namelines < maxnamelines);
if (title.empty())
break;
dumb = !dumb; // retry with dumb splitting;
if (!dumb) // second retry -> get out;
@@ -491,11 +491,11 @@ void CLCD::showTextScreen(const std::string & big, const std::string & small, co
title = removeLeadingSpaces(title.substr(event[eventlines].length()));
/* DrDish TV appends a 0x0a to the EPG title. We could strip it in sectionsd...
...instead, strip all control characters at the end of the text for now */
if (event[eventlines].length() > 0 && event[eventlines].at(event[eventlines].length() - 1) < ' ')
if (!event[eventlines].empty() && event[eventlines].at(event[eventlines].length() - 1) < ' ')
event[eventlines].erase(event[eventlines].length() - 1);
eventlines++;
} while (title.length() >0 && eventlines < maxeventlines);
if (title.length() == 0)
} while (!title.empty() && eventlines < maxeventlines);
if (title.empty())
break;
dumb = !dumb; // retry with dumb splitting;
if (!dumb) // second retry -> get out;