diff options
author | Olivier Goffart <ogoffart@woboq.com> | 2014-11-16 13:09:01 +0100 |
---|---|---|
committer | Olivier Goffart <ogoffart@woboq.com> | 2014-12-03 09:57:11 +0100 |
commit | 5180f32c5abe01acd65cde68c2c16aedda4028ec (patch) | |
tree | a8ed3b4af80751cdc0442c750f2915bfa9c8af40 /src/sql/models | |
parent | 2e271795e7c460254a27ea617846ff7b598a7b9b (diff) |
Add Q_DECL_OVERRIDE in the src subdirectory
Done automatically with clang-modernize on linux
(But does not add Q_DECL_OVERRIDE to the function that are marked
as inline because it a compilation error with MSVC2010)
Change-Id: I2196ee26e3e6fe20816834ecea5ea389eeab3171
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/sql/models')
-rw-r--r-- | src/sql/models/qsqlquerymodel.h | 18 | ||||
-rw-r--r-- | src/sql/models/qsqlrelationaltablemodel.cpp | 8 | ||||
-rw-r--r-- | src/sql/models/qsqlrelationaltablemodel.h | 22 | ||||
-rw-r--r-- | src/sql/models/qsqltablemodel.h | 26 |
4 files changed, 37 insertions, 37 deletions
diff --git a/src/sql/models/qsqlquerymodel.h b/src/sql/models/qsqlquerymodel.h index 95910513df..93b1303807 100644 --- a/src/sql/models/qsqlquerymodel.h +++ b/src/sql/models/qsqlquerymodel.h @@ -54,19 +54,19 @@ public: explicit QSqlQueryModel(QObject *parent = 0); virtual ~QSqlQueryModel(); - int rowCount(const QModelIndex &parent = QModelIndex()) const; - int columnCount(const QModelIndex &parent = QModelIndex()) const; + int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; QSqlRecord record(int row) const; QSqlRecord record() const; - QVariant data(const QModelIndex &item, int role = Qt::DisplayRole) const; + QVariant data(const QModelIndex &item, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; QVariant headerData(int section, Qt::Orientation orientation, - int role = Qt::DisplayRole) const; + int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; bool setHeaderData(int section, Qt::Orientation orientation, const QVariant &value, - int role = Qt::EditRole); + int role = Qt::EditRole) Q_DECL_OVERRIDE; - bool insertColumns(int column, int count, const QModelIndex &parent = QModelIndex()); - bool removeColumns(int column, int count, const QModelIndex &parent = QModelIndex()); + bool insertColumns(int column, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; + bool removeColumns(int column, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; void setQuery(const QSqlQuery &query); void setQuery(const QString &query, const QSqlDatabase &db = QSqlDatabase()); @@ -76,8 +76,8 @@ public: QSqlError lastError() const; - void fetchMore(const QModelIndex &parent = QModelIndex()); - bool canFetchMore(const QModelIndex &parent = QModelIndex()) const; + void fetchMore(const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; + bool canFetchMore(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; protected: void beginInsertRows(const QModelIndex &parent, int first, int last); diff --git a/src/sql/models/qsqlrelationaltablemodel.cpp b/src/sql/models/qsqlrelationaltablemodel.cpp index 8f89f27cde..c6ef1570c0 100644 --- a/src/sql/models/qsqlrelationaltablemodel.cpp +++ b/src/sql/models/qsqlrelationaltablemodel.cpp @@ -150,7 +150,7 @@ class QRelatedTableModel : public QSqlTableModel { public: QRelatedTableModel(QRelation *rel, QObject *parent = 0, QSqlDatabase db = QSqlDatabase()); - bool select(); + bool select() Q_DECL_OVERRIDE; private: bool firstSelect; QRelation *relation; @@ -262,12 +262,12 @@ public: {} QString fullyQualifiedFieldName(const QString &tableName, const QString &fieldName) const; - int nameToIndex(const QString &name) const; + int nameToIndex(const QString &name) const Q_DECL_OVERRIDE; mutable QVector<QRelation> relations; QSqlRecord baseRec; // the record without relations void clearChanges(); - void clearCache(); - void revertCachedRow(int row); + void clearCache() Q_DECL_OVERRIDE; + void revertCachedRow(int row) Q_DECL_OVERRIDE; void translateFieldNames(QSqlRecord &values) const; QSqlRelationalTableModel::JoinMode joinMode; diff --git a/src/sql/models/qsqlrelationaltablemodel.h b/src/sql/models/qsqlrelationaltablemodel.h index 8a9ab43443..92ddb03c6c 100644 --- a/src/sql/models/qsqlrelationaltablemodel.h +++ b/src/sql/models/qsqlrelationaltablemodel.h @@ -74,27 +74,27 @@ public: QSqlDatabase db = QSqlDatabase()); virtual ~QSqlRelationalTableModel(); - QVariant data(const QModelIndex &item, int role = Qt::DisplayRole) const; - bool setData(const QModelIndex &item, const QVariant &value, int role = Qt::EditRole); - bool removeColumns(int column, int count, const QModelIndex &parent = QModelIndex()); + QVariant data(const QModelIndex &item, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + bool setData(const QModelIndex &item, const QVariant &value, int role = Qt::EditRole) Q_DECL_OVERRIDE; + bool removeColumns(int column, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; - void clear(); - bool select(); + void clear() Q_DECL_OVERRIDE; + bool select() Q_DECL_OVERRIDE; - void setTable(const QString &tableName); + void setTable(const QString &tableName) Q_DECL_OVERRIDE; virtual void setRelation(int column, const QSqlRelation &relation); QSqlRelation relation(int column) const; virtual QSqlTableModel *relationModel(int column) const; void setJoinMode( QSqlRelationalTableModel::JoinMode joinMode ); public Q_SLOTS: - void revertRow(int row); + void revertRow(int row) Q_DECL_OVERRIDE; protected: - QString selectStatement() const; - bool updateRowInTable(int row, const QSqlRecord &values); - bool insertRowIntoTable(const QSqlRecord &values); - QString orderByClause() const; + QString selectStatement() const Q_DECL_OVERRIDE; + bool updateRowInTable(int row, const QSqlRecord &values) Q_DECL_OVERRIDE; + bool insertRowIntoTable(const QSqlRecord &values) Q_DECL_OVERRIDE; + QString orderByClause() const Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QSqlRelationalTableModel) diff --git a/src/sql/models/qsqltablemodel.h b/src/sql/models/qsqltablemodel.h index 4263d387ea..98841118f8 100644 --- a/src/sql/models/qsqltablemodel.h +++ b/src/sql/models/qsqltablemodel.h @@ -59,19 +59,19 @@ public: virtual void setTable(const QString &tableName); QString tableName() const; - Qt::ItemFlags flags(const QModelIndex &index) const; + Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; QSqlRecord record() const; QSqlRecord record(int row) const; - QVariant data(const QModelIndex &idx, int role = Qt::DisplayRole) const; - bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); + QVariant data(const QModelIndex &idx, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) Q_DECL_OVERRIDE; - QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; bool isDirty() const; bool isDirty(const QModelIndex &index) const; - void clear(); + void clear() Q_DECL_OVERRIDE; virtual void setEditStrategy(EditStrategy strategy); EditStrategy editStrategy() const; @@ -80,17 +80,17 @@ public: QSqlDatabase database() const; int fieldIndex(const QString &fieldName) const; - void sort(int column, Qt::SortOrder order); + void sort(int column, Qt::SortOrder order) Q_DECL_OVERRIDE; virtual void setSort(int column, Qt::SortOrder order); QString filter() const; virtual void setFilter(const QString &filter); - int rowCount(const QModelIndex &parent = QModelIndex()) const; + int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - bool removeColumns(int column, int count, const QModelIndex &parent = QModelIndex()); - bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()); - bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()); + bool removeColumns(int column, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; + bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; + bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; bool insertRecord(int row, const QSqlRecord &record); bool setRecord(int row, const QSqlRecord &record); @@ -101,8 +101,8 @@ public Q_SLOTS: virtual bool select(); virtual bool selectRow(int row); - bool submit(); - void revert(); + bool submit() Q_DECL_OVERRIDE; + void revert() Q_DECL_OVERRIDE; bool submitAll(); void revertAll(); @@ -125,7 +125,7 @@ protected: void setPrimaryKey(const QSqlIndex &key); void setQuery(const QSqlQuery &query); - QModelIndex indexInQuery(const QModelIndex &item) const; + QModelIndex indexInQuery(const QModelIndex &item) const Q_DECL_OVERRIDE; QSqlRecord primaryValues(int row) const; }; |