diff options
| author | David Faure <faure@kde.org> | 2009-05-29 12:41:19 (GMT) |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2009-05-29 12:41:19 (GMT) |
| commit | 5d0870bd71f33c9267572655d0f842c82b017d6a (patch) | |
| tree | f983ac36c0c46aa226a8b51b4e6db13b4f76ff40 /src/corelib/io/qtextstream.cpp | |
| parent | 1d8a4f55ce40400fcb35a645f2e94837e6ab0a24 (diff) | |
| parent | 9088aeae9daf02546769377853824397458ba822 (diff) | |
| download | Qt-5d0870bd71f33c9267572655d0f842c82b017d6a.zip Qt-5d0870bd71f33c9267572655d0f842c82b017d6a.tar.gz Qt-5d0870bd71f33c9267572655d0f842c82b017d6a.tar.bz2 | |
Merge branch 'master' of git://gitorious.org/qt/qt
Diffstat (limited to 'src/corelib/io/qtextstream.cpp')
| -rw-r--r-- | src/corelib/io/qtextstream.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/io/qtextstream.cpp b/src/corelib/io/qtextstream.cpp index 612d7f7..7c925f1 100644 --- a/src/corelib/io/qtextstream.cpp +++ b/src/corelib/io/qtextstream.cpp @@ -333,7 +333,7 @@ public: this->stream = stream; } -public slots: +public Q_SLOTS: inline void flushStream() { stream->flush(); } private: @@ -2292,7 +2292,7 @@ bool QTextStreamPrivate::putNumber(qulonglong number, bool negative) // ShowBase flag set zero should be written as '00' if (number == 0 && base == 8 && numberFlags & QTextStream::ShowBase && result == QLatin1String("0")) { - result.prepend(QLatin1String("0")); + result.prepend(QLatin1Char('0')); } } return putString(result, true); |