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 /src/tools/uic | |
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 'src/tools/uic')
-rw-r--r-- | src/tools/uic/cpp/cppwriteincludes.cpp | 6 | ||||
-rw-r--r-- | src/tools/uic/driver.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/tools/uic/cpp/cppwriteincludes.cpp b/src/tools/uic/cpp/cppwriteincludes.cpp index 44049409de..c473566e3a 100644 --- a/src/tools/uic/cpp/cppwriteincludes.cpp +++ b/src/tools/uic/cpp/cppwriteincludes.cpp @@ -88,8 +88,8 @@ WriteIncludes::WriteIncludes(Uic *uic) // and create a re-mapping of the old header "qclass.h" to it. Do not do this // for the "Phonon::Someclass" classes, however. const QString namespaceDelimiter = QLatin1String("::"); - const ClassInfoEntry *classLibEnd = qclass_lib_map + sizeof(qclass_lib_map)/sizeof(ClassInfoEntry); - for(const ClassInfoEntry *it = qclass_lib_map; it < classLibEnd; ++it) { + const ClassInfoEntry *classLibEnd = qclass_lib_map + sizeof(qclass_lib_map)/sizeof(ClassInfoEntry); + for (const ClassInfoEntry *it = qclass_lib_map; it < classLibEnd; ++it) { const QString klass = QLatin1String(it->klass); const QString module = QLatin1String(it->module); QLatin1String header = QLatin1String(it->header); @@ -173,7 +173,7 @@ void WriteIncludes::insertIncludeForClass(const QString &className, QString head if (!header.isEmpty()) break; - // Known class + // Known class const StringMap::const_iterator it = m_classToHeader.constFind(className); if (it != m_classToHeader.constEnd()) { header = it.value(); diff --git a/src/tools/uic/driver.cpp b/src/tools/uic/driver.cpp index 9fc1a649ef..5c99ffb208 100644 --- a/src/tools/uic/driver.cpp +++ b/src/tools/uic/driver.cpp @@ -304,7 +304,7 @@ bool Driver::uic(const QString &fileName, QTextStream *out) m_output = out; } else { #ifdef Q_OS_WIN - // As one might also redirect the output to a file on win, + // As one might also redirect the output to a file on win, // we should not create the textstream with QFile::Text flag. // The redirected file is opened in TextMode and this will // result in broken line endings as writing will replace \n again. |