diff options
Diffstat (limited to 'src/sql/models')
-rw-r--r-- | src/sql/models/qsqlquerymodel_p.h | 2 | ||||
-rw-r--r-- | src/sql/models/qsqlrelationaltablemodel.h | 4 | ||||
-rw-r--r-- | src/sql/models/qsqltablemodel.cpp | 2 | ||||
-rw-r--r-- | src/sql/models/qsqltablemodel_p.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/sql/models/qsqlquerymodel_p.h b/src/sql/models/qsqlquerymodel_p.h index d5ca2f89cb..64e9aeb3db 100644 --- a/src/sql/models/qsqlquerymodel_p.h +++ b/src/sql/models/qsqlquerymodel_p.h @@ -75,7 +75,7 @@ public: void initColOffsets(int size); int columnInQuery(int modelColumn) const; - mutable QSqlQuery query = { QSqlQuery(0) }; + mutable QSqlQuery query = { QSqlQuery(nullptr) }; mutable QSqlError error; QModelIndex bottom; QSqlRecord rec; diff --git a/src/sql/models/qsqlrelationaltablemodel.h b/src/sql/models/qsqlrelationaltablemodel.h index 555755009c..1929bd320a 100644 --- a/src/sql/models/qsqlrelationaltablemodel.h +++ b/src/sql/models/qsqlrelationaltablemodel.h @@ -58,7 +58,7 @@ public: const QString &displayCol) : tName(aTableName), iColumn(indexCol), dColumn(displayCol) {} - void swap(QSqlRelation &other) Q_DECL_NOTHROW + void swap(QSqlRelation &other) noexcept { qSwap(tName, other.tName); qSwap(iColumn, other.iColumn); @@ -71,7 +71,7 @@ public: { return iColumn; } inline QString displayColumn() const { return dColumn; } - bool isValid() const Q_DECL_NOTHROW + bool isValid() const noexcept { return !(tName.isEmpty() || iColumn.isEmpty() || dColumn.isEmpty()); } private: QString tName, iColumn, dColumn; diff --git a/src/sql/models/qsqltablemodel.cpp b/src/sql/models/qsqltablemodel.cpp index 98d6ddf882..4bc9a8c2f8 100644 --- a/src/sql/models/qsqltablemodel.cpp +++ b/src/sql/models/qsqltablemodel.cpp @@ -611,7 +611,7 @@ bool QSqlTableModel::setData(const QModelIndex &index, const QVariant &value, in /*! \reimp */ -bool QStringListModel::clearItemData(const QModelIndex &index) +bool QSqlTableModel::clearItemData(const QModelIndex &index) { return setData(index, QVariant(), Qt::EditRole); } diff --git a/src/sql/models/qsqltablemodel_p.h b/src/sql/models/qsqltablemodel_p.h index bb568ab444..9ac34e7259 100644 --- a/src/sql/models/qsqltablemodel_p.h +++ b/src/sql/models/qsqltablemodel_p.h @@ -93,7 +93,7 @@ public: QSqlTableModel::EditStrategy strategy; bool busyInsertingRows; - QSqlQuery editQuery = { QSqlQuery(0) }; + QSqlQuery editQuery = { QSqlQuery(nullptr) }; QSqlIndex primaryIndex; QString tableName; QString filter; |