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 /examples/network/torrent/bencodeparser.cpp | |
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 'examples/network/torrent/bencodeparser.cpp')
-rw-r--r-- | examples/network/torrent/bencodeparser.cpp | 200 |
1 files changed, 100 insertions, 100 deletions
diff --git a/examples/network/torrent/bencodeparser.cpp b/examples/network/torrent/bencodeparser.cpp index 2abc41a852..6ef7234539 100644 --- a/examples/network/torrent/bencodeparser.cpp +++ b/examples/network/torrent/bencodeparser.cpp @@ -81,26 +81,26 @@ bool BencodeParser::getByteString(QByteArray *byteString) const int contentSize = content.size(); int size = -1; do { - char c = content.at(index); - if (c < '0' || c > '9') { - if (size == -1) - return false; - if (c != ':') { - errString = QString("Unexpected character at pos %1: %2") - .arg(index).arg(c); - return false; - } - ++index; - break; - } - if (size == -1) - size = 0; - size *= 10; - size += c - '0'; + char c = content.at(index); + if (c < '0' || c > '9') { + if (size == -1) + return false; + if (c != ':') { + errString = QString("Unexpected character at pos %1: %2") + .arg(index).arg(c); + return false; + } + ++index; + break; + } + if (size == -1) + size = 0; + size *= 10; + size += c - '0'; } while (++index < contentSize); if (byteString) - *byteString = content.mid(index, size); + *byteString = content.mid(index, size); index += size; return true; } @@ -109,38 +109,38 @@ bool BencodeParser::getInteger(qint64 *integer) { const int contentSize = content.size(); if (content.at(index) != 'i') - return false; + return false; ++index; qint64 num = -1; bool negative = false; do { - char c = content.at(index); - if (c < '0' || c > '9') { - if (num == -1) { - if (c != '-' || negative) - return false; - negative = true; - continue; - } else { - if (c != 'e') { - errString = QString("Unexpected character at pos %1: %2") - .arg(index).arg(c); - return false; - } - ++index; - break; - } - } - if (num == -1) - num = 0; - num *= 10; - num += c - '0'; + char c = content.at(index); + if (c < '0' || c > '9') { + if (num == -1) { + if (c != '-' || negative) + return false; + negative = true; + continue; + } else { + if (c != 'e') { + errString = QString("Unexpected character at pos %1: %2") + .arg(index).arg(c); + return false; + } + ++index; + break; + } + } + if (num == -1) + num = 0; + num *= 10; + num += c - '0'; } while (++index < contentSize); if (integer) - *integer = negative ? -num : num; + *integer = negative ? -num : num; return true; } @@ -148,38 +148,38 @@ bool BencodeParser::getList(QList<QVariant> *list) { const int contentSize = content.size(); if (content.at(index) != 'l') - return false; + return false; - QList<QVariant> tmp; + QList<QVariant> tmp; ++index; do { - if (content.at(index) == 'e') { - ++index; - break; - } - - qint64 number; - QByteArray byteString; - QList<QVariant> tmpList; - QMap<QByteArray, QVariant> dictionary; - - if (getInteger(&number)) - tmp << number; - else if (getByteString(&byteString)) - tmp << byteString; - else if (getList(&tmpList)) - tmp << tmpList; - else if (getDictionary(&dictionary)) - tmp << QVariant::fromValue<QMap<QByteArray, QVariant> >(dictionary); - else { - errString = QString("error at index %1").arg(index); - return false; - } + if (content.at(index) == 'e') { + ++index; + break; + } + + qint64 number; + QByteArray byteString; + QList<QVariant> tmpList; + QMap<QByteArray, QVariant> dictionary; + + if (getInteger(&number)) + tmp << number; + else if (getByteString(&byteString)) + tmp << byteString; + else if (getList(&tmpList)) + tmp << tmpList; + else if (getDictionary(&dictionary)) + tmp << QVariant::fromValue<QMap<QByteArray, QVariant> >(dictionary); + else { + errString = QString("error at index %1").arg(index); + return false; + } } while (index < contentSize); if (list) - *list = tmp; + *list = tmp; return true; } @@ -187,48 +187,48 @@ bool BencodeParser::getDictionary(QMap<QByteArray, QVariant> *dictionary) { const int contentSize = content.size(); if (content.at(index) != 'd') - return false; + return false; - QMap<QByteArray, QVariant> tmp; + QMap<QByteArray, QVariant> tmp; ++index; do { - if (content.at(index) == 'e') { - ++index; - break; - } - - QByteArray key; - if (!getByteString(&key)) - break; - - if (key == "info") - infoStart = index; - - qint64 number; - QByteArray byteString; - QList<QVariant> tmpList; - QMap<QByteArray, QVariant> dictionary; - - if (getInteger(&number)) - tmp.insert(key, number); - else if (getByteString(&byteString)) - tmp.insert(key, byteString); - else if (getList(&tmpList)) - tmp.insert(key, tmpList); - else if (getDictionary(&dictionary)) - tmp.insert(key, QVariant::fromValue<QMap<QByteArray, QVariant> >(dictionary)); - else { - errString = QString("error at index %1").arg(index); - return false; - } - - if (key == "info") - infoLength = index - infoStart; + if (content.at(index) == 'e') { + ++index; + break; + } + + QByteArray key; + if (!getByteString(&key)) + break; + + if (key == "info") + infoStart = index; + + qint64 number; + QByteArray byteString; + QList<QVariant> tmpList; + QMap<QByteArray, QVariant> dictionary; + + if (getInteger(&number)) + tmp.insert(key, number); + else if (getByteString(&byteString)) + tmp.insert(key, byteString); + else if (getList(&tmpList)) + tmp.insert(key, tmpList); + else if (getDictionary(&dictionary)) + tmp.insert(key, QVariant::fromValue<QMap<QByteArray, QVariant> >(dictionary)); + else { + errString = QString("error at index %1").arg(index); + return false; + } + + if (key == "info") + infoLength = index - infoStart; } while (index < contentSize); if (dictionary) - *dictionary = tmp; + *dictionary = tmp; return true; } |