diff --git a/src/corelib/io/qdebug.h b/src/corelib/io/qdebug.h index 94b19f9cab4..584d6bf41fc 100644 --- a/src/corelib/io/qdebug.h +++ b/src/corelib/io/qdebug.h @@ -151,13 +151,8 @@ inline QDebug &QDebug::operator=(const QDebug &other) return *this; } -#if defined(FORCE_UREF) -template -inline QDebug &operator<<(QDebug debug, const QList &list) -#else template inline QDebug operator<<(QDebug debug, const QList &list) -#endif { const bool oldSetting = debug.autoInsertSpaces(); debug.nospace() << '('; @@ -171,13 +166,8 @@ inline QDebug operator<<(QDebug debug, const QList &list) return debug.maybeSpace(); } -#if defined(FORCE_UREF) -template -inline QDebug &operator<<(QDebug debug, const QVector &vec) -#else template inline QDebug operator<<(QDebug debug, const QVector &vec) -#endif { const bool oldSetting = debug.autoInsertSpaces(); debug.nospace() << "QVector"; @@ -185,13 +175,8 @@ inline QDebug operator<<(QDebug debug, const QVector &vec) return operator<<(debug, vec.toList()); } -#if defined(FORCE_UREF) -template -inline QDebug &operator<<(QDebug debug, const QMap &map) -#else template inline QDebug operator<<(QDebug debug, const QMap &map) -#endif { const bool oldSetting = debug.autoInsertSpaces(); debug.nospace() << "QMap("; @@ -204,13 +189,8 @@ inline QDebug operator<<(QDebug debug, const QMap &map) return debug.maybeSpace(); } -#if defined(FORCE_UREF) -template -inline QDebug &operator<<(QDebug debug, const QHash &hash) -#else template inline QDebug operator<<(QDebug debug, const QHash &hash) -#endif { const bool oldSetting = debug.autoInsertSpaces(); debug.nospace() << "QHash("; @@ -222,13 +202,8 @@ inline QDebug operator<<(QDebug debug, const QHash &hash) return debug.maybeSpace(); } -#if defined(FORCE_UREF) -template -inline QDebug &operator<<(QDebug debug, const QPair &pair) -#else template inline QDebug operator<<(QDebug debug, const QPair &pair) -#endif { const bool oldSetting = debug.autoInsertSpaces(); debug.nospace() << "QPair(" << pair.first << ',' << pair.second << ')'; @@ -245,13 +220,8 @@ inline QDebug operator<<(QDebug debug, const QSet &set) return operator<<(debug, set.toList()); } -#if defined(FORCE_UREF) -template -inline QDebug &operator<<(QDebug debug, const QContiguousCache &cache) -#else template inline QDebug operator<<(QDebug debug, const QContiguousCache &cache) -#endif { const bool oldSetting = debug.autoInsertSpaces(); debug.nospace() << "QContiguousCache("; @@ -265,13 +235,8 @@ inline QDebug operator<<(QDebug debug, const QContiguousCache &cache) return debug.maybeSpace(); } -#if defined(FORCE_UREF) -template -inline QDebug &operator<<(QDebug debug, const QFlags &flags) -#else template inline QDebug operator<<(QDebug debug, const QFlags &flags) -#endif { const bool oldSetting = debug.autoInsertSpaces(); debug.nospace() << "QFlags(";