From b11317a64339f5a4bcffc8234ecaf15c7fb416f2 Mon Sep 17 00:00:00 2001 From: Axel Waggershauser Date: Fri, 15 Mar 2013 00:42:15 +0100 Subject: 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 --- src/corelib/codecs/qeuckrcodec.cpp | 4 ++-- src/corelib/codecs/qiconvcodec.cpp | 2 +- src/corelib/codecs/qjpunicode.cpp | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/corelib/codecs') diff --git a/src/corelib/codecs/qeuckrcodec.cpp b/src/corelib/codecs/qeuckrcodec.cpp index a6d75666d5..20ba1e85d6 100644 --- a/src/corelib/codecs/qeuckrcodec.cpp +++ b/src/corelib/codecs/qeuckrcodec.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -// Most of the cp949 code was originally written by Joon-Kyu Park, and is included +// Most of the cp949 code was originally written by Joon-Kyu Park, and is included // in Qt with the author's permission and the grateful thanks of the Qt team. /*! \class QEucKrCodec @@ -3405,7 +3405,7 @@ QByteArray QCP949Codec::convertFromUnicode(const QChar *uc, int len, ConverterSt row = internal_code / 178; column = internal_code % 178; } - else { + else { // code between a1-fe internal_code -= 3008; row = internal_code / 84; diff --git a/src/corelib/codecs/qiconvcodec.cpp b/src/corelib/codecs/qiconvcodec.cpp index 01b90fe527..60b13ac4e1 100644 --- a/src/corelib/codecs/qiconvcodec.cpp +++ b/src/corelib/codecs/qiconvcodec.cpp @@ -374,7 +374,7 @@ QByteArray QIconvCodec::convertFromUnicode(const QChar *uc, int len, ConverterSt delete temporaryState; return QString(uc, len).toLatin1(); } - + size_t outBytesLeft = len; QByteArray ba(outBytesLeft, Qt::Uninitialized); outBytes = ba.data(); diff --git a/src/corelib/codecs/qjpunicode.cpp b/src/corelib/codecs/qjpunicode.cpp index 95ffe11f75..9513621dfe 100644 --- a/src/corelib/codecs/qjpunicode.cpp +++ b/src/corelib/codecs/qjpunicode.cpp @@ -10537,7 +10537,7 @@ static unsigned short const sjis208ibmvdc_unicode[] = { uint QJpUnicodeConv::sjisibmvdcToUnicode(uint h, uint l) const { - if (((rule & IBM_VDC) || (rule & Microsoft_CP932)) && IsSjisIBMVDCChar1(h)) + if (((rule & IBM_VDC) || (rule & Microsoft_CP932)) && IsSjisIBMVDCChar1(h)) return sjis208ibmvdc_unicode[((h - 0x00fa)*189 + (l-0x0040))]; else return 0; @@ -10632,9 +10632,9 @@ static unsigned short const cp932_ed_ee_unicode[] = { uint QJpUnicodeConv::cp932ToUnicode(uint h, uint l) const { if (rule & Microsoft_CP932) { - if (h == 0x0087 && (l >= 0x0040 && l <= 0x009c)) + if (h == 0x0087 && (l >= 0x0040 && l <= 0x009c)) return cp932_87_unicode[l-0x0040]; - else if ((h == 0x00ed || h == 0x00ee) && (l >= 0x0040 && l <= 0x00fc)) + else if ((h == 0x00ed || h == 0x00ee) && (l >= 0x0040 && l <= 0x00fc)) return cp932_ed_ee_unicode[((h - 0x00ed)*189 + (l-0x0040))]; } return 0; -- cgit v1.2.3