From 55150f0f0bac0a6343da60d8128fc4216b57db2b Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Wed, 13 Jun 2012 21:26:20 +0200
Subject: Move the QDataStream operator<< for QPair to qdatastream.h

QPair is small and is no problem to include from
qdatastream.h. However, including QDataStream from qpair.h means
including QIODevice and QObject too.

Change-Id: I344321e9f68438008ec329a165135c3a346c6058
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
---
 src/corelib/tools/qpair.h | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

(limited to 'src/corelib/tools/qpair.h')

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
-- 
cgit v1.2.3