diff options
author | Martin Smith <msmith@trolltech.com> | 2009-08-31 08:39:05 (GMT) |
---|---|---|
committer | Martin Smith <msmith@trolltech.com> | 2009-08-31 08:39:05 (GMT) |
commit | 68dc7ed9338eb555eb78d9993490434284bdc223 (patch) | |
tree | 3a0c8bbd8b3d8e50dd7eb5fb2b4ad34b4434359e /src | |
parent | eb80f2386d91e9bde23fc752ad25967e99cc10dc (diff) | |
download | Qt-68dc7ed9338eb555eb78d9993490434284bdc223.zip Qt-68dc7ed9338eb555eb78d9993490434284bdc223.tar.gz Qt-68dc7ed9338eb555eb78d9993490434284bdc223.tar.bz2 |
doc: Fixed several qdoc errors.
Diffstat (limited to 'src')
-rw-r--r-- | src/gui/image/qpixmap_s60.cpp | 12 | ||||
-rw-r--r-- | src/gui/kernel/qapplication_s60.cpp | 21 | ||||
-rw-r--r-- | src/gui/styles/qcommonstyle.cpp | 4 | ||||
-rw-r--r-- | src/gui/styles/qs60style.cpp | 31 |
4 files changed, 55 insertions, 13 deletions
diff --git a/src/gui/image/qpixmap_s60.cpp b/src/gui/image/qpixmap_s60.cpp index a796066..e00bf26 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 87cf82e..14ed48d 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 ee9827e..e902d96 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 3230c17..bd27c8d 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 { |