AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Doc: Fix QSqlField documentation for deprecated constructor

Browse Source 
Also, merge constructor overloads, and remove superfluous explicit from
a non-converting constructor.

Change-Id: I60d0e646d1aaeb8ea66b7598076c3e3ba356c12e
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
This commit is contained in:
Volker Hilsheimer 2020-09-22 16:39:11 +02:00
parent 55f4a4e6f0
commit 2692cb0e61
2 changed files with 4 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/sql/kernel/qsqlfield.cpp
View File

@ -154,17 +154,9 @@ public:
\sa requiredStatus()
*/
/*!
\fn QSqlField::QSqlField(const QString &fieldName, QVariant::Type type)
Constructs an empty field called \a fieldName of variant type \a type.
\sa setRequiredStatus(), setLength(), setPrecision(), setDefaultValue(),
setGenerated(), setReadOnly()
*/
/*!
\fn QSqlField::QSqlField(const QString &fieldName, QVariant::Type type, const QString &table)
\obsolete Use the constructor using a QMetaType instead
\overload
Constructs an empty field called \a fieldName of variant type \a
@ -175,21 +167,7 @@ public:
*/
/*!
\fn QSqlField::QSqlField(const QString &fieldName, QVariant::Type type)
Constructs an empty field called \a fieldName of type \a type.
\sa setRequiredStatus(), setLength(), setPrecision(), setDefaultValue(),
setGenerated(), setReadOnly()
*/
QSqlField::QSqlField(const QString &fieldName, QMetaType type)
{
d = new QSqlFieldPrivate(fieldName, type, QString());
val = QVariant(QMetaType(type), nullptr);
}
/*!
\fn QSqlField::QSqlField(const QString &fieldName, QVariant::Type type, const QString &table)
\since 6.0
\overload
Constructs an empty field called \a fieldName of type \a

9
src/sql/kernel/qsqlfield.h
View File

@ -56,17 +56,12 @@ public:
#if QT_DEPRECATED_SINCE(6,0)
QT_DEPRECATED_VERSION_X_6_0("Use the constructor using a QMetaType instead")
explicit QSqlField(const QString& fieldName, QVariant::Type type)
: QSqlField(fieldName, QMetaType(type))
{}
QT_DEPRECATED_VERSION_X_6_0("Use the constructor using a QMetaType instead")
QSqlField(const QString &fieldName, QVariant::Type type, const QString &tableName)
QSqlField(const QString& fieldName, QVariant::Type type, const QString &tableName = QString())
: QSqlField(fieldName, QMetaType(type), tableName)
{}
#endif
explicit QSqlField(const QString& fieldName = QString(), QMetaType type = QMetaType());
QSqlField(const QString &fieldName, QMetaType type, const QString &tableName);
explicit QSqlField(const QString& fieldName = QString(), QMetaType type = QMetaType(), const QString &tableName = QString());
QSqlField(const QSqlField& other);
QSqlField& operator=(const QSqlField& other);