summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/corelib/io/qdatastream.cpp11
-rw-r--r--src/corelib/io/qdatastream.h9
2 files changed, 11 insertions, 9 deletions
diff --git a/src/corelib/io/qdatastream.cpp b/src/corelib/io/qdatastream.cpp
index cac5152e87..2369fe4726 100644
--- a/src/corelib/io/qdatastream.cpp
+++ b/src/corelib/io/qdatastream.cpp
@@ -42,6 +42,7 @@
#if !defined(QT_NO_DATASTREAM) || defined(QT_BOOTSTRAPPED)
#include "qbuffer.h"
+#include "qfloat16.h"
#include "qstring.h"
#include <stdio.h>
#include <ctype.h>
@@ -975,7 +976,6 @@ QDataStream &QDataStream::operator>>(double &f)
/*!
- \fn QDataStream &QDataStream::operator>>(qfloat16 &f)
\overload
\since 5.9
@@ -983,6 +983,11 @@ QDataStream &QDataStream::operator>>(double &f)
using the standard IEEE 754 format. Returns a reference to the
stream.
*/
+QDataStream &QDataStream::operator>>(qfloat16 &f)
+{
+ return *this >> reinterpret_cast<qint16&>(f);
+}
+
/*!
\overload
@@ -1280,6 +1285,10 @@ QDataStream &QDataStream::operator<<(double f)
Writes a floating point number, \a f, to the stream using
the standard IEEE 754 format. Returns a reference to the stream.
*/
+QDataStream &QDataStream::operator<<(qfloat16 f)
+{
+ return *this << reinterpret_cast<qint16&>(f);
+}
/*!
\overload
diff --git a/src/corelib/io/qdatastream.h b/src/corelib/io/qdatastream.h
index 9a7d7e275d..ecd55f71ae 100644
--- a/src/corelib/io/qdatastream.h
+++ b/src/corelib/io/qdatastream.h
@@ -43,7 +43,6 @@
#include <QtCore/qscopedpointer.h>
#include <QtCore/qiodevice.h>
#include <QtCore/qpair.h>
-#include <QtCore/qfloat16.h>
#ifdef Status
#error qdatastream.h must be included before any header file that defines Status
@@ -51,7 +50,7 @@
QT_BEGIN_NAMESPACE
-
+class qfloat16;
class QByteArray;
class QIODevice;
@@ -348,9 +347,6 @@ inline QDataStream &QDataStream::operator>>(quint32 &i)
inline QDataStream &QDataStream::operator>>(quint64 &i)
{ return *this >> reinterpret_cast<qint64&>(i); }
-inline QDataStream &QDataStream::operator>>(qfloat16 &f)
-{ return *this >> reinterpret_cast<qint16&>(f); }
-
inline QDataStream &QDataStream::operator<<(quint8 i)
{ return *this << qint8(i); }
@@ -363,9 +359,6 @@ inline QDataStream &QDataStream::operator<<(quint32 i)
inline QDataStream &QDataStream::operator<<(quint64 i)
{ return *this << qint64(i); }
-inline QDataStream &QDataStream::operator<<(qfloat16 f)
-{ return *this << reinterpret_cast<qint16&>(f); }
-
template <typename T>
inline QDataStream &operator>>(QDataStream &s, QList<T> &l)
{