diff options
author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-30 15:52:24 (GMT) |
---|---|---|
committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-30 15:52:24 (GMT) |
commit | badcaa75b4a5e5dfbb85f5abf856abcfcfa20533 (patch) | |
tree | 70df9d393d3b6946178378560834239c81fdabf0 /src/corelib/io/qdatastream.h | |
parent | 86b4c125372f02c21be81fff376817852c28afa9 (diff) | |
parent | 2e16dff13d260e8ba07534b36ac635c9e625e442 (diff) | |
download | Qt-badcaa75b4a5e5dfbb85f5abf856abcfcfa20533.zip Qt-badcaa75b4a5e5dfbb85f5abf856abcfcfa20533.tar.gz Qt-badcaa75b4a5e5dfbb85f5abf856abcfcfa20533.tar.bz2 |
Merge branch '4.6'
Conflicts:
src/corelib/io/qdatastream.h
Diffstat (limited to 'src/corelib/io/qdatastream.h')
-rw-r--r-- | src/corelib/io/qdatastream.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/corelib/io/qdatastream.h b/src/corelib/io/qdatastream.h index 7a930c4..f8e0608 100644 --- a/src/corelib/io/qdatastream.h +++ b/src/corelib/io/qdatastream.h @@ -42,6 +42,7 @@ #ifndef QDATASTREAM_H #define QDATASTREAM_H +#include <QtCore/qscopedpointer.h> #include <QtCore/qiodevice.h> #include <QtCore/qglobal.h> @@ -83,7 +84,7 @@ public: Qt_4_3 = 9, Qt_4_4 = 10, Qt_4_5 = 11, - Qt_4_6 = Qt_4_5, + Qt_4_6 = 12, Qt_4_7 = Qt_4_6 #if QT_VERSION >= 0x040800 #error Add the datastream version for this Qt version @@ -102,6 +103,11 @@ public: ReadCorruptData }; + enum FloatingPointPrecision { + SinglePrecision, + DoublePrecision + }; + QDataStream(); explicit QDataStream(QIODevice *); #ifdef QT3_SUPPORT @@ -124,6 +130,9 @@ public: void setStatus(Status status); void resetStatus(); + FloatingPointPrecision floatingPointPrecision() const; + void setFloatingPointPrecision(FloatingPointPrecision precision); + ByteOrder byteOrder() const; void setByteOrder(ByteOrder); @@ -177,7 +186,7 @@ public: private: Q_DISABLE_COPY(QDataStream) - QDataStreamPrivate *d; + QScopedPointer<QDataStreamPrivate> d; QIODevice *dev; bool owndev; |