AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Retain space setting

Browse Source 
Change-Id: I4584de9ba51610907c917a0e0ddf5f6f28d304a0
Reviewed-by: David Faure <david.faure@kdab.com>
This commit is contained in:
Kurt Pattyn 2013-12-22 12:33:33 +01:00 committed by The Qt Project
parent 954bb6c35f
commit a2131d6c2f
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/corelib/io/qdebug.h
View File

@ -174,6 +174,7 @@ template <class T>
inline QDebug operator<<(QDebug debug, const QList<T> &list)
#endif
{
const bool oldSetting = debug.autoInsertSpaces();
debug.nospace() << '(';
for (typename QList<T>::size_type i = 0; i < list.count(); ++i) {
if (i)
@ -181,7 +182,8 @@ inline QDebug operator<<(QDebug debug, const QList<T> &list)
debug << list.at(i);
}
debug << ')';
return debug.space();
debug.setAutoInsertSpaces(oldSetting);
return debug.maybeSpace();
}
#if defined(FORCE_UREF)
@ -192,7 +194,9 @@ template <typename T>
inline QDebug operator<<(QDebug debug, const QVector<T> &vec)
#endif
{
const bool oldSetting = debug.autoInsertSpaces();
debug.nospace() << "QVector";
debug.setAutoInsertSpaces(oldSetting);
return operator<<(debug, vec.toList());
}
@ -204,13 +208,15 @@ template <class aKey, class aT>
inline QDebug operator<<(QDebug debug, const QMap<aKey, aT> &map)
#endif
{
const bool oldSetting = debug.autoInsertSpaces();
debug.nospace() << "QMap(";
for (typename QMap<aKey, aT>::const_iterator it = map.constBegin();
it != map.constEnd(); ++it) {
debug << '(' << it.key() << ", " << it.value() << ')';
}
debug << ')';
return debug.space();
debug.setAutoInsertSpaces(oldSetting);
return debug.maybeSpace();
}
#if defined(FORCE_UREF)
@ -221,12 +227,14 @@ template <class aKey, class aT>
inline QDebug operator<<(QDebug debug, const QHash<aKey, aT> &hash)
#endif
{
const bool oldSetting = debug.autoInsertSpaces();
debug.nospace() << "QHash(";
for (typename QHash<aKey, aT>::const_iterator it = hash.constBegin();
it != hash.constEnd(); ++it)
debug << '(' << it.key() << ", " << it.value() << ')';
debug << ')';
return debug.space();
debug.setAutoInsertSpaces(oldSetting);
return debug.maybeSpace();
}
#if defined(FORCE_UREF)
@ -237,14 +245,18 @@ template <class T1, class T2>
inline QDebug operator<<(QDebug debug, const QPair<T1, T2> &pair)
#endif
{
const bool oldSetting = debug.autoInsertSpaces();
debug.nospace() << "QPair(" << pair.first << ',' << pair.second << ')';
return debug.space();
debug.setAutoInsertSpaces(oldSetting);
return debug.maybeSpace();
}
template <typename T>
inline QDebug operator<<(QDebug debug, const QSet<T> &set)
{
const bool oldSetting = debug.autoInsertSpaces();
debug.nospace() << "QSet";
debug.setAutoInsertSpaces(oldSetting);
return operator<<(debug, set.toList());
}
@ -256,6 +268,7 @@ template <class T>
inline QDebug operator<<(QDebug debug, const QContiguousCache<T> &cache)
#endif
{
const bool oldSetting = debug.autoInsertSpaces();
debug.nospace() << "QContiguousCache(";
for (int i = cache.firstIndex(); i <= cache.lastIndex(); ++i) {
debug << cache[i];
@ -263,7 +276,8 @@ inline QDebug operator<<(QDebug debug, const QContiguousCache<T> &cache)
debug << ", ";
}
debug << ')';
return debug.space();
debug.setAutoInsertSpaces(oldSetting);
return debug.maybeSpace();
}
#if defined(FORCE_UREF)
@ -274,6 +288,7 @@ template <class T>
inline QDebug operator<<(QDebug debug, const QFlags<T> &flags)
#endif
{
const bool oldSetting = debug.autoInsertSpaces();
debug.nospace() << "QFlags(";
bool needSeparator = false;
for (uint i = 0; i < sizeof(T) * 8; ++i) {
@ -286,7 +301,8 @@ inline QDebug operator<<(QDebug debug, const QFlags<T> &flags)
}
}
debug << ')';
return debug.space();
debug.setAutoInsertSpaces(oldSetting);
return debug.maybeSpace();
}
QT_END_NAMESPACE