diff options
author | Casper van Donderen <casper.vandonderen@nokia.com> | 2012-03-01 14:43:20 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-12 13:03:27 +0100 |
commit | 94efd3b4068743885cb5b8f52bcfba1e156ecd1b (patch) | |
tree | 927805820cfda63c9e6de405301f4646303597d5 /src | |
parent | 7cd0cfdaf7379c82d852b9fa3f32d163ed8d38c5 (diff) | |
download | qtactiveqt-94efd3b4068743885cb5b8f52bcfba1e156ecd1b.tar.gz |
Remove the usage of deprecated qdoc macros.
QDoc now has support for Doxygen style commands for italics, bold
and list items. This change applies that change in QDoc to the
actual documentation.
Task-number: QTBUG-24578
Change-Id: I3c02c7964bafa091b8bf6b8e0543a51604dcb2bc
Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/activeqt/container/qaxbase.cpp | 166 | ||||
-rw-r--r-- | src/activeqt/container/qaxwidget.cpp | 12 | ||||
-rw-r--r-- | src/activeqt/control/qaxfactory.cpp | 16 | ||||
-rw-r--r-- | src/activeqt/control/qaxserverbase.cpp | 16 |
4 files changed, 105 insertions, 105 deletions
diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp index 7a9c9be..e2cb619 100644 --- a/src/activeqt/container/qaxbase.cpp +++ b/src/activeqt/container/qaxbase.cpp @@ -726,105 +726,105 @@ QByteArray QAxEventSink::findProperty(DISPID dispID) type that is used in the prototype of signals and slots for out-parameters. \table \header - \i COM type - \i Qt property - \i in-parameter - \i out-parameter + \li COM type + \li Qt property + \li in-parameter + \li out-parameter \row - \i VARIANT_BOOL - \i bool - \i bool - \i bool& + \li VARIANT_BOOL + \li bool + \li bool + \li bool& \row - \i BSTR - \i QString - \i const QString& - \i QString& + \li BSTR + \li QString + \li const QString& + \li QString& \row - \i char, short, int, long - \i int - \i int - \i int& + \li char, short, int, long + \li int + \li int + \li int& \row - \i uchar, ushort, uint, ulong - \i uint - \i uint - \i uint& + \li uchar, ushort, uint, ulong + \li uint + \li uint + \li uint& \row - \i float, double - \i double - \i double - \i double& + \li float, double + \li double + \li double + \li double& \row - \i DATE - \i QDateTime - \i const QDateTime& - \i QDateTime& + \li DATE + \li QDateTime + \li const QDateTime& + \li QDateTime& \row - \i CY - \i qlonglong - \i qlonglong - \i qlonglong& + \li CY + \li qlonglong + \li qlonglong + \li qlonglong& \row - \i OLE_COLOR - \i QColor - \i const QColor& - \i QColor& + \li OLE_COLOR + \li QColor + \li const QColor& + \li QColor& \row - \i SAFEARRAY(VARIANT) - \i QList\<QVariant\> - \i const QList\<QVariant\>& - \i QList\<QVariant\>& + \li SAFEARRAY(VARIANT) + \li QList\<QVariant\> + \li const QList\<QVariant\>& + \li QList\<QVariant\>& \row - \i SAFEARRAY(int), SAFEARRAY(double), SAFEARRAY(Date) - \i QList\<QVariant\> - \i const QList\<QVariant\>& - \i QList\<QVariant\>& + \li SAFEARRAY(int), SAFEARRAY(double), SAFEARRAY(Date) + \li QList\<QVariant\> + \li const QList\<QVariant\>& + \li QList\<QVariant\>& \row - \i SAFEARRAY(BYTE) - \i QByteArray - \i const QByteArray& - \i QByteArray& + \li SAFEARRAY(BYTE) + \li QByteArray + \li const QByteArray& + \li QByteArray& \row - \i SAFEARRAY(BSTR) - \i QStringList - \i const QStringList& - \i QStringList& + \li SAFEARRAY(BSTR) + \li QStringList + \li const QStringList& + \li QStringList& \row - \i VARIANT - \i type-dependent - \i const QVariant& - \i QVariant& + \li VARIANT + \li type-dependent + \li const QVariant& + \li QVariant& \row - \i IFontDisp* - \i QFont - \i const QFont& - \i QFont& + \li IFontDisp* + \li QFont + \li const QFont& + \li QFont& \row - \i IPictureDisp* - \i QPixmap - \i const QPixmap& - \i QPixmap& + \li IPictureDisp* + \li QPixmap + \li const QPixmap& + \li QPixmap& \row - \i IDispatch* - \i QAxObject* - \i \c QAxBase::asVariant() - \i QAxObject* (return value) + \li IDispatch* + \li QAxObject* + \li \c QAxBase::asVariant() + \li QAxObject* (return value) \row - \i IUnknown* - \i QAxObject* - \i \c QAxBase::asVariant() - \i QAxObject* (return value) + \li IUnknown* + \li QAxObject* + \li \c QAxBase::asVariant() + \li QAxObject* (return value) \row - \i SCODE, DECIMAL - \i \e unsupported - \i \e unsupported - \i \e unsupported + \li SCODE, DECIMAL + \li \e unsupported + \li \e unsupported + \li \e unsupported \row - \i VARIANT* (Since Qt 4.5) - \i \e unsupported - \i \e QVariant& - \i \e QVariant& + \li VARIANT* (Since Qt 4.5) + \li \e unsupported + \li \e QVariant& + \li \e QVariant& \endtable Supported are also enumerations, and typedefs to supported types. @@ -965,16 +965,16 @@ QAxMetaObject *QAxBase::internalMetaObject() const to initialize the control on a remote machine, to initialize a licensed control or to connect to a running object: \list - \i To initialize the control on a different machine use the following + \li To initialize the control on a different machine use the following pattern: \snippet doc/src/snippets/code/src_activeqt_container_qaxbase.cpp 11 - \i To initialize a licensed control use the following pattern: + \li To initialize a licensed control use the following pattern: \snippet doc/src/snippets/code/src_activeqt_container_qaxbase.cpp 12 - \i To connect to an already running object use the following pattern: + \li To connect to an already running object use the following pattern: \snippet doc/src/snippets/code/src_activeqt_container_qaxbase.cpp 13 diff --git a/src/activeqt/container/qaxwidget.cpp b/src/activeqt/container/qaxwidget.cpp index d56dbc0..b8372a8 100644 --- a/src/activeqt/container/qaxwidget.cpp +++ b/src/activeqt/container/qaxwidget.cpp @@ -2229,13 +2229,13 @@ void QAxWidget::connectNotify(const char *) \table \header - \i WM_SYSKEYDOWN - \i WM_SYSKEYUP - \i WM_KEYDOWN + \li WM_SYSKEYDOWN + \li WM_SYSKEYUP + \li WM_KEYDOWN \row - \i All keycodes - \i VK_MENU - \i VK_TAB, VK_DELETE and all non-arrow-keys in combination with VK_SHIFT, + \li All keycodes + \li VK_MENU + \li VK_TAB, VK_DELETE and all non-arrow-keys in combination with VK_SHIFT, VK_CONTROL or VK_MENU \endtable diff --git a/src/activeqt/control/qaxfactory.cpp b/src/activeqt/control/qaxfactory.cpp index ca29ac8..fc6c932 100644 --- a/src/activeqt/control/qaxfactory.cpp +++ b/src/activeqt/control/qaxfactory.cpp @@ -324,14 +324,14 @@ bool QAxFactory::stayTopLevel(const QString &key) const Reimplement this function to return true if the ActiveX control \a key should support the standard ActiveX events \list - \i Click - \i DblClick - \i KeyDown - \i KeyPress - \i KeyUp - \i MouseDown - \i MouseUp - \i MouseMove + \li Click + \li DblClick + \li KeyDown + \li KeyPress + \li KeyUp + \li MouseDown + \li MouseUp + \li MouseMove \endlist The default implementation interprets \a key as the class name, diff --git a/src/activeqt/control/qaxserverbase.cpp b/src/activeqt/control/qaxserverbase.cpp index 9e028e7..61cc86c 100644 --- a/src/activeqt/control/qaxserverbase.cpp +++ b/src/activeqt/control/qaxserverbase.cpp @@ -1304,14 +1304,14 @@ class HackWidget : public QWidget Message handler. \a hWnd is always the ActiveX widget hosting the Qt widget. \a uMsg is handled as follows \list - \i WM_CREATE The ActiveX control is created - \i WM_DESTROY The QWidget is destroyed - \i WM_SHOWWINDOW The QWidget is parented into the ActiveX window - \i WM_PAINT The QWidget is updated - \i WM_SIZE The QWidget is resized to the new size - \i WM_SETFOCUS and - \i WM_KILLFOCUS The client site is notified about the focus transfer - \i WM_MOUSEACTIVATE The ActiveX is activated + \li WM_CREATE The ActiveX control is created + \li WM_DESTROY The QWidget is destroyed + \li WM_SHOWWINDOW The QWidget is parented into the ActiveX window + \li WM_PAINT The QWidget is updated + \li WM_SIZE The QWidget is resized to the new size + \li WM_SETFOCUS and + \li WM_KILLFOCUS The client site is notified about the focus transfer + \li WM_MOUSEACTIVATE The ActiveX is activated \endlist The semantics of \a wParam and \a lParam depend on the value of \a uMsg. |