summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Caini <michele.caini@gmail.com>2012-09-20 22:36:05 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-10-12 08:15:17 +0200
commita895359c1997b5830e429bc13c661549d89f099a (patch)
tree5f2cd6560744f6064baa005179a33e2a89a5064f
parentff1a51491397e8042803679a210a09e966d118dd (diff)
Review of documentation.
Documentation has been updated to reflect changes in Qt5. Change-Id: I3d54d1875962bd27c43bb360ae7b3fda0b7702ba Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r--src/corelib/tools/qbitarray.cpp8
-rw-r--r--src/corelib/tools/qbitarray.h4
2 files changed, 9 insertions, 3 deletions
diff --git a/src/corelib/tools/qbitarray.cpp b/src/corelib/tools/qbitarray.cpp
index d5538e02cc..116e60d78e 100644
--- a/src/corelib/tools/qbitarray.cpp
+++ b/src/corelib/tools/qbitarray.cpp
@@ -390,7 +390,7 @@ void QBitArray::fill(bool value, int begin, int end)
\overload
*/
-/*! \fn bool QBitArray::operator[](uint i)
+/*! \fn QBitRef QBitArray::operator[](uint i)
\overload
*/
@@ -418,6 +418,12 @@ void QBitArray::fill(bool value, int begin, int end)
this bit array.
*/
+/*! \fn QBitArray &QBitArray::operator=(QBitArray &&other)
+
+ Moves \a other to this bit array and returns a reference to
+ this bit array.
+*/
+
/*! \fn void QBitArray::swap(QBitArray &other)
\since 4.8
diff --git a/src/corelib/tools/qbitarray.h b/src/corelib/tools/qbitarray.h
index aa9c9620fc..133f829142 100644
--- a/src/corelib/tools/qbitarray.h
+++ b/src/corelib/tools/qbitarray.h
@@ -99,8 +99,8 @@ public:
QBitArray& operator^=(const QBitArray &);
QBitArray operator~() const;
- inline bool operator==(const QBitArray& a) const { return d == a.d; }
- inline bool operator!=(const QBitArray& a) const { return d != a.d; }
+ inline bool operator==(const QBitArray& other) const { return d == other.d; }
+ inline bool operator!=(const QBitArray& other) const { return d != other.d; }
inline bool fill(bool val, int size = -1);
void fill(bool val, int first, int last);