Replace Q_DECL_OVERRIDE with override where possible

Remaining uses of Q_DECL_OVERRIDE are in:

src/corelib/global/qcompilerdetection.h
src/corelib/global/qglobal.cpp
doc/global/qt-cpp-defines.qdocconf
  (definition and documentation of Q_DECL_OVERRIDE)
tests/manual/qcursor/qcursorhighdpi/main.cpp
  (a test executable compilable both under Qt4 and Qt5)

Change-Id: Ib9b05d829add69e98a86238274b6a1fcb19b49ba
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>

1 files changed, 17 insertions, 17 deletions

diff --git a/src/plugins/sqldrivers/psql/qsql_psql_p.h b/src/plugins/sqldrivers/psql/qsql_psql_p.h
index 8468b9af93..3ff38f3c48 100644
--- a/src/plugins/sqldrivers/psql/qsql_psql_p.h
+++ b/src/plugins/sqldrivers/psql/qsql_psql_p.h
@@ -90,34 +90,34 @@ public:
     explicit QPSQLDriver(QObject *parent=0);
     explicit QPSQLDriver(PGconn *conn, QObject *parent=0);
     ~QPSQLDriver();
-    bool hasFeature(DriverFeature f) const Q_DECL_OVERRIDE;
+    bool hasFeature(DriverFeature f) const override;
     bool open(const QString & db,
               const QString & user,
               const QString & password,
               const QString & host,
               int port,
-              const QString& connOpts) Q_DECL_OVERRIDE;
-    bool isOpen() const Q_DECL_OVERRIDE;
-    void close() Q_DECL_OVERRIDE;
-    QSqlResult *createResult() const Q_DECL_OVERRIDE;
-    QStringList tables(QSql::TableType) const Q_DECL_OVERRIDE;
-    QSqlIndex primaryIndex(const QString& tablename) const Q_DECL_OVERRIDE;
-    QSqlRecord record(const QString& tablename) const Q_DECL_OVERRIDE;
+              const QString& connOpts) override;
+    bool isOpen() const override;
+    void close() override;
+    QSqlResult *createResult() const override;
+    QStringList tables(QSql::TableType) const override;
+    QSqlIndex primaryIndex(const QString& tablename) const override;
+    QSqlRecord record(const QString& tablename) const override;
 
     Protocol protocol() const;
-    QVariant handle() const Q_DECL_OVERRIDE;
+    QVariant handle() const override;
 
-    QString escapeIdentifier(const QString &identifier, IdentifierType type) const Q_DECL_OVERRIDE;
-    QString formatValue(const QSqlField &field, bool trimStrings) const Q_DECL_OVERRIDE;
+    QString escapeIdentifier(const QString &identifier, IdentifierType type) const override;
+    QString formatValue(const QSqlField &field, bool trimStrings) const override;
 
-    bool subscribeToNotification(const QString &name) Q_DECL_OVERRIDE;
-    bool unsubscribeFromNotification(const QString &name) Q_DECL_OVERRIDE;
-    QStringList subscribedToNotifications() const Q_DECL_OVERRIDE;
+    bool subscribeToNotification(const QString &name) override;
+    bool unsubscribeFromNotification(const QString &name) override;
+    QStringList subscribedToNotifications() const override;
 
 protected:
-    bool beginTransaction() Q_DECL_OVERRIDE;
-    bool commitTransaction() Q_DECL_OVERRIDE;
-    bool rollbackTransaction() Q_DECL_OVERRIDE;
+    bool beginTransaction() override;
+    bool commitTransaction() override;
+    bool rollbackTransaction() override;
 
 private Q_SLOTS:
     void _q_handleNotification(int);