diff options
| author | Martin Smith <msmith@trolltech.com> | 2009-06-11 11:58:42 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2009-06-11 12:00:31 (GMT) |
| commit | 5f31403e74c4eaf89a213ce3514fe380d221298b (patch) | |
| tree | 4d6e27088f203a5d665d7613f1949429e4601867 | |
| parent | b93a0c53d4f6c9661f1ba496958a8103847093cd (diff) | |
| download | Qt-5f31403e74c4eaf89a213ce3514fe380d221298b.zip Qt-5f31403e74c4eaf89a213ce3514fe380d221298b.tar.gz Qt-5f31403e74c4eaf89a213ce3514fe380d221298b.tar.bz2 | |
doc: Fixed several qdoc warnings.
| -rw-r--r-- | src/corelib/tools/qcontiguouscache.cpp | 7 | ||||
| -rw-r--r-- | src/corelib/tools/qstringbuilder.cpp | 10 | ||||
| -rw-r--r-- | src/gui/painting/qdrawutil.cpp | 4 | ||||
| -rw-r--r-- | tools/qdoc3/test/qt-cpp-ignore.qdocconf | 3 | ||||
| -rw-r--r-- | tools/qdoc3/test/qt-inc.qdocconf | 3 |
5 files changed, 11 insertions, 16 deletions
diff --git a/src/corelib/tools/qcontiguouscache.cpp b/src/corelib/tools/qcontiguouscache.cpp index 996ac18..fc75cc0 100644 --- a/src/corelib/tools/qcontiguouscache.cpp +++ b/src/corelib/tools/qcontiguouscache.cpp @@ -429,11 +429,4 @@ MyRecord record(int row) const \sa normalizeIndexes(), append(), prepend() */ -/*! \fn void QContiguousCache::dump() const - - \internal - - Sends information about the cache's internal structure to qDebug() -*/ - QT_END_NAMESPACE diff --git a/src/corelib/tools/qstringbuilder.cpp b/src/corelib/tools/qstringbuilder.cpp index 740deb4..366a07b 100644 --- a/src/corelib/tools/qstringbuilder.cpp +++ b/src/corelib/tools/qstringbuilder.cpp @@ -64,17 +64,17 @@ \sa QStringBuilder, QLatin1String, QString, QStringRef */ -/*! \fn QLatin1Literal::QLatin1Literal(const char(&string)[N]) - - Constructs a new literal from the given \a string. -*/ - /*! \fn int QLatin1Literal::size() const Returns the number of characters in the literal \e{excluding} the trailing NULL char. */ +/*! \fn QLatin1Literal::QLatin1Literal(const char(&string)[N]) + + Constructs a new literal from the given \a string. +*/ + /*! \fn char *QLatin1Literal::data() const Returns a pointer to the first character of the string literal. diff --git a/src/gui/painting/qdrawutil.cpp b/src/gui/painting/qdrawutil.cpp index 230d30b..4020593 100644 --- a/src/gui/painting/qdrawutil.cpp +++ b/src/gui/painting/qdrawutil.cpp @@ -1039,7 +1039,7 @@ void qDrawItem(QPainter *p, Qt::GUIStyle gs, #endif /*! - \struct QMargins + \class QMargins \since 4.6 Holds the borders used to split a pixmap into nine segments in order to @@ -1050,7 +1050,7 @@ void qDrawItem(QPainter *p, Qt::GUIStyle gs, */ /*! - \struct QTileRules + \class QTileRules \since 4.6 Holds the rules used to draw a pixmap or image split into nine segments, diff --git a/tools/qdoc3/test/qt-cpp-ignore.qdocconf b/tools/qdoc3/test/qt-cpp-ignore.qdocconf index 107c692..cfb3afd 100644 --- a/tools/qdoc3/test/qt-cpp-ignore.qdocconf +++ b/tools/qdoc3/test/qt-cpp-ignore.qdocconf @@ -65,7 +65,8 @@ Cpp.ignoretokens = QAXFACTORY_EXPORT \ QT_BEGIN_INCLUDE_NAMESPACE \ QT_END_NAMESPACE \ QT_END_INCLUDE_NAMESPACE \ - PHONON_EXPORT + PHONON_EXPORT \ + Q_GADGET Cpp.ignoredirectives = Q_DECLARE_HANDLE \ Q_DECLARE_INTERFACE \ Q_DECLARE_METATYPE \ diff --git a/tools/qdoc3/test/qt-inc.qdocconf b/tools/qdoc3/test/qt-inc.qdocconf index d6cb0e6..01b07b3 100644 --- a/tools/qdoc3/test/qt-inc.qdocconf +++ b/tools/qdoc3/test/qt-inc.qdocconf @@ -99,7 +99,8 @@ Cpp.ignoretokens = QAXFACTORY_EXPORT \ Q_TESTLIB_EXPORT \ Q_TYPENAME \ Q_XML_EXPORT \ - QDBUS_EXPORT + QDBUS_EXPORT \ + Q_GADGET Cpp.ignoredirectives = Q_DECLARE_HANDLE \ Q_DECLARE_INTERFACE \ Q_DECLARE_METATYPE \ |