Fix a couple of qdoc errors

Change-Id: I79f689e08ed4a496052529af38fca72c3d4e04cb
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index 5fbded4..7321b3b 100644 (file)
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -3121,7 +3121,7 @@ bool QInternal::activateCallbacks(Callback cb, void **parameters)
     semantics) or to
     \code
     try { expr; } catch(...) { qTerminate(); }
-    \endocde
+    \endcode
     otherwise.
 
     Since this macro expands to just \c expr if the compiler supports

diff --git a/src/corelib/io/qdebug.cpp b/src/corelib/io/qdebug.cpp
index 07f3596..9cd1705 100644 (file)
--- a/src/corelib/io/qdebug.cpp
+++ b/src/corelib/io/qdebug.cpp
@@ -162,7 +162,7 @@
 */
 
 /*!
-    \fn bool QDebug::autoInsertSpaces()
+    \fn bool QDebug::autoInsertSpaces() const
 
     Returns true if this QDebug instance will automatically insert spaces
     between writes.

diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp
index 45d3924..5fd3dcf 100644 (file)
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
@@ -2984,7 +2984,7 @@ QString QUrl::errorString() const
     \internal
 */
 
-/*! \fn uint qHash(const QUrl &url, uint seed = 0)
+/*!
     \relates QHash
     \since 5.0
 

diff --git a/src/corelib/io/qurlidna.cpp b/src/corelib/io/qurlidna.cpp
index 21ad1b7..eb7ba6d 100644 (file)
--- a/src/corelib/io/qurlidna.cpp
+++ b/src/corelib/io/qurlidna.cpp
@@ -2574,7 +2574,7 @@ QStringList QUrl::idnWhitelist()
     Sets the whitelist of Top-Level Domains (TLDs) that are allowed to have
     non-ASCII characters in domains to the value of \a list.
 
-    Note that if you call this function, you need to do so \em before
+    Note that if you call this function, you need to do so \e before
     you start any threads that might access idnWhitelist().
 
     Qt has comes a default list that contains the Internet top-level domains

diff --git a/src/corelib/itemmodels/qabstractitemmodel.cpp b/src/corelib/itemmodels/qabstractitemmodel.cpp
index 87bcb6d..9a63038 100644 (file)
--- a/src/corelib/itemmodels/qabstractitemmodel.cpp
+++ b/src/corelib/itemmodels/qabstractitemmodel.cpp
@@ -926,19 +926,6 @@ void QAbstractItemModelPrivate::columnsRemoved(const QModelIndex &parent,
 */
 
 /*!
-    \fn QModelIndex::QModelIndex(const QModelIndex &other)
-
-    Creates a new model index that is a copy of the \a other model
-    index.
-*/
-
-/*!
-    \fn QModelIndex::~QModelIndex()
-
-    Destroys the model index.
-*/
-
-/*!
     \fn int QModelIndex::row() const
 
     Returns the row this model index refers to.

diff --git a/src/corelib/kernel/qtranslator.cpp b/src/corelib/kernel/qtranslator.cpp
index e8c913e..045c792 100644 (file)
--- a/src/corelib/kernel/qtranslator.cpp
+++ b/src/corelib/kernel/qtranslator.cpp
@@ -731,7 +731,6 @@ bool QTranslator::load(const QLocale & locale,
 
 /*!
   \overload load()
-  \fn bool QTranslator::load(const uchar *data, int len)
 
   Loads the QM file data \a data of length \a len into the
   translator.

diff --git a/src/corelib/tools/qchar.cpp b/src/corelib/tools/qchar.cpp
index 7461c46..04f6034 100644 (file)
--- a/src/corelib/tools/qchar.cpp
+++ b/src/corelib/tools/qchar.cpp
@@ -783,7 +783,7 @@ bool QT_FASTCALL QChar::isLetterOrNumber_helper(uint ucs4)
 */
 
 /*!
-    \fn static bool isNonCharacter(uint ucs4)
+    \fn static bool QChar::isNonCharacter(uint ucs4)
     \overload
     \since 5.0
 

diff --git a/src/corelib/tools/qcollator.cpp b/src/corelib/tools/qcollator.cpp
index a7a684a..8190677 100644 (file)
--- a/src/corelib/tools/qcollator.cpp
+++ b/src/corelib/tools/qcollator.cpp
@@ -139,7 +139,7 @@ static const char * const collationStrings[collationStringsCount] = {
     specified the default collation algorithm for the locale is being used. If
     \a locale is not specified QLocale::default() is being used.
 
-    \sa setLocale setCollation setOptions
+    \sa setLocale, setCollation, setOptions
  */
 QCollator::QCollator(const QLocale &locale, QCollator::Collation collation)
     : d(new QCollatorPrivate)
@@ -243,7 +243,7 @@ QLocale QCollator::locale() const
 }
 
 /*!
-    \enum QCollator::collation
+    \enum QCollator::Collation
 
     This enum can be used to specify an alternate collation algorithm to be used instead
     of the default algorithm for the locale.
@@ -252,7 +252,6 @@ QLocale QCollator::locale() const
 
     \value Default Use the default algorithm for the locale
     \value Big5Han
-    \value Dictionary
     \value Direct
     \value GB2312Han
     \value PhoneBook