diff options
author | Ritt Konstantin <ritt.ks@gmail.com> | 2009-06-08 08:42:42 (GMT) |
---|---|---|
committer | Marius Storm-Olsen <marius@trolltech.com> | 2009-06-08 08:43:01 (GMT) |
commit | eb8789ba06949974eb4108b115a30f96e1500a81 (patch) | |
tree | 523aa4541353053454fb3fd307aee4a742653827 /src/corelib/tools/qbitarray.cpp | |
parent | ac30cbdceac428fa206a939e5d820b2bd77227fc (diff) | |
download | Qt-eb8789ba06949974eb4108b115a30f96e1500a81.zip Qt-eb8789ba06949974eb4108b115a30f96e1500a81.tar.gz Qt-eb8789ba06949974eb4108b115a30f96e1500a81.tar.bz2 |
Fix QT_NO_DATASTREAM macro checks and improve readability
Some checks where in the wrong locations, and some endifs where
hard to read.
Merge-request: 611
Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
Diffstat (limited to 'src/corelib/tools/qbitarray.cpp')
-rw-r--r-- | src/corelib/tools/qbitarray.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/corelib/tools/qbitarray.cpp b/src/corelib/tools/qbitarray.cpp index a947ab5..591cfa9 100644 --- a/src/corelib/tools/qbitarray.cpp +++ b/src/corelib/tools/qbitarray.cpp @@ -653,6 +653,7 @@ QBitArray operator^(const QBitArray &a1, const QBitArray &a2) QBitArray stream functions *****************************************************************************/ +#ifndef QT_NO_DATASTREAM /*! \relates QBitArray @@ -660,7 +661,7 @@ QBitArray operator^(const QBitArray &a1, const QBitArray &a2) \sa \link datastreamformat.html Format of the QDataStream operators \endlink */ -#ifndef QT_NO_DATASTREAM + QDataStream &operator<<(QDataStream &out, const QBitArray &ba) { quint32 len = ba.size(); @@ -713,7 +714,7 @@ QDataStream &operator>>(QDataStream &in, QBitArray &ba) *ba.d.data() = ba.d.size() * 8 - len; return in; } -#endif +#endif // QT_NO_DATASTREAM /*! \fn DataPtr &QBitArray::data_ptr() |