doc: Fixed several qdoc errors.

4 files changed, 55 insertions, 13 deletions

diff --git a/src/gui/image/qpixmap_s60.cpp b/src/gui/image/qpixmap_s60.cpp
index a7960666ba..e00bf26c9a 100644
--- a/src/gui/image/qpixmap_s60.cpp
+++ b/src/gui/image/qpixmap_s60.cpp
@@ -189,15 +189,15 @@ CFbsBitmap *QPixmap::toSymbianCFbsBitmap() const
 }
 
 /*!
-\since 4.6
+  \since 4.6
 
-Returns a QPixmap that is equivalent to the \c CFbsBitmap by copying the data.
-If the CFbsBitmap is not valid or is compressed in memory, this function will
-return a null QPixmap.
+  Returns a QPixmap that is equivalent to the \c CFbsBitmap \a bitmap
+  by copying the data. If the CFbsBitmap is not valid or is compressed
+  in memory, this function will return a null QPixmap.
 
-\warning This function is only available on Symbian OS.
+  \warning This function is only available on Symbian OS.
 
-\sa toSymbianCFbsBitmap(), {QPixmap#Pixmap Conversion}{Pixmap Conversion}
+  \sa toSymbianCFbsBitmap(), {QPixmap#Pixmap Conversion}{Pixmap Conversion}
 */
 
 QPixmap QPixmap::fromSymbianCFbsBitmap(CFbsBitmap *bitmap)
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp
index 87cf82e991..14ed48dc06 100644
--- a/src/gui/kernel/qapplication_s60.cpp
+++ b/src/gui/kernel/qapplication_s60.cpp
@@ -972,6 +972,12 @@ void QApplication::beep()
     beep=NULL;
 }
 
+/*! \fn int QApplication::s60ProcessEvent(TWsEvent *event)
+    This function does the core processing of individual s60
+    \a{event}s. It returns 1 if the event was handled, 0 if
+    the \a event was not handled, and -1 if the event was
+    not handled because the event handle was not in the map.
+ */
 int QApplication::s60ProcessEvent(TWsEvent *event)
 {
     bool handled = s60EventFilter(event);
@@ -1058,17 +1064,21 @@ int QApplication::s60ProcessEvent(TWsEvent *event)
     return 0;
 }
 
+/*!
+  Returns false. Does nothing with the TWsEvent \a aEvent.
+ */
 bool QApplication::s60EventFilter(TWsEvent * /* aEvent */)
 {
     return false;
 }
 
 /*!
-    Handles commands which are typically handled by CAknAppUi::HandleCommandL()
-    Qts Ui integration into Symbian is partially achieved by deriving from CAknAppUi.
-    Currently, exit, menu and softkey commands are handled
+  Handles \a{command}s which are typically handled by
+  CAknAppUi::HandleCommandL(). Qts Ui integration into Symbian is
+  partially achieved by deriving from CAknAppUi.  Currently, exit,
+  menu and softkey commands are handled.
 
-    \sa s60EventFilter(), s60ProcessEvent()
+  \sa s60EventFilter(), s60ProcessEvent()
 */
 void QApplication::symbianHandleCommand(int command)
 {
@@ -1096,6 +1106,9 @@ void QApplication::symbianHandleCommand(int command)
     }
 }
 
+/*!
+  Handles the resource change specified by \a type.
+ */
 void QApplication::symbianResourceChange(int type)
 {
     switch (type) {
diff --git a/src/gui/styles/qcommonstyle.cpp b/src/gui/styles/qcommonstyle.cpp
index ee9827e64e..e902d962ab 100644
--- a/src/gui/styles/qcommonstyle.cpp
+++ b/src/gui/styles/qcommonstyle.cpp
@@ -127,9 +127,7 @@ QCommonStyle::QCommonStyle(QCommonStylePrivate &dd)
 { }
 
 /*!
-    \overload
-
-    Destroys the style
+    Destroys the style.
 */
 QCommonStyle::~QCommonStyle()
 { }
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp
index 3230c175a9..bd27c8ddfe 100644
--- a/src/gui/styles/qs60style.cpp
+++ b/src/gui/styles/qs60style.cpp
@@ -886,6 +886,10 @@ QSize QS60StylePrivate::partSize(QS60StyleEnums::SkinParts part, SkinElementFlag
   \sa QMacStyle, QWindowsStyle, QWindowsXPStyle, QWindowsVistaStyle, QPlastiqueStyle, QCleanlooksStyle, QMotifStyle
 */
 
+
+/*!
+    Destroys the style.
+*/
 QS60Style::~QS60Style()
 {
 }
@@ -2450,6 +2454,9 @@ QRect QS60Style::subControlRect(ComplexControl control, const QStyleOptionComple
     return ret;
 }
 
+/*!
+  \reimp
+*/
 QRect QS60Style::subElementRect(SubElement element, const QStyleOption *opt, const QWidget *widget) const
 {
     QRect ret;
@@ -2610,6 +2617,9 @@ QRect QS60Style::subElementRect(SubElement element, const QStyleOption *opt, con
     return ret;
 }
 
+/*!
+  \reimp
+ */
 void QS60Style::polish(QWidget *widget)
 {
     Q_D(const QS60Style);
@@ -2645,6 +2655,9 @@ void QS60Style::polish(QWidget *widget)
     d->setFont(widget);
 }
 
+/*!
+  \reimp
+ */
 void QS60Style::unpolish(QWidget *widget)
 {
     if (false
@@ -2676,6 +2689,9 @@ void QS60Style::unpolish(QWidget *widget)
     QCommonStyle::unpolish(widget);
 }
 
+/*!
+  \reimp
+ */
 void QS60Style::polish(QApplication *application)
 {
     Q_D(QS60Style);
@@ -2683,6 +2699,9 @@ void QS60Style::polish(QApplication *application)
     d->setThemePalette(application);
 }
 
+/*!
+  \reimp
+ */
 void QS60Style::unpolish(QApplication *application)
 {
     Q_UNUSED(application)
@@ -2692,18 +2711,27 @@ void QS60Style::unpolish(QApplication *application)
     QApplicationPrivate::setSystemPalette(d->m_originalPalette);
 }
 
+/*!
+  Sets the style property \a name to the \a value.
+ */
 void QS60Style::setStyleProperty(const char *name, const QVariant &value)
 {
     Q_D(QS60Style);
     d->setStyleProperty_specific(name, value);
 }
 
+/*!
+  Returns the value of style property \a name.
+ */
 QVariant QS60Style::styleProperty(const char *name) const
 {
     Q_D(const QS60Style);
     return d->styleProperty_specific(name);
 }
 
+/*!
+  \reimp
+ */
 bool QS60Style::event(QEvent *e)
 {
 #ifdef QT_KEYPAD_NAVIGATION
@@ -2738,6 +2766,9 @@ bool QS60Style::event(QEvent *e)
     return false;
 }
 
+/*!
+    \internal
+ */
 QIcon QS60Style::standardIconImplementation(StandardPixmap standardIcon,
     const QStyleOption *option, const QWidget *widget) const
 {