From 882bf3475c8926abe62ed71e6719458b024caac0 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 13 Jan 2014 15:48:44 +0100 Subject: expand tabs and related whitespace fixes in *.{cpp,h,qdoc} the diff -w for this commit is empty. Started-by: Thiago Macieira Change-Id: I77bb84e71c63ce75e0709e5b94bee18e3ce6ab9e Reviewed-by: Thiago Macieira --- src/corelib/tools/qbitarray.cpp | 4 ++-- src/corelib/tools/qbytearray.cpp | 8 ++++---- src/corelib/tools/qlinkedlist.h | 2 +- src/corelib/tools/qlocale_p.h | 4 ++-- src/corelib/tools/qregexp.h | 2 +- src/corelib/tools/qstringlist.cpp | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) (limited to 'src/corelib/tools') diff --git a/src/corelib/tools/qbitarray.cpp b/src/corelib/tools/qbitarray.cpp index f583444d3c..2e22cf8340 100644 --- a/src/corelib/tools/qbitarray.cpp +++ b/src/corelib/tools/qbitarray.cpp @@ -746,8 +746,8 @@ QDataStream &operator>>(QDataStream &in, QBitArray &ba) quint32 len; in >> len; if (len == 0) { - ba.clear(); - return in; + ba.clear(); + return in; } const quint32 Step = 8 * 1024 * 1024; diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp index 03b10903ab..a9cfd604c7 100644 --- a/src/corelib/tools/qbytearray.cpp +++ b/src/corelib/tools/qbytearray.cpp @@ -132,10 +132,10 @@ char *qstrcpy(char *dst, const char *src) return 0; #if defined(_MSC_VER) && _MSC_VER >= 1400 const int len = int(strlen(src)); - // This is actually not secure!!! It will be fixed - // properly in a later release! + // This is actually not secure!!! It will be fixed + // properly in a later release! if (len >= 0 && strcpy_s(dst, len+1, src) == 0) - return dst; + return dst; return 0; #else return strcpy(dst, src); @@ -166,7 +166,7 @@ char *qstrncpy(char *dst, const char *src, uint len) if (!src || !dst) return 0; #if defined(_MSC_VER) && _MSC_VER >= 1400 - strncpy_s(dst, len, src, len-1); + strncpy_s(dst, len, src, len-1); #else strncpy(dst, src, len); #endif diff --git a/src/corelib/tools/qlinkedlist.h b/src/corelib/tools/qlinkedlist.h index 79a62cb87c..bdacdbcd26 100644 --- a/src/corelib/tools/qlinkedlist.h +++ b/src/corelib/tools/qlinkedlist.h @@ -170,7 +170,7 @@ public: inline const_iterator(Node *n) : i(n) {} inline const_iterator(const const_iterator &o) : i(o.i){} inline const_iterator(iterator ci) : i(ci.i){} - inline const_iterator &operator=(const const_iterator &o) { i = o.i; return *this; } + inline const_iterator &operator=(const const_iterator &o) { i = o.i; return *this; } inline const T &operator*() const { return i->t; } inline const T *operator->() const { return &i->t; } inline bool operator==(const const_iterator &o) const { return i == o.i; } diff --git a/src/corelib/tools/qlocale_p.h b/src/corelib/tools/qlocale_p.h index 581a12e0c7..4b5b4d67b5 100644 --- a/src/corelib/tools/qlocale_p.h +++ b/src/corelib/tools/qlocale_p.h @@ -321,8 +321,8 @@ public: typedef QVarLengthArray CharBuff; bool numberToCLocale(const QChar *str, int len, - GroupSeparatorMode group_sep_mode, - CharBuff *result) const; + GroupSeparatorMode group_sep_mode, + CharBuff *result) const; inline char digitToCLocale(QChar c) const; static void updateSystemPrivate(); diff --git a/src/corelib/tools/qregexp.h b/src/corelib/tools/qregexp.h index 26b0b78317..115fceb18b 100644 --- a/src/corelib/tools/qregexp.h +++ b/src/corelib/tools/qregexp.h @@ -68,7 +68,7 @@ public: QRegExp(); explicit QRegExp(const QString &pattern, Qt::CaseSensitivity cs = Qt::CaseSensitive, - PatternSyntax syntax = RegExp); + PatternSyntax syntax = RegExp); QRegExp(const QRegExp &rx); ~QRegExp(); QRegExp &operator=(const QRegExp &rx); diff --git a/src/corelib/tools/qstringlist.cpp b/src/corelib/tools/qstringlist.cpp index 46997b731c..6b0b39c7bb 100644 --- a/src/corelib/tools/qstringlist.cpp +++ b/src/corelib/tools/qstringlist.cpp @@ -455,7 +455,7 @@ QString QtPrivate::QStringList_join(const QStringList *that, const QChar *sep, i QString res; if (totalLength == 0) - return res; + return res; res.reserve(totalLength); for (int i = 0; i < that->size(); ++i) { if (i) -- cgit v1.2.3