diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-01-27 08:53:40 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-01-27 08:53:40 (GMT) |
| commit | fdd5a4f3c18b47826ebe63d8753cd27164ad8169 (patch) | |
| tree | c78d347f4fe576288a95e8239bbca2da99f0626e /examples | |
| parent | aebc34877fb17405e8e5915760012a82d0178b97 (diff) | |
| parent | 35386ae28887d56cf6fd6f6cc7ceaf0506abe18a (diff) | |
| download | Qt-fdd5a4f3c18b47826ebe63d8753cd27164ad8169.zip Qt-fdd5a4f3c18b47826ebe63d8753cd27164ad8169.tar.gz Qt-fdd5a4f3c18b47826ebe63d8753cd27164ad8169.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/tools/customtype/message.cpp | 2 | ||||
| -rw-r--r-- | examples/tools/customtype/message.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/tools/customtype/message.cpp b/examples/tools/customtype/message.cpp index 4ef041a..d27159e 100644 --- a/examples/tools/customtype/message.cpp +++ b/examples/tools/customtype/message.cpp @@ -64,7 +64,7 @@ Message::Message(const QString &body, const QStringList &headers) } //! [custom type streaming operator] -QDebug &operator<<(QDebug &dbg, const Message &message) +QDebug operator<<(QDebug dbg, const Message &message) { QStringList pieces = message.body().split("\r\n", QString::SkipEmptyParts); if (pieces.isEmpty()) diff --git a/examples/tools/customtype/message.h b/examples/tools/customtype/message.h index 361f803..4ef48d4 100644 --- a/examples/tools/customtype/message.h +++ b/examples/tools/customtype/message.h @@ -70,7 +70,7 @@ Q_DECLARE_METATYPE(Message); //! [custom type meta-type declaration] //! [custom type streaming operator] -QDebug &operator<<(QDebug &dbg, const Message &message); +QDebug operator<<(QDebug dbg, const Message &message); //! [custom type streaming operator] #endif |