summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@nokia.com>2010-11-01 07:25:03 (GMT)
committerMartin Smith <martin.smith@nokia.com>2010-11-01 07:25:03 (GMT)
commit5fdbfcaa0ebda0b2062d962734546309c6d2247c (patch)
tree0ff2692e1f4ae293cffd4f4bbf878f8280c52966
parent08ab82e447a0cac0a48daf900c57127c2ee534d2 (diff)
downloadQt-5fdbfcaa0ebda0b2062d962734546309c6d2247c.zip
Qt-5fdbfcaa0ebda0b2062d962734546309c6d2247c.tar.gz
Qt-5fdbfcaa0ebda0b2062d962734546309c6d2247c.tar.bz2
doc: Corrections to linking errors detected by the DITA XML generator..
-rw-r--r--doc/src/examples/svgalib.qdoc5
-rw-r--r--doc/src/platforms/emb-accel.qdoc4
-rw-r--r--doc/src/porting/porting4-modifiedvirtual.qdocinc2
-rw-r--r--src/qt3support/network/q3dns.cpp27
4 files changed, 23 insertions, 15 deletions
diff --git a/doc/src/examples/svgalib.qdoc b/doc/src/examples/svgalib.qdoc
index 3e3e4d5..f733058 100644
--- a/doc/src/examples/svgalib.qdoc
+++ b/doc/src/examples/svgalib.qdoc
@@ -322,9 +322,8 @@
\snippet examples/qws/svgalib/svgalibsurface.h 0
We can implement most of the pure virtual functions inherited from
- QWSWindowSurface as trivial inline functions, except the
- \l {QWindowSurface::}{scroll()} function that actually makes use
- of some hardware acceleration:
+ QWSWindowSurface as trivial inline functions, except the scroll()
+ function that actually makes use of some hardware acceleration:
\snippet examples/qws/svgalib/svgalibsurface.cpp 0
diff --git a/doc/src/platforms/emb-accel.qdoc b/doc/src/platforms/emb-accel.qdoc
index c8854f7..77447de 100644
--- a/doc/src/platforms/emb-accel.qdoc
+++ b/doc/src/platforms/emb-accel.qdoc
@@ -117,8 +117,8 @@
\section1 Step 4: Make the Window Surface Aware of Your Paint Device
- Derive from the QWSWindowSurface class and reimplement its \l
- {QWSWindowSurface::}{paintDevice()} function. Make this function
+ Derive from the QWSWindowSurface class and reimplement its
+ paintDevice() function. Make this function
return a pointer to your custom raster paint device.
\section1 Step 5: Enable Creation of an Instance of Your Window Surface
diff --git a/doc/src/porting/porting4-modifiedvirtual.qdocinc b/doc/src/porting/porting4-modifiedvirtual.qdocinc
index 1164238..332543f 100644
--- a/doc/src/porting/porting4-modifiedvirtual.qdocinc
+++ b/doc/src/porting/porting4-modifiedvirtual.qdocinc
@@ -10,7 +10,7 @@
\row \o bool QMacMime::canConvert(const char *, int) \o bool QMacMime::canConvert(const QString &, int)
\row \o QValueList<QByteArray> QMacMime::convertFromMime(QByteArray, const char *, int) \o QList<QByteArray> QMacMime::convertFromMime(QByteArray, const QString &, int)
\row \o QByteArray QMacMime::convertToMime(QValueList<QByteArray> data, const char *, int) \o QByteArray QMacMime::convertToMime(QList<QByteArray> data, const QString &, int)
-\row \o const char * QMacMime::convertorName() \o QString QMacMime::convertorName()
+\row \o const char * QMacMime::convertorName( ) \o QString QMacMime::convertorName( )
\row \o int QMacMime::flavorFor(const char *) \o int QMacMime::flavorFor(const QString &)
\row \o const char * QMacMime::mimeFor(int) \o QString QMacMime::mimeFor(int)
\row \o QMetaObject * QObject::metaObject() const \o const QMetaObject * QObject::metaObject() const
diff --git a/src/qt3support/network/q3dns.cpp b/src/qt3support/network/q3dns.cpp
index e0e9909..cc39566 100644
--- a/src/qt3support/network/q3dns.cpp
+++ b/src/qt3support/network/q3dns.cpp
@@ -2009,15 +2009,20 @@ Q3ValueList<QHostAddress> Q3Dns::addresses() const
\class Q3Dns::MailServer
\brief The Q3Dns::MailServer class is described in Q3Dns::mailServers().
- \internal
+*/
+
+
+/*! \fn Q3Dns::MailServer::MailServer(const QString& n, Q_UINT16 p)
+ The constructor sets the public data members name and priority.
+ \a n is the name and \a p is the priority.
*/
/*!
Returns a list of mail servers if the record type is \c Mx. The
class Q3Dns::MailServer contains the following public variables:
\list
- \i QString Q3Dns::MailServer::name
- \i Q_UINT16 Q3Dns::MailServer::priority
+ \o QString Q3Dns::MailServer::name
+ \o Q_UINT16 Q3Dns::MailServer::priority
\endlist
Note that if you want to iterate over the list, you should iterate
@@ -2048,22 +2053,26 @@ Q3ValueList<Q3Dns::MailServer> Q3Dns::mailServers() const
return result;
}
-
/*!
\class Q3Dns::Server
\brief The Q3Dns::Server class is described in Q3Dns::servers().
- \internal
+*/
+
+/*! \fn Q3Dns::Server::Server(const QString& n, Q_UINT16 p, Q_UINT16 w, Q_UINT16 po)
+ The constructor sets the public data members name, priority,
+ weight, and port. \a n is the name, \a p is the priority,
+ \a w is the weight, and \a po is the port.
*/
/*!
Returns a list of servers if the record type is \c Srv. The class
Q3Dns::Server contains the following public variables:
\list
- \i QString Q3Dns::Server::name
- \i Q_UINT16 Q3Dns::Server::priority
- \i Q_UINT16 Q3Dns::Server::weight
- \i Q_UINT16 Q3Dns::Server::port
+ \o QString Q3Dns::Server::name
+ \o Q_UINT16 Q3Dns::Server::priority
+ \o Q_UINT16 Q3Dns::Server::weight
+ \o Q_UINT16 Q3Dns::Server::port
\endlist
Note that if you want to iterate over the list, you should iterate