Use true and false in preference to TRUE and FALSE in tests.

Use the C++ boolean constants true and false instead of the C macros
TRUE and FALSE (which are actually integers), and use QVERIFY instead of
QCOMPARE for verifying simple boolean expressions.

Change-Id: Ie76dfcab6722df6b93b3fa62b0f3437901482932
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

1 files changed, 26 insertions, 26 deletions

diff --git a/tests/auto/xml/sax/qxmlsimplereader/parser/parser.cpp b/tests/auto/xml/sax/qxmlsimplereader/parser/parser.cpp
index d1f1c3cfda..99a833231e 100644
--- a/tests/auto/xml/sax/qxmlsimplereader/parser/parser.cpp
+++ b/tests/auto/xml/sax/qxmlsimplereader/parser/parser.cpp
@@ -124,7 +124,7 @@ bool ContentHandler::startDocument()
     m_result += nestPrefix();
     m_result += "startDocument()\n";
     ++m_nest;
-    return TRUE;
+    return true;
 }
 
 bool ContentHandler::endDocument()
@@ -132,7 +132,7 @@ bool ContentHandler::endDocument()
     --m_nest;
     m_result += nestPrefix();
     m_result += "endDocument()\n";
-    return TRUE;
+    return true;
 }
 
 bool ContentHandler::startElement(const QString &namespaceURI,
@@ -146,7 +146,7 @@ bool ContentHandler::startElement(const QString &namespaceURI,
 		+ "\", qName=\"" + escapeStr(qName)
 		+ "\", atts=[" + formatAttributes(atts) + "])\n";
     ++m_nest;
-    return TRUE;
+    return true;
 }
 
 QString ContentHandler::escapeStr(const QString &s)
@@ -183,14 +183,14 @@ bool ContentHandler::endElement(const QString &namespaceURI,
     m_result += "endElement(namespaceURI=\"" + escapeStr(namespaceURI)
 		+ "\", localName=\"" + escapeStr(localName)
 		+ "\", qName=\"" + escapeStr(qName) + "\")\n";
-    return TRUE;
+    return true;
 }
 
 bool ContentHandler::characters(const QString &ch)
 {
     m_result += nestPrefix();
     m_result += "characters(ch=\"" + escapeStr(ch) + "\")\n";
-    return TRUE;
+    return true;
 }
 
 void ContentHandler::setDocumentLocator(QXmlLocator *locator)
@@ -208,7 +208,7 @@ bool ContentHandler::startPrefixMapping (const QString &prefix, const QString &
     m_result += "startPrefixMapping(prefix=\"" + escapeStr(prefix)
 		    + "\", uri=\"" + escapeStr(uri) + "\")\n";
     ++m_nest;
-    return TRUE;
+    return true;
 }
 
 bool ContentHandler::endPrefixMapping(const QString &prefix)
@@ -216,14 +216,14 @@ bool ContentHandler::endPrefixMapping(const QString &prefix)
     --m_nest;
     m_result += nestPrefix();
     m_result += "endPrefixMapping(prefix=\"" + escapeStr(prefix) + "\")\n";
-    return TRUE;
+    return true;
 }
 
 bool ContentHandler::ignorableWhitespace(const QString & ch)
 {
     m_result += nestPrefix();
     m_result += "ignorableWhitespace(ch=\"" + escapeStr(ch) + "\")\n";
-    return TRUE;
+    return true;
 }
 
 bool ContentHandler::processingInstruction(const QString &target, const QString &data)
@@ -231,14 +231,14 @@ bool ContentHandler::processingInstruction(const QString &target, const QString
     m_result += nestPrefix();
     m_result += "processingInstruction(target=\"" + escapeStr(target)
 		+ "\", data=\"" + escapeStr(data) + "\")\n";
-    return TRUE;
+    return true;
 }
 
 bool ContentHandler::skippedEntity (const QString & name)
 {
     m_result += nestPrefix();
     m_result += "skippedEntity(name=\"" + escapeStr(name) + "\")\n";
-    return TRUE;
+    return true;
 }
 
 bool ContentHandler::warning(const QXmlParseException & exception)
@@ -256,7 +256,7 @@ bool ContentHandler::warning(const QXmlParseException & exception)
 		    + "\", systemId=\"" + escapeStr(exception.systemId())
 		    + "\", message=\"" + escapeStr(exception.message())
 		    + "\"})\n";
-    return TRUE;
+    return true;
 }
 
 bool ContentHandler::error(const QXmlParseException & exception)
@@ -274,7 +274,7 @@ bool ContentHandler::error(const QXmlParseException & exception)
 		    + "\", systemId=\"" + escapeStr(exception.systemId())
 		    + "\", message=\"" + escapeStr(exception.message())
 		    + "\"})\n";
-    return TRUE;
+    return true;
 }
 
 bool ContentHandler::fatalError(const QXmlParseException & exception)
