diff options
| -rw-r--r-- | src/corelib/io/qdatastream.h | 18 | ||||
| -rw-r--r-- | src/corelib/tools/qpair.h | 18 | ||||
| -rw-r--r-- | src/gui/math3d/qquaternion.cpp | 1 | ||||
| -rw-r--r-- | src/gui/math3d/qvector2d.cpp | 1 | ||||
| -rw-r--r-- | src/gui/math3d/qvector3d.cpp | 1 | ||||
| -rw-r--r-- | src/gui/math3d/qvector4d.cpp | 1 | ||||
| -rw-r--r-- | src/network/access/qabstractnetworkcache.cpp | 1 | ||||
| -rw-r--r-- | src/network/access/qhttpmultipart.h | 1 | ||||
| -rw-r--r-- | src/widgets/graphicsview/qsimplex_p.h | 1 | ||||
| -rw-r--r-- | src/widgets/itemviews/qwidgetitemdata_p.h | 2 |
10 files changed, 27 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 diff --git a/src/gui/math3d/qquaternion.cpp b/src/gui/math3d/qquaternion.cpp index 9671680e9c..79cdb36724 100644 --- a/src/gui/math3d/qquaternion.cpp +++ b/src/gui/math3d/qquaternion.cpp @@ -40,6 +40,7 @@ ****************************************************************************/ #include "qquaternion.h" +#include <QtCore/qdatastream.h> #include <QtCore/qmath.h> #include <QtCore/qvariant.h> #include <QtCore/qdebug.h> diff --git a/src/gui/math3d/qvector2d.cpp b/src/gui/math3d/qvector2d.cpp index ae4df34e8b..672e2e4dd7 100644 --- a/src/gui/math3d/qvector2d.cpp +++ b/src/gui/math3d/qvector2d.cpp @@ -42,6 +42,7 @@ #include "qvector2d.h" #include "qvector3d.h" #include "qvector4d.h" +#include <QtCore/qdatastream.h> #include <QtCore/qdebug.h> #include <QtCore/qvariant.h> #include <QtCore/qmath.h> diff --git a/src/gui/math3d/qvector3d.cpp b/src/gui/math3d/qvector3d.cpp index b282163559..076f5c9ff2 100644 --- a/src/gui/math3d/qvector3d.cpp +++ b/src/gui/math3d/qvector3d.cpp @@ -42,6 +42,7 @@ #include "qvector3d.h" #include "qvector2d.h" #include "qvector4d.h" +#include <QtCore/qdatastream.h> #include <QtCore/qmath.h> #include <QtCore/qvariant.h> #include <QtCore/qdebug.h> diff --git a/src/gui/math3d/qvector4d.cpp b/src/gui/math3d/qvector4d.cpp index 3f542c1c13..a188333a3a 100644 --- a/src/gui/math3d/qvector4d.cpp +++ b/src/gui/math3d/qvector4d.cpp @@ -42,6 +42,7 @@ #include "qvector4d.h" #include "qvector3d.h" #include "qvector2d.h" +#include <QtCore/qdatastream.h> #include <QtCore/qdebug.h> #include <QtCore/qvariant.h> #include <QtCore/qmath.h> diff --git a/src/network/access/qabstractnetworkcache.cpp b/src/network/access/qabstractnetworkcache.cpp index 69acf080ec..70b1211595 100644 --- a/src/network/access/qabstractnetworkcache.cpp +++ b/src/network/access/qabstractnetworkcache.cpp @@ -42,6 +42,7 @@ #include "qabstractnetworkcache.h" #include "qabstractnetworkcache_p.h" +#include <qdatastream.h> #include <qdatetime.h> #include <qurl.h> diff --git a/src/network/access/qhttpmultipart.h b/src/network/access/qhttpmultipart.h index aea8421d30..378ae3cd9e 100644 --- a/src/network/access/qhttpmultipart.h +++ b/src/network/access/qhttpmultipart.h @@ -44,6 +44,7 @@ #include <QtCore/QSharedDataPointer> #include <QtCore/QByteArray> +#include <QtCore/QIODevice> #include <QtNetwork/QNetworkRequest> QT_BEGIN_HEADER diff --git a/src/widgets/graphicsview/qsimplex_p.h b/src/widgets/graphicsview/qsimplex_p.h index 0208ce5537..1a3eae97e0 100644 --- a/src/widgets/graphicsview/qsimplex_p.h +++ b/src/widgets/graphicsview/qsimplex_p.h @@ -55,6 +55,7 @@ #include <QtCore/qhash.h> #include <QtCore/qpair.h> +#include <QtCore/qstring.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/itemviews/qwidgetitemdata_p.h b/src/widgets/itemviews/qwidgetitemdata_p.h index 491169e791..fc9a96659d 100644 --- a/src/widgets/itemviews/qwidgetitemdata_p.h +++ b/src/widgets/itemviews/qwidgetitemdata_p.h @@ -42,6 +42,8 @@ #ifndef QWIDGETITEMDATA_P_H #define QWIDGETITEMDATA_P_H +#include <QtCore/qdatastream.h> + // // W A R N I N G // ------------- |