diff options
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/io/qdatastream.h | 18 | ||||
-rw-r--r-- | src/corelib/tools/qpair.h | 18 |
2 files changed, 18 insertions, 18 deletions
diff --git a/src/corelib/io/qdatastream.h b/src/corelib/io/qdatastream.h index 533911974a..029874ac15 100644 --- a/src/corelib/io/qdatastream.h +++ b/src/corelib/io/qdatastream.h @@ -44,7 +44,7 @@ #include <QtCore/qscopedpointer.h> #include <QtCore/qiodevice.h> -#include <QtCore/qglobal.h> +#include <QtCore/qpair.h> #ifdef Status #error qdatastream.h must be included before any header file that defines Status @@ -414,6 +414,22 @@ Q_OUTOFLINE_TEMPLATE QDataStream &operator<<(QDataStream &out, const QMap<Key, T return out; } +#ifndef QT_NO_DATASTREAM +template <class T1, class T2> +inline QDataStream& operator>>(QDataStream& s, QPair<T1, T2>& p) +{ + s >> p.first >> p.second; + return s; +} + +template <class T1, class T2> +inline QDataStream& operator<<(QDataStream& s, const QPair<T1, T2>& p) +{ + s << p.first << p.second; + return s; +} +#endif + #endif // QT_NO_DATASTREAM QT_END_NAMESPACE diff --git a/src/corelib/tools/qpair.h b/src/corelib/tools/qpair.h index 4dc28f2d26..f8455339f3 100644 --- a/src/corelib/tools/qpair.h +++ b/src/corelib/tools/qpair.h @@ -42,7 +42,7 @@ #ifndef QPAIR_H #define QPAIR_H -#include <QtCore/qdatastream.h> +#include <QtCore/qglobal.h> QT_BEGIN_HEADER @@ -117,22 +117,6 @@ Q_OUTOFLINE_TEMPLATE QPair<T1, T2> qMakePair(const T1 &x, const T2 &y) return QPair<T1, T2>(x, y); } -#ifndef QT_NO_DATASTREAM -template <class T1, class T2> -inline QDataStream& operator>>(QDataStream& s, QPair<T1, T2>& p) -{ - s >> p.first >> p.second; - return s; -} - -template <class T1, class T2> -inline QDataStream& operator<<(QDataStream& s, const QPair<T1, T2>& p) -{ - s << p.first << p.second; - return s; -} -#endif - QT_END_NAMESPACE QT_END_HEADER |