Doc: Fix links to deprecated functions

Change-Id: I1a8ae38121b3a9880ac67f80133df3c15b9951c9
Reviewed-by: Volker Hilsheimer <[email protected]>

5 files changed, 18 insertions, 18 deletions

diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp
index c434b79738c..3a2dcb4a12d 100644
--- a/src/corelib/kernel/qvariant.cpp
+++ b/src/corelib/kernel/qvariant.cpp
@@ -1459,7 +1459,7 @@ QString QVariant::toString() const
 }
 
 /*!
-    Returns the variant as a QVariantMap if the variant has type() \l
+    Returns the variant as a QVariantMap if the variant has metaType() \l
     QMetaType::QVariantMap. If it doesn't, QVariant will attempt to
     convert the type to a map and then return it. This will succeed for
     any type that has registered a converter to QVariantMap or which was
@@ -1476,7 +1476,7 @@ QVariantMap QVariant::toMap() const
 
 /*!
     Returns the variant as a QHash<QString, QVariant> if the variant
-    has type() \l QMetaType::QVariantHash; otherwise returns an empty map.
+    has metaType() \l QMetaType::QVariantHash; otherwise returns an empty map.
 
     \sa canConvert(), convert()
 */
@@ -1492,7 +1492,7 @@ QVariantHash QVariant::toHash() const
     \l QMetaType::QDate, \l QMetaType::QDateTime, or \l QMetaType::QString;
     otherwise returns an invalid date.
 
-    If the type() is \l QMetaType::QString, an invalid date will be returned if
+    If the metaType() is \l QMetaType::QString, an invalid date will be returned if
     the string cannot be parsed as a Qt::ISODate format date.
 
     \sa canConvert(), convert()
@@ -1509,7 +1509,7 @@ QDate QVariant::toDate() const
     \l QMetaType::QTime, \l QMetaType::QDateTime, or \l QMetaType::QString;
     otherwise returns an invalid time.
 
-    If the type() is \l QMetaType::QString, an invalid time will be returned if
+    If the metaType() is \l QMetaType::QString, an invalid time will be returned if
     the string cannot be parsed as a Qt::ISODate format time.
 
     \sa canConvert(), convert()
@@ -1526,7 +1526,7 @@ QTime QVariant::toTime() const
     \l QMetaType::QDateTime, \l QMetaType::QDate, or \l QMetaType::QString;
     otherwise returns an invalid date/time.
 
-    If the type() is \l QMetaType::QString, an invalid date/time will be
+    If the metaType() is \l QMetaType::QString, an invalid date/time will be
     returned if the string cannot be parsed as a Qt::ISODate format date/time.
 
     \sa canConvert(), convert()
