--- a/src/ldDocument.cpp Sat Jan 28 14:13:01 2017 +0200
+++ b/src/ldDocument.cpp Sat Jan 28 14:14:28 2017 +0200
@@ -49,7 +49,7 @@
{
m_flags |= IsBeingDestroyed;
- for (int i = 0; i < length(m_objects); ++i)
+ for (int i = 0; i < countof(m_objects); ++i)
m_objects[i]->destroy();
delete m_history;
@@ -294,7 +294,7 @@
data.append (subdata);
if (sizeptr)
- *sizeptr += length(subdata);
+ *sizeptr += countof(subdata);
}
QFile f (path);
@@ -326,8 +326,8 @@
//
static void CheckTokenCount (const QStringList& tokens, int num)
{
- if (length(tokens) != num)
- throw QString (format ("Bad amount of tokens, expected %1, got %2", num, length(tokens)));
+ if (countof(tokens) != num)
+ throw QString (format ("Bad amount of tokens, expected %1, got %2", num, countof(tokens)));
}
// =============================================================================
@@ -395,13 +395,13 @@
{
QStringList tokens = line.split (" ", QString::SkipEmptyParts);
- if (length(tokens) <= 0)
+ if (countof(tokens) <= 0)
{
// Line was empty, or only consisted of whitespace
return LDSpawn<LDEmpty>();
}
- if (length(tokens[0]) != 1 or not tokens[0][0].isDigit())
+ if (countof(tokens[0]) != 1 or not tokens[0][0].isDigit())
throw QString ("Illogical line code");
int num = tokens[0][0].digitValue();
@@ -415,7 +415,7 @@
QString commentTextSimplified (commentText.simplified());
// Handle BFC statements
- if (length(tokens) > 2 and tokens[1] == "BFC")
+ if (countof(tokens) > 2 and tokens[1] == "BFC")
{
for (BfcStatement statement : iterateEnum<BfcStatement>())
{
@@ -434,7 +434,7 @@
return LDSpawn<LDBfc> (BfcStatement::NoClip);
}
- if (length(tokens) > 2 and tokens[1] == "!LDFORGE")
+ if (countof(tokens) > 2 and tokens[1] == "!LDFORGE")
{
// Handle LDForge-specific types, they're embedded into comments too
if (tokens[2] == "OVERLAY")
@@ -605,7 +605,7 @@
//
int LDDocument::addObject (LDObject* obj)
{
- history()->add (new AddHistoryEntry (length(objects()), obj));
+ history()->add (new AddHistoryEntry (countof(objects()), obj));
m_objects << obj;
addKnownVertices (obj);
obj->setDocument (this);
@@ -683,7 +683,7 @@
//
void LDDocument::setObjectAt (int idx, LDObject* obj)
{
- if (idx < 0 or idx >= length(m_objects))
+ if (idx < 0 or idx >= countof(m_objects))
return;
// Mark this change to history
@@ -708,7 +708,7 @@
//
LDObject* LDDocument::getObject (int pos) const
{
- if (pos < length(m_objects))
+ if (pos < countof(m_objects))
return m_objects[pos];
else
return nullptr;
@@ -718,7 +718,7 @@
//
int LDDocument::getObjectCount() const
{
- return length(objects());
+ return countof(objects());
}
// =============================================================================