summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaszlo Papp <lpapp@kde.org>2013-02-27 21:58:03 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-02-28 08:42:03 +0100
commit6962b6cc448ca0943a9ecc9775ba350aab2c9793 (patch)
treebf6889311b106f2e32f6bd38927e2874dcacb6ec
parente3191366fe3b44c486894ab894b1c23335942348 (diff)
Replace the deprecated commands (\i, \o, \bold) with the new ones
See the following page for details: http://doc-snapshot.qt-project.org/qt5-stable/qdoc/27-qdoc-commands-alphabetical.html Change-Id: I405deea5cf065075907ac7830e92bb064a1c72d0 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
-rw-r--r--examples/doc/blockingmaster.qdoc4
-rw-r--r--examples/doc/blockingslave.qdoc4
-rw-r--r--examples/doc/terminal.qdoc16
-rw-r--r--examples/examples.qdoc10
-rw-r--r--src/serialport/doc/src/index.qdoc8
-rw-r--r--src/serialport/doc/src/intro.qdoc42
-rw-r--r--src/serialport/qserialport.cpp42
7 files changed, 63 insertions, 63 deletions
diff --git a/examples/doc/blockingmaster.qdoc b/examples/doc/blockingmaster.qdoc
index 9ea5282a..b0ddb1c5 100644
--- a/examples/doc/blockingmaster.qdoc
+++ b/examples/doc/blockingmaster.qdoc
@@ -39,13 +39,13 @@
\list
- \o \i{The asynchronous (non-blocking) approach.} Operations are scheduled
+ \li \e{The asynchronous (non-blocking) approach.} Operations are scheduled
and performed when the control returns to Qt's event loop. QSerialPort emits
a signal when the operation is finished. For example, QSerialPort::write()
returns immediately. When the data is sent to the serial port, QSerialPort
emits \l{QSerialPort::bytesWritten()}{bytesWritten()}.
- \o \i{The synchronous (blocking) approach.} In non-GUI and multithreaded
+ \li \e{The synchronous (blocking) approach.} In non-GUI and multithreaded
applications, the \c waitFor...() functions can be called (i.e.
QSerialPort::waitReadyRead()) to suspend the calling thread until the
operation has completed.
diff --git a/examples/doc/blockingslave.qdoc b/examples/doc/blockingslave.qdoc
index 489030f3..9c676c6d 100644
--- a/examples/doc/blockingslave.qdoc
+++ b/examples/doc/blockingslave.qdoc
@@ -39,13 +39,13 @@
\list
- \o \i{The asynchronous (non-blocking) approach.} Operations are scheduled
+ \li \e{The asynchronous (non-blocking) approach.} Operations are scheduled
and performed when the control returns to Qt's event loop. QSerialPort emits
a signal when the operation is finished. For example, QSerialPort::write()
returns immediately. When the data is sent to the serial port, QSerialPort
emits \l{QSerialPort::bytesWritten()}{bytesWritten()}.
- \o \i{The synchronous (blocking) approach.} In non-GUI and multithreaded
+ \li \e{The synchronous (blocking) approach.} In non-GUI and multithreaded
applications, the \c waitFor...() functions can be called (i.e.
QSerialPort::waitReadyRead()) to suspend the calling thread until the
operation has completed.
diff --git a/examples/doc/terminal.qdoc b/examples/doc/terminal.qdoc
index 09dfeed0..9bbd490c 100644
--- a/examples/doc/terminal.qdoc
+++ b/examples/doc/terminal.qdoc
@@ -44,13 +44,13 @@
\list
- \o \i{The asynchronous (non-blocking) approach.} Operations are scheduled
+ \li \e{The asynchronous (non-blocking) approach.} Operations are scheduled
and performed when the control returns to Qt's event loop. QSerialPort emits
a signal when the operation is finished. For example, QSerialPort::write()
returns immediately. When the data is sent to the serial port, QSerialPort
emits \l{QSerialPort::bytesWritten()}{bytesWritten()}.
- \o \i{The synchronous (blocking) approach.} In non-GUI and multithreaded
+ \li \e{The synchronous (blocking) approach.} In non-GUI and multithreaded
applications, the \c waitFor...() functions can be called (i.e.
QSerialPort::waitReadyRead()) to suspend the calling thread until the
operation has completed.
@@ -65,16 +65,16 @@
\list
- \o \l{examples/terminal/mainwindow.cpp}{MainWindow} - is the main application
+ \li \l{examples/terminal/mainwindow.cpp}{MainWindow} - is the main application
window that contains all the working logic for the serial port programming,
including configuration, I/O processing and so forth, while inheriting the
QMainWindow.
- \o \l{examples/terminal/console.cpp}{Console} - is the central widget of the
+ \li \l{examples/terminal/console.cpp}{Console} - is the central widget of the
main window, displaying the transmitted or received data. The widget is
derived from the QPlainTextEdit class.
- \o \l{examples/terminal/settingsdialog.cpp}{SettingsDialog} - is a dialog
+ \li \l{examples/terminal/settingsdialog.cpp}{SettingsDialog} - is a dialog
for configuring the serial port, as well as for displaying the available
serial ports and information about them.
@@ -97,7 +97,7 @@
\dots
\snippet examples/terminal/mainwindow.cpp 3
- Clicking on the \bold{Connect} button invokes the \c openSerialPort() slot:
+ Clicking on the \b{Connect} button invokes the \c openSerialPort() slot:
\snippet examples/terminal/mainwindow.cpp 4
@@ -110,7 +110,7 @@
\l{examples/terminal/settingsdialog.cpp}{SettingsDialog}, then the terminal
attempts to open the port with the default settings: 9600 8N1.
- Clicking on the \bold{Disconnect} button invokes the \c closeSerialPort()
+ Clicking on the \b{Disconnect} button invokes the \c closeSerialPort()
slot:
\snippet examples/terminal/mainwindow.cpp 5
@@ -133,7 +133,7 @@
This slot reads the data from the serial port and displays that in the
\l{examples/terminal/console.cpp}{Console} widget.
- Clicking on the \bold{Configure} button invokes the \c show() slot which
+ Clicking on the \b{Configure} button invokes the \c show() slot which
belongs to the \l{examples/terminal/settingsdialog.cpp}{SettingsDialog}
widget.
diff --git a/examples/examples.qdoc b/examples/examples.qdoc
index 9054ee33..53cc35dc 100644
--- a/examples/examples.qdoc
+++ b/examples/examples.qdoc
@@ -34,10 +34,10 @@
\contentspage {Examples} {Contents}
\list
- \o \l doc/blockingmaster
- \o \l doc/blockingslave
- \o \l doc/cenumerator
- \o \l doc/enumerator
- \o \l doc/terminal
+ \li \l doc/blockingmaster
+ \li \l doc/blockingslave
+ \li \l doc/cenumerator
+ \li \l doc/enumerator
+ \li \l doc/terminal
\endlist
*/
diff --git a/src/serialport/doc/src/index.qdoc b/src/serialport/doc/src/index.qdoc
index 0d78be50..f1706e75 100644
--- a/src/serialport/doc/src/index.qdoc
+++ b/src/serialport/doc/src/index.qdoc
@@ -49,10 +49,10 @@
Table of contents:
\list
- \o \l {Introduction}
- \o \l {Get source}
- \o \l {Building and usage}
- \o \l {Examples}
+ \li \l {Introduction}
+ \li \l {Get source}
+ \li \l {Building and usage}
+ \li \l {Examples}
\endlist
\section1 C++ Classes
diff --git a/src/serialport/doc/src/intro.qdoc b/src/serialport/doc/src/intro.qdoc
index a1ccf0f0..d89a3ce6 100644
--- a/src/serialport/doc/src/intro.qdoc
+++ b/src/serialport/doc/src/intro.qdoc
@@ -45,33 +45,33 @@
\table
\header
- \o Platform
- \o Support state
- \o Notes
+ \li Platform
+ \li Support state
+ \li Notes
\row
- \o Windows x86/x64 NT based (2K, XP, Vista, 7, 8)
- \o Complete support (Tier 1).
- \o Support expected for Windows 8, but has not yet been tested.
+ \li Windows x86/x64 NT based (2K, XP, Vista, 7, 8)
+ \li Complete support (Tier 1).
+ \li Support expected for Windows 8, but has not yet been tested.
\row
- \o Windows CE
- \o Partial support (Not Tier 1).
- \o Tested only with platforms 5 and 6 by using the emulator.
+ \li Windows CE
+ \li Partial support (Not Tier 1).
+ \li Tested only with platforms 5 and 6 by using the emulator.
\row
- \o Symbian
- \o Partial support, and only for legacy Qt4 (Not Tier 1).
- \o The implementation is not complete and further support in doubt.
+ \li Symbian
+ \li Partial support, and only for legacy Qt4 (Not Tier 1).
+ \li The implementation is not complete and further support in doubt.
\row
- \o Gnu/Linux
- \o Complete support (Tier 1).
- \o
+ \li Gnu/Linux
+ \li Complete support (Tier 1).
+ \li
\row
- \o Mac OSX
- \o Complete support (Tier 1).
- \o
+ \li Mac OSX
+ \li Complete support (Tier 1).
+ \li
\row
- \o Other *nix
- \o Complete support (Tier 1).
- \o All POSIX-compatible.
+ \li Other *nix
+ \li Complete support (Tier 1).
+ \li All POSIX-compatible.
\endtable
*/
diff --git a/src/serialport/qserialport.cpp b/src/serialport/qserialport.cpp
index 61042910..82652208 100644
--- a/src/serialport/qserialport.cpp
+++ b/src/serialport/qserialport.cpp
@@ -107,15 +107,15 @@ int QSerialPortPrivateData::timeoutValue(int msecs, int elapsed)
listed below:
\list
- \o Provides only common functionality which includes
+ \li Provides only common functionality which includes
configuring, I/O data stream, get and set control signals of the
RS-232 pinouts.
- \o Does not support for terminal features as echo, control CR/LF and so
+ \li Does not support for terminal features as echo, control CR/LF and so
forth.
- \o Always works in binary mode.
- \o Does not support the native ability for configuring timeouts
+ \li Always works in binary mode.
+ \li Does not support the native ability for configuring timeouts
and delays while reading.
- \o Does not provide tracking and notification when the state
+ \li Does not provide tracking and notification when the state
of RS-232 pinout signals is changed.
\endlist
@@ -181,10 +181,10 @@ int QSerialPortPrivateData::timeoutValue(int msecs, int elapsed)
used to implement blocking serial ports:
\list
- \o waitForReadyRead() blocks until new data is available for
+ \li waitForReadyRead() blocks until new data is available for
reading.
- \o waitForBytesWritten() blocks until one payload of data has been
+ \li waitForBytesWritten() blocks until one payload of data has been
written to the serial port.
\endlist
@@ -457,31 +457,31 @@ void QSerialPort::setPort(const QSerialPortInfo &serialPortInfo)
platform specific:
\table
\header
- \o Platform
- \o Brief Description
+ \li Platform
+ \li Brief Description
\row
- \o Windows
- \o Removes the prefix "\\\\.\\" from the system location
+ \li Windows
+ \li Removes the prefix "\\\\.\\" from the system location
and returns the remainder of the string.
\row
- \o Windows CE
- \o Removes the postfix ":" from the system location
+ \li Windows CE
+ \li Removes the postfix ":" from the system location
and returns the remainder of the string.
\row
- \o Symbian
- \o Returns the system location as it is,
+ \li Symbian
+ \li Returns the system location as it is,
as it is equivalent to the port name.
\row
- \o GNU/Linux
- \o Removes the prefix "/dev/" from the system location
+ \li GNU/Linux
+ \li Removes the prefix "/dev/" from the system location
and returns the remainder of the string.
\row
- \o Mac OSX
- \o Removes the prefix "/dev/cu." and "/dev/tty." from the
+ \li Mac OSX
+ \li Removes the prefix "/dev/cu." and "/dev/tty." from the
system location and returns the remainder of the string.
\row
- \o Other *nix
- \o The same as for GNU/Linux.
+ \li Other *nix
+ \li The same as for GNU/Linux.
\endtable
\sa setPort(), QSerialPortInfo::portName()