@@ -1746,7 +1746,7 @@ QPersistentModelIndex QVariant::toPersistentModelIndex() const
 /*!
     \since 5.0
 
-    Returns the variant as a QUuid if the variant has type()
+    Returns the variant as a QUuid if the variant has metaType()
     \l QMetaType::QUuid, \l QMetaType::QByteArray or \l QMetaType::QString;
     otherwise returns a default-constructed QUuid.
 
@@ -1914,7 +1914,7 @@ qlonglong QVariant::toLongLong(bool *ok) const
 
 /*!
     Returns the variant as an unsigned long long int if the
-    variant has type() \l QMetaType::ULongLong, \l QMetaType::Bool,
+    variant has metaType() \l QMetaType::ULongLong, \l QMetaType::Bool,
     \l QMetaType::QByteArray, \l QMetaType::QChar, \l QMetaType::Double,
     \l QMetaType::Int, \l QMetaType::LongLong, \l QMetaType::QString, or
     \l QMetaType::UInt; otherwise returns 0.
@@ -2136,7 +2136,7 @@ bool QVariant::view(int type, void *ptr)
 
     Returns \c true if \a lhs and \a rhs are equal; otherwise returns \c false.
 
-    QVariant uses the equality operator of the type() contained to check for
+    QVariant uses the equality operator of the metaType() contained to check for
     equality.
 
     Variants of different types will always compare as not equal with a few
@@ -2162,7 +2162,7 @@ bool QVariant::view(int type, void *ptr)
 
     Returns \c false if \a lhs and \a rhs are equal; otherwise returns \c true.
 
-    QVariant uses the equality operator of the type() contained to check for
+    QVariant uses the equality operator of the metaType() contained to check for
     equality.
 
     Variants of different types will always compare as not equal with a few
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
index af3ad64689d..34567cbb3db 100644
--- a/src/gui/kernel/qevent.cpp
+++ b/src/gui/kernel/qevent.cpp
@@ -952,7 +952,7 @@ Qt::MouseEventFlags QMouseEvent::flags() const
     Mouse events occur when a mouse cursor is moved into, out of, or within a
     widget, and if the widget has the Qt::WA_Hover attribute.
 
-    The function pos() gives the current cursor position, while oldPos() gives
+    The function position() gives the current cursor position, while oldPos() gives
     the old mouse position.
 
     There are a few similarities between the events QEvent::HoverEnter
@@ -1008,12 +1008,12 @@ Qt::MouseEventFlags QMouseEvent::flags() const
 
     Returns the previous position of the mouse cursor, relative to the widget
     that received the event. If there is no previous position, oldPos() will
-    return the same position as pos().
+    return the same position as position().
 
     On QEvent::HoverEnter events, this position will always be
     QPoint(-1, -1).
 
-    \sa pos()
+    \sa position()
 */
 
 /*!
@@ -1034,12 +1034,12 @@ Qt::MouseEventFlags QMouseEvent::flags() const
 
     Returns the previous position of the mouse cursor, relative to the widget
     that received the event. If there is no previous position, oldPosF() will
-    return the same position as posF().
+    return the same position as position().
 
     On QEvent::HoverEnter events, this position will always be
     QPointF(-1, -1).
 
-    \sa posF()
+    \sa position()
 */
 
 /*!
diff --git a/src/openglwidgets/qopenglwidget.cpp b/src/openglwidgets/qopenglwidget.cpp
index fa8e59bc0cf..cea1498d3ed 100644
--- a/src/openglwidgets/qopenglwidget.cpp
+++ b/src/openglwidgets/qopenglwidget.cpp
@@ -1247,8 +1247,8 @@ QSurfaceFormat QOpenGLWidget::format() const
     been shown and thus it performed initialization.
 
     \note This function will typically have to be used in combination with a
-    QSurfaceFormat::setDefaultFormat() call that sets the color space to
-    QSurfaceFormat::sRGBColorSpace.
+    QSurfaceFormat::setColorSpace() call that sets the color space to
+    QColorSpace::SRgb.
 
     \since 5.10
  */
diff --git a/src/sql/doc/src/sql-driver.qdoc b/src/sql/doc/src/sql-driver.qdoc
index e5258f6899e..8fdf12f12da 100644
--- a/src/sql/doc/src/sql-driver.qdoc
+++ b/src/sql/doc/src/sql-driver.qdoc
@@ -736,7 +736,7 @@
     INTEGER may contain an integer value in one row and a text value in the
     next. This is due to SQLite associating the type of a value with the value
     itself rather than with the column it is stored in. A consequence of this
-    is that the type returned by QSqlField::type() only indicates the field's
+    is that the type returned by QSqlField::metaType() only indicates the field's
     recommended type. No assumption of the actual type should be made from
     this and the type of the individual values should be checked.
 
diff --git a/src/sql/kernel/qsqlfield.cpp b/src/sql/kernel/qsqlfield.cpp
index b625891729a..d15c101e44a 100644
--- a/src/sql/kernel/qsqlfield.cpp
+++ b/src/sql/kernel/qsqlfield.cpp
@@ -79,7 +79,7 @@ QT_DEFINE_QESDP_SPECIALIZATION_DTOR(QSqlFieldPrivate)
     \snippet sqldatabase/sqldatabase.cpp 6
 
     A QSqlField object can provide some meta-data about the field, for
-    example, its name(), variant type(), length(), precision(),
+    example, its name(), variant metaType(), length(), precision(),
     defaultValue(), typeID(), and its requiredStatus(),
     isGenerated() and isReadOnly(). The field's data can be
     checked to see if it isNull(), and its value() retrieved. When