diff options
author | Axel Waggershauser <awagger@gmail.com> | 2013-03-15 00:42:15 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-16 20:22:50 +0100 |
commit | b11317a64339f5a4bcffc8234ecaf15c7fb416f2 (patch) | |
tree | f81e40ee49f5109b4100048d131d5bb922b448aa /tests/auto/xml | |
parent | 72367a94a750355eb748793ce8c365373a332c9c (diff) |
Whitespace cleanup: remove trailing whitespace
Remove all trailing whitespace from the following list of files:
*.cpp *.h *.conf *.qdoc *.pro *.pri *.mm *.rc *.pl *.qps *.xpm *.txt *README
excluding 3rdparty, test-data and auto generated code.
Note A): the only non 3rdparty c++-files that still
have trailing whitespace after this change are:
* src/corelib/codecs/cp949codetbl_p.h
* src/corelib/codecs/qjpunicode.cpp
* src/corelib/codecs/qbig5codec.cpp
* src/corelib/xml/qxmlstream_p.h
* src/tools/qdoc/qmlparser/qqmljsgrammar.cpp
* src/tools/uic/ui4.cpp
* tests/auto/other/qtokenautomaton/tokenizers/*
* tests/benchmarks/corelib/tools/qstring/data.cpp
* util/lexgen/tokenizer.cpp
Note B): in about 30 files some overlapping 'leading tab' and
'TAB character in non-leading whitespace' issues have been fixed
to make the sanity bot happy. Plus some general ws-fixes here
and there as asked for during review.
Change-Id: Ia713113c34d82442d6ce4d93d8b1cf545075d11d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'tests/auto/xml')
-rw-r--r-- | tests/auto/xml/dom/qdom/tst_qdom.cpp | 18 | ||||
-rw-r--r-- | tests/auto/xml/sax/qxml/tst_qxml.cpp | 6 | ||||
-rw-r--r-- | tests/auto/xml/sax/qxmlinputsource/tst_qxmlinputsource.cpp | 4 | ||||
-rw-r--r-- | tests/auto/xml/sax/qxmlsimplereader/parser/parser.cpp | 2 |
4 files changed, 15 insertions, 15 deletions
diff --git a/tests/auto/xml/dom/qdom/tst_qdom.cpp b/tests/auto/xml/dom/qdom/tst_qdom.cpp index e654a41ddd..6b4bc3cd35 100644 --- a/tests/auto/xml/dom/qdom/tst_qdom.cpp +++ b/tests/auto/xml/dom/qdom/tst_qdom.cpp @@ -1684,7 +1684,7 @@ static const QChar umlautName[] = /*! \internal - + Write a german umlaut to a QByteArray, via a QTextStream. */ void tst_QDom::germanUmlautToByteArray() const @@ -1701,7 +1701,7 @@ void tst_QDom::germanUmlautToByteArray() const ts.setCodec("UTF-8"); ts << d.toString(); buffer.close(); - + QByteArray baseline("<a"); /* http://www.fileformat.info/info/unicode/char/00FC/index.htm */ @@ -1714,7 +1714,7 @@ void tst_QDom::germanUmlautToByteArray() const /*! \internal - + Write a german umlaut to a QFile, via a QTextStream. */ void tst_QDom::germanUmlautToFile() const @@ -1757,15 +1757,15 @@ void tst_QDom::germanUmlautToFile() const void tst_QDom::setInvalidDataPolicy() const { - QDomImplementation::setInvalidDataPolicy(QDomImplementation::ReturnNullNode); - QDomDocument doc; - QDomElement elem = doc.createElement("invalid name"); + QDomImplementation::setInvalidDataPolicy(QDomImplementation::ReturnNullNode); + QDomDocument doc; + QDomElement elem = doc.createElement("invalid name"); QVERIFY(elem.isNull()); } void tst_QDom::crashInSetContent() const { - QDomImplementation::setInvalidDataPolicy(QDomImplementation::ReturnNullNode); + QDomImplementation::setInvalidDataPolicy(QDomImplementation::ReturnNullNode); QDomDocument docImport; QCOMPARE(docImport.setContent(QLatin1String("<a:>text</a:>"), true), false); @@ -1774,7 +1774,7 @@ void tst_QDom::crashInSetContent() const void tst_QDom::doubleNamespaceDeclarations() const { - QDomDocument doc; + QDomDocument doc; QString testFile = QFINDTESTDATA("doubleNamespaces.xml"); if (testFile.isEmpty()) @@ -1782,7 +1782,7 @@ void tst_QDom::doubleNamespaceDeclarations() const QFile file(testFile); QVERIFY(file.open(QIODevice::ReadOnly)); - QXmlSimpleReader reader; + QXmlSimpleReader reader; QXmlInputSource source(&file); QVERIFY(doc.setContent(&source, &reader)); diff --git a/tests/auto/xml/sax/qxml/tst_qxml.cpp b/tests/auto/xml/sax/qxml/tst_qxml.cpp index 7f597f83d3..0ce8d363c9 100644 --- a/tests/auto/xml/sax/qxml/tst_qxml.cpp +++ b/tests/auto/xml/sax/qxml/tst_qxml.cpp @@ -62,7 +62,7 @@ class MyXmlEntityResolver : public QXmlEntityResolver { public: MyXmlEntityResolver() : QXmlEntityResolver() {} - QString errorString() const { return QString(); } + QString errorString() const { return QString(); } bool resolveEntity(const QString &, const QString &, QXmlInputSource *&) { return false; } }; @@ -88,7 +88,7 @@ class MyXmlErrorHandler : public QXmlErrorHandler { public: MyXmlErrorHandler() : QXmlErrorHandler() {} - QString errorString() const { return QString(); } + QString errorString() const { return QString(); } bool error(const QXmlParseException &) { return false; } bool fatalError(const QXmlParseException &) { return false; } bool warning(const QXmlParseException &) { return false; } @@ -193,7 +193,7 @@ void tst_QXml::interpretedAs0D() const }; const QString document(QLatin1String("<element ") + - QChar(0x010D) + + QChar(0x010D) + QLatin1String("reated-by=\"an attr value\"/>")); QString testFile = QFINDTESTDATA("0x010D.xml"); diff --git a/tests/auto/xml/sax/qxmlinputsource/tst_qxmlinputsource.cpp b/tests/auto/xml/sax/qxmlinputsource/tst_qxmlinputsource.cpp index 2084c95cf4..b8837f8c14 100644 --- a/tests/auto/xml/sax/qxmlinputsource/tst_qxmlinputsource.cpp +++ b/tests/auto/xml/sax/qxmlinputsource/tst_qxmlinputsource.cpp @@ -72,7 +72,7 @@ private slots: void tst_QXmlInputSource::reset() const { const QString input(QString::fromLatin1("<element attribute1='value1' attribute2='value2'/>")); - + QXmlSimpleReader reader; QXmlDefaultHandler handler; reader.setContentHandler(&handler); @@ -100,7 +100,7 @@ void tst_QXmlInputSource::reset() const void tst_QXmlInputSource::resetSimplified() const { const QString input(QString::fromLatin1("<element/>")); - + QXmlSimpleReader reader; QXmlInputSource source; diff --git a/tests/auto/xml/sax/qxmlsimplereader/parser/parser.cpp b/tests/auto/xml/sax/qxmlsimplereader/parser/parser.cpp index 7c6c675fbe..c00a5c7caa 100644 --- a/tests/auto/xml/sax/qxmlsimplereader/parser/parser.cpp +++ b/tests/auto/xml/sax/qxmlsimplereader/parser/parser.cpp @@ -103,7 +103,7 @@ class ContentHandler : public QXmlDefaultHandler const QString &result() const { return m_result; } const QString &errorMsg() const { return m_error_msg; } - + private: QString nestPrefix() const { return QString().fill(' ', 3*m_nest); } QString formatAttributes(const QXmlAttributes & atts); |