Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 10:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove handling of FORCE_UREF define

Browse source 
upstream commits:
ef077750ce

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2016-06-08 01:31:15 +00:00
parent d60906e627
commit 84d0d7a290
1 changed files with 0 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/core/io/qdebug.h
View file

@ -144,13 +144,8 @@ inline QDebug &QDebug::operator=(const QDebug &other)
return *this; return *this;
} }
#if defined(FORCE_UREF)
template <class T>
inline QDebug &operator<<(QDebug debug, const QList<T> &list)
#else
template <class T> template <class T>
inline QDebug operator<<(QDebug debug, const QList<T> &list) inline QDebug operator<<(QDebug debug, const QList<T> &list)
#endif
{ {
debug.nospace() << '('; debug.nospace() << '(';
for (Q_TYPENAME QList<T>::size_type i = 0; i < list.count(); ++i) { for (Q_TYPENAME QList<T>::size_type i = 0; i < list.count(); ++i) {
@ -162,25 +157,15 @@ inline QDebug operator<<(QDebug debug, const QList<T> &list)
return debug.space(); return debug.space();
} }
#if defined(FORCE_UREF)
template <typename T>
inline QDebug &operator<<(QDebug debug, const QVector<T> &vec)
#else
template <typename T> template <typename T>
inline QDebug operator<<(QDebug debug, const QVector<T> &vec) inline QDebug operator<<(QDebug debug, const QVector<T> &vec)
#endif
{ {
debug.nospace() << "QVector"; debug.nospace() << "QVector";
return operator<<(debug, vec.toList()); return operator<<(debug, vec.toList());
} }
#if defined(FORCE_UREF)
template <class aKey, class aT>
inline QDebug &operator<<(QDebug debug, const QMap<aKey, aT> &map)
#else
template <class aKey, class aT> template <class aKey, class aT>
inline QDebug operator<<(QDebug debug, const QMap<aKey, aT> &map) inline QDebug operator<<(QDebug debug, const QMap<aKey, aT> &map)
#endif
{ {
debug.nospace() << "QMap("; debug.nospace() << "QMap(";
for (typename QMap<aKey, aT>::const_iterator it = map.constBegin(); for (typename QMap<aKey, aT>::const_iterator it = map.constBegin();
@ -191,13 +176,8 @@ inline QDebug operator<<(QDebug debug, const QMap<aKey, aT> &map)
return debug.space(); return debug.space();
} }
#if defined(FORCE_UREF)
template <class aKey, class aT>
inline QDebug &operator<<(QDebug debug, const QHash<aKey, aT> &hash)
#else
template <class aKey, class aT> template <class aKey, class aT>
inline QDebug operator<<(QDebug debug, const QHash<aKey, aT> &hash) inline QDebug operator<<(QDebug debug, const QHash<aKey, aT> &hash)
#endif
{ {
debug.nospace() << "QHash("; debug.nospace() << "QHash(";
for (typename QHash<aKey, aT>::const_iterator it = hash.constBegin(); for (typename QHash<aKey, aT>::const_iterator it = hash.constBegin();
@ -207,13 +187,8 @@ inline QDebug operator<<(QDebug debug, const QHash<aKey, aT> &hash)
return debug.space(); return debug.space();
} }
#if defined(FORCE_UREF)
template <class T1, class T2>
inline QDebug &operator<<(QDebug debug, const QPair<T1, T2> &pair)
#else
template <class T1, class T2> template <class T1, class T2>
inline QDebug operator<<(QDebug debug, const QPair<T1, T2> &pair) inline QDebug operator<<(QDebug debug, const QPair<T1, T2> &pair)
#endif
{ {
debug.nospace() << "QPair(" << pair.first << ',' << pair.second << ')'; debug.nospace() << "QPair(" << pair.first << ',' << pair.second << ')';
return debug.space(); return debug.space();
@ -226,13 +201,8 @@ inline QDebug operator<<(QDebug debug, const QSet<T> &set)
return operator<<(debug, set.toList()); return operator<<(debug, set.toList());
} }
#if defined(FORCE_UREF)
template <class T>
inline QDebug &operator<<(QDebug debug, const QContiguousCache<T> &cache)
#else
template <class T> template <class T>
inline QDebug operator<<(QDebug debug, const QContiguousCache<T> &cache) inline QDebug operator<<(QDebug debug, const QContiguousCache<T> &cache)
#endif
{ {
debug.nospace() << "QContiguousCache("; debug.nospace() << "QContiguousCache(";
for (int i = cache.firstIndex(); i <= cache.lastIndex(); ++i) { for (int i = cache.firstIndex(); i <= cache.lastIndex(); ++i) {
@ -244,13 +214,8 @@ inline QDebug operator<<(QDebug debug, const QContiguousCache<T> &cache)
return debug.space(); return debug.space();
} }
#if defined(FORCE_UREF)
template <class T>
inline QDebug &operator<<(QDebug debug, const QFlags<T> &flags)
#else
template <class T> template <class T>
inline QDebug operator<<(QDebug debug, const QFlags<T> &flags) inline QDebug operator<<(QDebug debug, const QFlags<T> &flags)
#endif
{ {
debug.nospace() << "QFlags("; debug.nospace() << "QFlags(";
bool needSeparator = false; bool needSeparator = false;