From 8995c6031678df5487b77019ff0b6adb1d816c9a Mon Sep 17 00:00:00 2001
From: Martin Smith <msmith@trolltech.com>
Date: Mon, 16 Nov 2009 13:43:15 +0100
Subject: doc: Fixed qdoc according to Bjarne's recommendation.

Someone had changed an operator==() and an operator!=() from
single parameter members to two-parameter friends but hadn't
changed the qdoc comments.
(cherry picked from commit d65bff4c94fb11bbad02420459a9375621051823)
---
 doc/src/qt4-intro.qdoc                 |  2 +-
 src/corelib/tools/qcontiguouscache.cpp | 31 ++++++++++++++++++++++++++++---
 src/gui/accessible/qaccessible.cpp     | 10 ++++++++++
 src/gui/effects/qgraphicseffect.cpp    | 13 -------------
 4 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc
index a6e868f..183ffcf 100644
--- a/doc/src/qt4-intro.qdoc
+++ b/doc/src/qt4-intro.qdoc
@@ -583,7 +583,7 @@
     DOM, helps reuse CSS selector knowledge, and gives little
     maintenance or footprint overhead.
 
-    \snippet webkitsnippets/webelement/main.cpp FindAll intro
+    \snippet webkitsnippets/webelement/main.cpp FindAll
 
     See the QWebElement class documentation for more information.
 
diff --git a/src/corelib/tools/qcontiguouscache.cpp b/src/corelib/tools/qcontiguouscache.cpp
index 2d313f8..2f43844 100644
--- a/src/corelib/tools/qcontiguouscache.cpp
+++ b/src/corelib/tools/qcontiguouscache.cpp
@@ -150,20 +150,45 @@ MyRecord record(int row) const
 */
 
 /*! \fn void QContiguousCache::detach()
-
     \internal
 */
 
 /*! \fn bool QContiguousCache::isDetached() const
-
     \internal
 */
 
 /*! \fn void QContiguousCache::setSharable(bool sharable)
-
     \internal
 */
 
+/*! \typedef QContiguousCache::value_type
+  \internal
+ */
+
+/*! \typedef QContiguousCache::pointer
+  \internal
+ */
+
+/*! \typedef QContiguousCache::const_pointer
+  \internal
+ */
+
+/*! \typedef QContiguousCache::reference
+  \internal
+ */
+
+/*! \typedef QContiguousCache::const_reference
+  \internal
+ */
+
+/*! \typedef QContiguousCache::difference_type
+  \internal
+ */
+
+/*! \typedef QContiguousCache::size_type
+  \internal
+ */
+
 /*! \fn QContiguousCache<T> &QContiguousCache::operator=(const QContiguousCache<T> &other)
 
     Assigns \a other to this cache and returns a reference to this cache.
diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp
index 89e7eda..15813eb 100644
--- a/src/gui/accessible/qaccessible.cpp
+++ b/src/gui/accessible/qaccessible.cpp
@@ -984,6 +984,16 @@ const QAccessibleInterface *other, int otherChild) const
 */
 
 /*!
+    \fn QAccessibleActionInterface *QAccessibleInterface::actionInterface()
+    \internal
+*/
+
+/*!
+    \fn QAccessibleImageInterface *QAccessibleInterface::imageInterface()
+    \internal
+*/
+
+/*!
     \class QAccessibleEvent
     \brief The QAccessibleEvent class is used to query addition
     accessibility information about complex widgets.
diff --git a/src/gui/effects/qgraphicseffect.cpp b/src/gui/effects/qgraphicseffect.cpp
index 68008b7..9777fa4 100644
--- a/src/gui/effects/qgraphicseffect.cpp
+++ b/src/gui/effects/qgraphicseffect.cpp
@@ -135,19 +135,6 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \enum QGraphicsEffectSource::PixmapPadMode
-
-    This enum describes how much of the effect will be rendered to a pixmap
-    created using the pixmap() function.
-
-    \value NoExpandPadMode  The pixmap is the size of the widget or graphics item.
-    \value ExpandToTransparentBorderPadMode  The pixmap is expanded to include
-        the widget or graphics item plus a transparent border.
-    \value ExpandToEffectRectPadMode  The pixmap is expanded to include the widget
-        or graphics item and the effect.
-*/
-
-/*!
     \internal
 */
 QGraphicsEffectSource::QGraphicsEffectSource(QGraphicsEffectSourcePrivate &dd, QObject *parent)
-- 
cgit v0.12