Simplify checking of container (List/HashTable, strings) sizes

- can use 'XX.empty()' instead of 'XX.size() == 0', 'XX.size() < 1' or
  'XX.size() <= 0' or for simpler coding.
  It also has the same number of characters as '!XX.size()' and /might/ be
  more readable

- many size checking had 'XX.size() > 0', 'XX.size() != 0', or 'XX.size() >= 1'
  when a simple 'XX.size()' suffices
This commit is contained in:
Mark Olesen
2009-01-10 20:28:06 +01:00
parent 16aaf5b54e
commit 95dcb6ded7
211 changed files with 713 additions and 832 deletions

View File

@ -49,9 +49,9 @@ void readNASEdges
edgeList& allEdges
)
{
IFstream OBJfile(inFileName);
IFstream is(inFileName);
if (!OBJfile.good())
if (!is.good())
{
FatalErrorIn("readNASEdges")
<< "Cannot read file " << inFileName
@ -68,14 +68,14 @@ void readNASEdges
DynamicList<label> edgeIndices;
while (OBJfile.good())
while (is.good())
{
string line;
OBJfile.getLine(line);
is.getLine(line);
if (line.size() > 0 && line[0] == '$')
if (line.empty() || line[0] == '$')
{
// Skip comment
// Skip empty and comment
continue;
}
@ -87,9 +87,9 @@ void readNASEdges
while (true)
{
string buf;
OBJfile.getLine(buf);
is.getLine(buf);
if (buf.size() > 72 && buf[72]=='+')
if (buf.size() > 72 && buf[72] == '+')
{
line += buf.substr(8, 64);
}