summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2012-08-14 17:03:51 +0200
committerQt by Nokia <qt-info@nokia.com>2012-08-15 11:38:37 +0200
commit45ecea6a87700e2990e64cad183e6da8145d0a4f (patch)
tree534adf222ebed69f0572291d5fa2f602c2cfd6a8 /src/corelib
parent98804946f289fe8ab866cc7bf3383a29057f9251 (diff)
Fix QPointer qdoc errors
Change-Id: I54082a87f076aa511329cfb7a6ed6ecabcfb40f7 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/kernel/qpointer.cpp15
-rw-r--r--src/corelib/kernel/qpointer.h2
2 files changed, 1 insertions, 16 deletions
diff --git a/src/corelib/kernel/qpointer.cpp b/src/corelib/kernel/qpointer.cpp
index ec719e9cdc..2a5db0ee26 100644
--- a/src/corelib/kernel/qpointer.cpp
+++ b/src/corelib/kernel/qpointer.cpp
@@ -127,14 +127,6 @@
*/
/*!
- \fn QPointer::QPointer(const QPointer<T> &p)
-
- Copies one guarded pointer from another. The constructed guarded
- pointer points to the same object that \a p points to (which may
- be 0).
-*/
-
-/*!
\fn QPointer::~QPointer()
Destroys the guarded pointer. Just like a normal pointer,
@@ -143,13 +135,6 @@
*/
/*!
- \fn QPointer<T>& QPointer::operator=(const QPointer<T> &p)
-
- Assignment operator. This guarded pointer will now point to the
- same object that \a p points to.
-*/
-
-/*!
\fn QPointer<T> & QPointer::operator=(T* p)
Assignment operator. This guarded pointer will now point to the
diff --git a/src/corelib/kernel/qpointer.h b/src/corelib/kernel/qpointer.h
index ef1d4dc1d5..7a623faef0 100644
--- a/src/corelib/kernel/qpointer.h
+++ b/src/corelib/kernel/qpointer.h
@@ -97,7 +97,7 @@ public:
{ return data(); }
#ifdef qdoc
inline bool isNull() const;
- inline void clear() const;
+ inline void clear();
#else
using QPointerBase::isNull;
using QPointerBase::clear;