1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SQL: Code cleanup - move Q_PROPERTY to the correct place

Browse Source 
... which is directly after Q_OBJECT/Q_GADGET

Change-Id: I3fb2b2e810a68e0ae811e55b286bc5f40364295f
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 031eabe845c41ef98cb078d0fae0521156a75b9e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Christian Ehrlicher 2024-06-11 20:39:47 +02:00 committed by Qt Cherry-pick Bot
parent 59b4abd730
commit b34fa2f61f
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/sql/kernel/qsqldatabase.h
View File

@ -37,9 +37,10 @@ public:
class Q_SQL_EXPORT QSqlDatabase
{
Q_GADGET
public:
Q_PROPERTY(QSql::NumericalPrecisionPolicy numericalPrecisionPolicy READ numericalPrecisionPolicy WRITE setNumericalPrecisionPolicy)
public:
QSqlDatabase();
QSqlDatabase(const QSqlDatabase &other);
~QSqlDatabase();

3
src/sql/kernel/qsqldriver.h
View File

@ -27,6 +27,7 @@ class Q_SQL_EXPORT QSqlDriver : public QObject
friend class QSqlDatabase;
friend class QSqlResultPrivate;
Q_OBJECT
Q_PROPERTY(QSql::NumericalPrecisionPolicy numericalPrecisionPolicy READ numericalPrecisionPolicy WRITE setNumericalPrecisionPolicy)
Q_DECLARE_PRIVATE(QSqlDriver)
public:
@ -55,8 +56,6 @@ public:
MimerSQL,
};
Q_PROPERTY(QSql::NumericalPrecisionPolicy numericalPrecisionPolicy READ numericalPrecisionPolicy WRITE setNumericalPrecisionPolicy)
explicit QSqlDriver(QObject *parent = nullptr);
~QSqlDriver();
virtual bool isOpen() const;

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

@ -18,9 +18,6 @@ QT_DECLARE_QESDP_SPECIALIZATION_DTOR_WITH_EXPORT(QSqlFieldPrivate, Q_SQL_EXPORT)
class Q_SQL_EXPORT QSqlField
{
Q_GADGET
public:
enum RequiredStatus { Unknown = -1, Optional = 0, Required = 1 };
Q_PROPERTY(QVariant value READ value WRITE setValue)
Q_PROPERTY(QVariant defaultValue READ defaultValue WRITE setDefaultValue)
Q_PROPERTY(QString name READ name WRITE setName)
@ -33,6 +30,9 @@ public:
Q_PROPERTY(int length READ length WRITE setLength)
Q_PROPERTY(int precision READ precision WRITE setPrecision)
public:
enum RequiredStatus { Unknown = -1, Optional = 0, Required = 1 };
explicit QSqlField(const QString& fieldName = QString(), QMetaType type = QMetaType(), const QString &tableName = QString());
QSqlField(const QSqlField& other);

2
src/sql/kernel/qsqlindex.h
View File

@ -17,10 +17,10 @@ QT_BEGIN_NAMESPACE
class Q_SQL_EXPORT QSqlIndex : public QSqlRecord
{
Q_GADGET
public:
Q_PROPERTY(QString name READ name WRITE setName)
Q_PROPERTY(QString cursorName READ cursorName WRITE setCursorName)
public:
explicit QSqlIndex(const QString &cursorName = QString(), const QString &name = QString());
QSqlIndex(const QSqlIndex &other);
QSqlIndex(QSqlIndex &&other) noexcept = default;

2
src/sql/kernel/qsqlquery.h
View File

@ -23,11 +23,11 @@ class QSqlQueryPrivate;
class Q_SQL_EXPORT QSqlQuery
{
Q_GADGET
public:
Q_PROPERTY(bool forwardOnly READ isForwardOnly WRITE setForwardOnly)
Q_PROPERTY(bool positionalBindingEnabled READ isPositionalBindingEnabled WRITE setPositionalBindingEnabled)
Q_PROPERTY(QSql::NumericalPrecisionPolicy numericalPrecisionPolicy READ numericalPrecisionPolicy WRITE setNumericalPrecisionPolicy)
public:
explicit QSqlQuery(QSqlResult *r);
explicit QSqlQuery(const QString& query = QString(), const QSqlDatabase &db = QSqlDatabase());
explicit QSqlQuery(const QSqlDatabase &db);