diff options
author | Laszlo Papp <lpapp@kde.org> | 2013-02-27 21:58:03 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-28 08:42:03 +0100 |
commit | 6962b6cc448ca0943a9ecc9775ba350aab2c9793 (patch) | |
tree | bf6889311b106f2e32f6bd38927e2874dcacb6ec /examples | |
parent | e3191366fe3b44c486894ab894b1c23335942348 (diff) | |
download | qtserialport-6962b6cc448ca0943a9ecc9775ba350aab2c9793.tar.gz |
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>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/doc/blockingmaster.qdoc | 4 | ||||
-rw-r--r-- | examples/doc/blockingslave.qdoc | 4 | ||||
-rw-r--r-- | examples/doc/terminal.qdoc | 16 | ||||
-rw-r--r-- | examples/examples.qdoc | 10 |
4 files changed, 17 insertions, 17 deletions
diff --git a/examples/doc/blockingmaster.qdoc b/examples/doc/blockingmaster.qdoc index 9ea5282..b0ddb1c 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 489030f..9c676c6 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 09dfeed..9bbd490 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 9054ee3..53cc35d 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 */ |