summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorCasper van Donderen <casper.vandonderen@nokia.com>2012-03-01 15:28:31 +0100
committerQt by Nokia <qt-info@nokia.com>2012-03-02 23:16:25 +0100
commit95d83cb1b68cc4a415d5d80859b4e74472ad7112 (patch)
tree9f6fa892ee78f584224320a195f03419c0fdbc21 /src/plugins
parent15e136d4e116c1513c106dfbb75e1953a7f3463c (diff)
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: I519bf9c29b14092e3ab6067612f42bf749eeedf5 Reviewed-by: Shane Kearns <shane.kearns@accenture.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/platforms/windows/main.cpp6
-rw-r--r--src/plugins/platforms/windows/qwindowsdialoghelpers.cpp4
-rw-r--r--src/plugins/platforms/windows/qwindowsinputcontext.cpp8
-rw-r--r--src/plugins/platforms/windows/qwindowsintegration.cpp6
-rw-r--r--src/plugins/platforms/windows/qwindowsmime.cpp14
-rw-r--r--src/plugins/platforms/windows/qwindowsole.cpp10
-rw-r--r--src/plugins/platforms/windows/qwindowswindow.cpp16
7 files changed, 32 insertions, 32 deletions
diff --git a/src/plugins/platforms/windows/main.cpp b/src/plugins/platforms/windows/main.cpp
index f16eff5449..6d7c89e086 100644
--- a/src/plugins/platforms/windows/main.cpp
+++ b/src/plugins/platforms/windows/main.cpp
@@ -59,15 +59,15 @@ QT_BEGIN_NAMESPACE
of QGuiApplication:
\list
- \o \c fontengine=native Indicates that the freetype font
+ \li \c fontengine=native Indicates that the freetype font
engine should not be used.
- \o \c gl=gdi Indicates that ARB Open GL functionality should not be used
+ \li \c gl=gdi Indicates that ARB Open GL functionality should not be used
\endlist
\section1 Tips
\list
- \o The environment variable \c QT_LIGHTHOUSE_WINDOWS_VERBOSE controls
+ \li The environment variable \c QT_LIGHTHOUSE_WINDOWS_VERBOSE controls
the debug level. It takes the form
\c{<keyword1>:<level1>,<keyword2>:<level2>}, where
keyword is one of \c integration, \c windows, \c backingstore and
diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
index 25b9336361..1239f3d8e2 100644
--- a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
+++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
@@ -366,10 +366,10 @@ void eatMouseMove()
There 2 types of native dialogs:
\list
- \o Dialogs provided by the Comdlg32 library (ChooseColor,
+ \li Dialogs provided by the Comdlg32 library (ChooseColor,
ChooseFont). They only provide a modal, blocking
function call (with idle processing).
- \o File dialogs are classes derived from IFileDialog. They
+ \li File dialogs are classes derived from IFileDialog. They
inherit IModalWindow and their exec() method (calling
IModalWindow::Show()) is similarly blocking, but methods
like close() can be called on them from event handlers.
diff --git a/src/plugins/platforms/windows/qwindowsinputcontext.cpp b/src/plugins/platforms/windows/qwindowsinputcontext.cpp
index 5085dfefb7..ae5053210e 100644
--- a/src/plugins/platforms/windows/qwindowsinputcontext.cpp
+++ b/src/plugins/platforms/windows/qwindowsinputcontext.cpp
@@ -108,11 +108,11 @@ template <class T>
\section1 Testing
\list
- \o Install the East Asian language support and choose Japanese (say).
- \o Compile the \a mainwindows/mdi example and open a text window.
- \o In the language bar, switch to Japanese and choose the
+ \li Install the East Asian language support and choose Japanese (say).
+ \li Compile the \a mainwindows/mdi example and open a text window.
+ \li In the language bar, switch to Japanese and choose the
Input method 'Hiragana'.
- \o In a text editor control, type the syllable \a 'la'.
+ \li In a text editor control, type the syllable \a 'la'.
Underlined characters show up, indicating that there is completion
available. Press the Space key two times. A completion popup occurs
which shows the options.
diff --git a/src/plugins/platforms/windows/qwindowsintegration.cpp b/src/plugins/platforms/windows/qwindowsintegration.cpp
index 3e98be4741..b43362c045 100644
--- a/src/plugins/platforms/windows/qwindowsintegration.cpp
+++ b/src/plugins/platforms/windows/qwindowsintegration.cpp
@@ -74,9 +74,9 @@ QT_BEGIN_NAMESPACE
Currently implemented keys
\list
- \o handle (HWND)
- \o getDC (DC)
- \o releaseDC Releases the previously acquired DC and returns 0.
+ \li handle (HWND)
+ \li getDC (DC)
+ \li releaseDC Releases the previously acquired DC and returns 0.
\endlist
\ingroup qt-lighthouse-win
diff --git a/src/plugins/platforms/windows/qwindowsmime.cpp b/src/plugins/platforms/windows/qwindowsmime.cpp
index 570e4b3b6b..e41db3f60f 100644
--- a/src/plugins/platforms/windows/qwindowsmime.cpp
+++ b/src/plugins/platforms/windows/qwindowsmime.cpp
@@ -413,14 +413,14 @@ static bool canGetData(int cf, IDataObject * pDataObj)
Qt has predefined support for the following Windows Clipboard formats:
\table
- \header \o Windows Format \o Equivalent MIME type
- \row \o \c CF_UNICODETEXT \o \c text/plain
- \row \o \c CF_TEXT \o \c text/plain
- \row \o \c CF_DIB \o \c{image/xyz}, where \c xyz is
+ \header \li Windows Format \li Equivalent MIME type
+ \row \li \c CF_UNICODETEXT \li \c text/plain
+ \row \li \c CF_TEXT \li \c text/plain
+ \row \li \c CF_DIB \li \c{image/xyz}, where \c xyz is
a \l{QImageWriter::supportedImageFormats()}{Qt image format}
- \row \o \c CF_HDROP \o \c text/uri-list
- \row \o \c CF_INETURL \o \c text/uri-list
- \row \o \c CF_HTML \o \c text/html
+ \row \li \c CF_HDROP \li \c text/uri-list
+ \row \li \c CF_INETURL \li \c text/uri-list
+ \row \li \c CF_HTML \li \c text/html
\endtable
An example use of this class would be to map the Windows Metafile
diff --git a/src/plugins/platforms/windows/qwindowsole.cpp b/src/plugins/platforms/windows/qwindowsole.cpp
index 3ae9fe1048..6f34967ee8 100644
--- a/src/plugins/platforms/windows/qwindowsole.cpp
+++ b/src/plugins/platforms/windows/qwindowsole.cpp
@@ -63,11 +63,11 @@ QT_BEGIN_NAMESPACE
The following methods are NOT supported for data transfer using the
clipboard or drag-drop:
\list
- \o IDataObject::SetData -- return E_NOTIMPL
- \o IDataObject::DAdvise -- return OLE_E_ADVISENOTSUPPORTED
- \o ::DUnadvise
- \o ::EnumDAdvise
- \o IDataObject::GetCanonicalFormatEtc -- return E_NOTIMPL
+ \li IDataObject::SetData -- return E_NOTIMPL
+ \li IDataObject::DAdvise -- return OLE_E_ADVISENOTSUPPORTED
+ \li ::DUnadvise
+ \li ::EnumDAdvise
+ \li IDataObject::GetCanonicalFormatEtc -- return E_NOTIMPL
(NOTE: must set pformatetcOut->ptd = NULL)
\endlist
diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp
index 3e0bec8d46..b2ebe06a58 100644
--- a/src/plugins/platforms/windows/qwindowswindow.cpp
+++ b/src/plugins/platforms/windows/qwindowswindow.cpp
@@ -205,18 +205,18 @@ static bool shouldShowMaximizeButton(Qt::WindowFlags flags)
Window creation is split in 3 steps:
\list
- \o fromWindow() Gather all required information
- \o create() Create the system handle.
- \o initialize() Post creation initialization steps.
+ \li fromWindow() Gather all required information
+ \li create() Create the system handle.
+ \li initialize() Post creation initialization steps.
\endlist
The reason for this split is to also enable changing the QWindowFlags
by calling:
\list
- \o fromWindow() Gather information and determine new system styles
- \o applyWindowFlags() to apply the new window system styles.
- \o initialize() Post creation initialization steps.
+ \li fromWindow() Gather information and determine new system styles
+ \li applyWindowFlags() to apply the new window system styles.
+ \li initialize() Post creation initialization steps.
\endlist
Contains the window creation code formerly in qwidget_win.cpp.
@@ -594,13 +594,13 @@ QWindowCreationContext::QWindowCreationContext(const QWindow *w,
\brief Raster or OpenGL Window.
\list
- \o Raster type: handleWmPaint() is implemented to
+ \li Raster type: handleWmPaint() is implemented to
to bitblt the image. The DC can be accessed
via getDC/Relase DC, which has a special handling
when within a paint event (in that case, the DC obtained
from BeginPaint() is returned).
- \o Open GL: The first time QWindowsGLContext accesses
+ \li Open GL: The first time QWindowsGLContext accesses
the handle, it sets up the pixelformat on the DC
which in turn sets it on the window (see flag
PixelFormatInitialized).