summaryrefslogtreecommitdiffstats
path: root/src/multimedia
diff options
context:
space:
mode:
authorCasper van Donderen <casper.vandonderen@nokia.com>2012-03-01 18:50:38 +0100
committerQt by Nokia <qt-info@nokia.com>2012-03-02 04:02:43 +0100
commitd1b6bf5fac54a39d911079ba792ca95424c5c70c (patch)
treeeccc1344c41fe509fa5f22a972d5b4decad10f85 /src/multimedia
parent3d0a14efceea7b4faabc73f52a1c0e74230d24d2 (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: Iec1c616e0d9a915a31a661916805916e19495dc9 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'src/multimedia')
-rw-r--r--src/multimedia/audio/qaudiodeviceinfo.cpp4
-rw-r--r--src/multimedia/audio/qaudioformat.cpp34
-rw-r--r--src/multimedia/audio/qsoundeffect.cpp2
-rw-r--r--src/multimedia/video/qabstractvideosurface.cpp4
4 files changed, 22 insertions, 22 deletions
diff --git a/src/multimedia/audio/qaudiodeviceinfo.cpp b/src/multimedia/audio/qaudiodeviceinfo.cpp
index 13e7fab88..96ffefe7c 100644
--- a/src/multimedia/audio/qaudiodeviceinfo.cpp
+++ b/src/multimedia/audio/qaudiodeviceinfo.cpp
@@ -255,8 +255,8 @@ bool QAudioDeviceInfo::isFormatSupported(const QAudioFormat &settings) const
A typical audio system would provide something like:
\list
- \o Input settings: 8000Hz mono 8 bit.
- \o Output settings: 44100Hz stereo 16 bit little endian.
+ \li Input settings: 8000Hz mono 8 bit.
+ \li Output settings: 44100Hz stereo 16 bit little endian.
\endlist
*/
QAudioFormat QAudioDeviceInfo::preferredFormat() const
diff --git a/src/multimedia/audio/qaudioformat.cpp b/src/multimedia/audio/qaudioformat.cpp
index 73165d70b..a1ece4fcd 100644
--- a/src/multimedia/audio/qaudioformat.cpp
+++ b/src/multimedia/audio/qaudioformat.cpp
@@ -122,26 +122,26 @@ public:
\table
\header
- \o Parameter
- \o Description
+ \li Parameter
+ \li Description
\row
- \o Sample Rate
- \o Samples per second of audio data in Hertz.
+ \li Sample Rate
+ \li Samples per second of audio data in Hertz.
\row
- \o Number of channels
- \o The number of audio channels (typically one for mono
+ \li Number of channels
+ \li The number of audio channels (typically one for mono
or two for stereo)
\row
- \o Sample size
- \o How much data is stored in each sample (typically 8
+ \li Sample size
+ \li How much data is stored in each sample (typically 8
or 16 bits)
\row
- \o Sample type
- \o Numerical representation of sample (typically signed integer,
+ \li Sample type
+ \li Numerical representation of sample (typically signed integer,
unsigned integer or float)
\row
- \o Byte order
- \o Byte ordering of sample (typically little endian, big endian)
+ \li Byte order
+ \li Byte ordering of sample (typically little endian, big endian)
\endtable
This class is typically used in conjunction with QAudioInput or
@@ -161,11 +161,11 @@ public:
Values are initialized as follows:
\list
- \o sampleRate() = -1
- \o channelCount() = -1
- \o sampleSize() = -1
- \o byteOrder() = QAudioFormat::Endian(QSysInfo::ByteOrder)
- \o sampleType() = QAudioFormat::Unknown
+ \li sampleRate() = -1
+ \li channelCount() = -1
+ \li sampleSize() = -1
+ \li byteOrder() = QAudioFormat::Endian(QSysInfo::ByteOrder)
+ \li sampleType() = QAudioFormat::Unknown
\c codec() = ""
\endlist
*/
diff --git a/src/multimedia/audio/qsoundeffect.cpp b/src/multimedia/audio/qsoundeffect.cpp
index dd24e8018..6ebbdc8bf 100644
--- a/src/multimedia/audio/qsoundeffect.cpp
+++ b/src/multimedia/audio/qsoundeffect.cpp
@@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
\ingroup multimedia_qml
\inqmlmodule QtMultimedia 5
- This element is part of the \bold{QtMultimedia 5.0} module.
+ This element is part of the \b{QtMultimedia 5.0} module.
The following example plays a WAV file on mouse click.
diff --git a/src/multimedia/video/qabstractvideosurface.cpp b/src/multimedia/video/qabstractvideosurface.cpp
index aa7c316b1..ed2cdde50 100644
--- a/src/multimedia/video/qabstractvideosurface.cpp
+++ b/src/multimedia/video/qabstractvideosurface.cpp
@@ -115,8 +115,8 @@ public:
implement, broken down into two classes:
\list
- \o Format related
- \o Presentation related
+ \li Format related
+ \li Presentation related
\endlist
For format related functionality, you just have to describe the pixel formats that you