diff options
Diffstat (limited to 'src/sql/kernel')
-rw-r--r-- | src/sql/kernel/qsqlcachedresult_p.h | 20 | ||||
-rw-r--r-- | src/sql/kernel/qsqldatabase.h | 2 | ||||
-rw-r--r-- | src/sql/kernel/qsqlnulldriver_p.h | 52 |
3 files changed, 37 insertions, 37 deletions
diff --git a/src/sql/kernel/qsqlcachedresult_p.h b/src/sql/kernel/qsqlcachedresult_p.h index 9bcfd49f1a..543a902554 100644 --- a/src/sql/kernel/qsqlcachedresult_p.h +++ b/src/sql/kernel/qsqlcachedresult_p.h @@ -78,20 +78,20 @@ protected: virtual bool gotoNext(ValueCache &values, int index) = 0; - QVariant data(int i) Q_DECL_OVERRIDE; - bool isNull(int i) Q_DECL_OVERRIDE; - bool fetch(int i) Q_DECL_OVERRIDE; - bool fetchNext() Q_DECL_OVERRIDE; - bool fetchPrevious() Q_DECL_OVERRIDE; - bool fetchFirst() Q_DECL_OVERRIDE; - bool fetchLast() Q_DECL_OVERRIDE; + QVariant data(int i) override; + bool isNull(int i) override; + bool fetch(int i) override; + bool fetchNext() override; + bool fetchPrevious() override; + bool fetchFirst() override; + bool fetchLast() override; int colCount() const; ValueCache &cache(); - void virtual_hook(int id, void *data) Q_DECL_OVERRIDE; - void detachFromResultSet() Q_DECL_OVERRIDE; - void setNumericalPrecisionPolicy(QSql::NumericalPrecisionPolicy policy) Q_DECL_OVERRIDE; + void virtual_hook(int id, void *data) override; + void detachFromResultSet() override; + void setNumericalPrecisionPolicy(QSql::NumericalPrecisionPolicy policy) override; private: bool cacheNext(); }; diff --git a/src/sql/kernel/qsqldatabase.h b/src/sql/kernel/qsqldatabase.h index 0b4aca8cdd..684b9c04a1 100644 --- a/src/sql/kernel/qsqldatabase.h +++ b/src/sql/kernel/qsqldatabase.h @@ -64,7 +64,7 @@ template <class T> class QSqlDriverCreator : public QSqlDriverCreatorBase { public: - QSqlDriver *createObject() const Q_DECL_OVERRIDE { return new T; } + QSqlDriver *createObject() const override { return new T; } }; class Q_SQL_EXPORT QSqlDatabase diff --git a/src/sql/kernel/qsqlnulldriver_p.h b/src/sql/kernel/qsqlnulldriver_p.h index 92d8d30485..7a40199d71 100644 --- a/src/sql/kernel/qsqlnulldriver_p.h +++ b/src/sql/kernel/qsqlnulldriver_p.h @@ -66,27 +66,27 @@ public: { QSqlResult::setLastError( QSqlError(QLatin1String("Driver not loaded"), QLatin1String("Driver not loaded"), QSqlError::ConnectionError)); } protected: - inline QVariant data(int) Q_DECL_OVERRIDE { return QVariant(); } - inline bool reset (const QString&) Q_DECL_OVERRIDE { return false; } - inline bool fetch(int) Q_DECL_OVERRIDE { return false; } - inline bool fetchFirst() Q_DECL_OVERRIDE { return false; } - inline bool fetchLast() Q_DECL_OVERRIDE { return false; } - inline bool isNull(int) Q_DECL_OVERRIDE { return false; } - inline int size() Q_DECL_OVERRIDE { return -1; } - inline int numRowsAffected() Q_DECL_OVERRIDE { return 0; } + inline QVariant data(int) override { return QVariant(); } + inline bool reset (const QString&) override { return false; } + inline bool fetch(int) override { return false; } + inline bool fetchFirst() override { return false; } + inline bool fetchLast() override { return false; } + inline bool isNull(int) override { return false; } + inline int size() override { return -1; } + inline int numRowsAffected() override { return 0; } - inline void setAt(int) Q_DECL_OVERRIDE {} - inline void setActive(bool) Q_DECL_OVERRIDE {} - inline void setLastError(const QSqlError&) Q_DECL_OVERRIDE {} - inline void setQuery(const QString&) Q_DECL_OVERRIDE {} - inline void setSelect(bool) Q_DECL_OVERRIDE {} - inline void setForwardOnly(bool) Q_DECL_OVERRIDE {} + inline void setAt(int) override {} + inline void setActive(bool) override {} + inline void setLastError(const QSqlError&) override {} + inline void setQuery(const QString&) override {} + inline void setSelect(bool) override {} + inline void setForwardOnly(bool) override {} - inline bool exec() Q_DECL_OVERRIDE { return false; } - inline bool prepare(const QString&) Q_DECL_OVERRIDE { return false; } - inline bool savePrepare(const QString&) Q_DECL_OVERRIDE { return false; } - inline void bindValue(int, const QVariant&, QSql::ParamType) Q_DECL_OVERRIDE {} - inline void bindValue(const QString&, const QVariant&, QSql::ParamType) Q_DECL_OVERRIDE {} + inline bool exec() override { return false; } + inline bool prepare(const QString&) override { return false; } + inline bool savePrepare(const QString&) override { return false; } + inline void bindValue(int, const QVariant&, QSql::ParamType) override {} + inline void bindValue(const QString&, const QVariant&, QSql::ParamType) override {} }; class QSqlNullDriver : public QSqlDriver @@ -95,16 +95,16 @@ public: inline QSqlNullDriver(): QSqlDriver() { QSqlDriver::setLastError( QSqlError(QLatin1String("Driver not loaded"), QLatin1String("Driver not loaded"), QSqlError::ConnectionError)); } - inline bool hasFeature(DriverFeature) const Q_DECL_OVERRIDE { return false; } - inline bool open(const QString &, const QString &, const QString &, const QString &, int, const QString&) Q_DECL_OVERRIDE + inline bool hasFeature(DriverFeature) const override { return false; } + inline bool open(const QString &, const QString &, const QString &, const QString &, int, const QString&) override { return false; } - inline void close() Q_DECL_OVERRIDE {} - inline QSqlResult *createResult() const Q_DECL_OVERRIDE { return new QSqlNullResult(this); } + inline void close() override {} + inline QSqlResult *createResult() const override { return new QSqlNullResult(this); } protected: - inline void setOpen(bool) Q_DECL_OVERRIDE {} - inline void setOpenError(bool) Q_DECL_OVERRIDE {} - inline void setLastError(const QSqlError&) Q_DECL_OVERRIDE {} + inline void setOpen(bool) override {} + inline void setOpenError(bool) override {} + inline void setLastError(const QSqlError&) override {} }; QT_END_NAMESPACE |