@@ -292,7 +292,7 @@ bool ContentHandler::fatalError(const QXmlParseException & exception)
 		    + "\", systemId=\"" + escapeStr(exception.systemId())
 		    + "\", message=\"" + escapeStr(exception.message())
 		    + "\"})\n";
-    return TRUE;
+    return true;
 }
 
 bool ContentHandler::notationDecl ( const QString & name,
@@ -303,7 +303,7 @@ bool ContentHandler::notationDecl ( const QString & name,
     m_result += "notationDecl(name=\"" + escapeStr(name) + "\", publicId=\""
 		    + escapeStr(publicId) + "\", systemId=\""
 		    + escapeStr(systemId) + "\")\n";
-    return TRUE;
+    return true;
 }
 
 bool ContentHandler::unparsedEntityDecl ( const QString & name,
@@ -317,7 +317,7 @@ bool ContentHandler::unparsedEntityDecl ( const QString & name,
 		    + "\", systemId=\"" + escapeStr(systemId)
 		    + "\", notationName=\"" + escapeStr(notationName)
 		    + "\")\n";
-    return TRUE;
+    return true;
 }
 
 bool ContentHandler::resolveEntity(const QString & publicId,
@@ -328,7 +328,7 @@ bool ContentHandler::resolveEntity(const QString & publicId,
     m_result += "resolveEntity(publicId=\"" + escapeStr(publicId)
 		    + "\", systemId=\"" + escapeStr(systemId)
 		    + "\", ret={})\n";
-    return TRUE;
+    return true;
 }
 
 bool ContentHandler::startDTD ( const QString & name, const QString & publicId, const QString & systemId )
@@ -338,7 +338,7 @@ bool ContentHandler::startDTD ( const QString & name, const QString & publicId,
 		    + "\", publicId=\"" + escapeStr(publicId)
 		    + "\", systemId=\"" + escapeStr(systemId) + "\")\n";
     ++m_nest;
-    return TRUE;
+    return true;
 }
 
 bool ContentHandler::endDTD ()
@@ -346,7 +346,7 @@ bool ContentHandler::endDTD ()
     --m_nest;
     m_result += nestPrefix();
     m_result += "endDTD()\n";
-    return TRUE;
+    return true;
 }
 
 bool ContentHandler::startEntity ( const QString & name )
@@ -354,7 +354,7 @@ bool ContentHandler::startEntity ( const QString & name )
     m_result += nestPrefix();
     m_result += "startEntity(name=\"" + escapeStr(name) + "\")\n";
     ++m_nest;
-    return TRUE;
+    return true;
 }
 
 bool ContentHandler::endEntity ( const QString & name )
@@ -362,7 +362,7 @@ bool ContentHandler::endEntity ( const QString & name )
     --m_nest;
     m_result += nestPrefix();
     m_result += "endEntity(name=\"" + escapeStr(name) + "\")\n";
-    return TRUE;
+    return true;
 }
 
 bool ContentHandler::startCDATA ()
@@ -370,7 +370,7 @@ bool ContentHandler::startCDATA ()
     m_result += nestPrefix();
     m_result += "startCDATA()\n";
     ++m_nest;
-    return TRUE;
+    return true;
 }
 
 bool ContentHandler::endCDATA ()
@@ -378,14 +378,14 @@ bool ContentHandler::endCDATA ()
     --m_nest;
     m_result += nestPrefix();
     m_result += "endCDATA()\n";
-    return TRUE;
+    return true;
 }
 
 bool ContentHandler::comment ( const QString & ch )
 {
     m_result += nestPrefix();
     m_result += "comment(ch=\"" + escapeStr(ch) + "\")\n";
-    return TRUE;
+    return true;
 }
 
 bool ContentHandler::attributeDecl ( const QString & eName,
@@ -399,7 +399,7 @@ bool ContentHandler::attributeDecl ( const QString & eName,
 		+ escapeStr(aName) + "\", type=\"" + escapeStr(type)
 		+ "\", valueDefault=\"" + escapeStr(valueDefault)
 		+ "\", value=\"" + escapeStr(value) + "\")\n";
-    return TRUE;
+    return true;
 }
 
 bool ContentHandler::internalEntityDecl ( const QString & name,
@@ -408,7 +408,7 @@ bool ContentHandler::internalEntityDecl ( const QString & name,
     m_result += nestPrefix();
     m_result += "internatlEntityDecl(name=\"" + escapeStr(name)
 		    + "\", value=\"" + escapeStr(value) + "\")\n";
-    return TRUE;
+    return true;
 }
 
 bool ContentHandler::externalEntityDecl ( const QString & name,
@@ -419,7 +419,7 @@ bool ContentHandler::externalEntityDecl ( const QString & name,
     m_result += "externalEntityDecl(name=\"" + escapeStr(name)
 		    + "\", publicId=\"" + escapeStr(publicId)
 		    + "\", systemId=\"" + escapeStr(systemId) + "\")\n";
-    return TRUE;
+    return true;
 }
 
 Parser::Parser()