diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-04-04 16:46:41 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-04-04 18:01:38 +0000 |
| commit | 8d7c97d428cdf89c3419a4e13b62a9849feefce9 (patch) | |
| tree | 4b0b3f833f8654dc66975d126eb73cf22d4510a6 /src/sql | |
| parent | b6cf8cb794ae6e0f0f8c1c45e9f4c8d3910ff082 (diff) | |
Remove remaining Q_DECL_NOEXCEPT/Q_DECL_NOTHROW usage
Change-Id: I91ac9e714a465cab226b211812aa46e8fe5ff2ab
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/sql')
| -rw-r--r-- | src/sql/kernel/qsqlerror.h | 6 | ||||
| -rw-r--r-- | src/sql/models/qsqlrelationaltablemodel.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/sql/kernel/qsqlerror.h b/src/sql/kernel/qsqlerror.h index 6dac47a7fe..7dfb6eb9ec 100644 --- a/src/sql/kernel/qsqlerror.h +++ b/src/sql/kernel/qsqlerror.h @@ -66,15 +66,15 @@ public: ErrorType type = NoError, const QString &errorCode = QString()); QSqlError(const QSqlError& other); - QSqlError(QSqlError &&other) Q_DECL_NOTHROW : d(other.d) { other.d = nullptr; } + QSqlError(QSqlError &&other) noexcept : d(other.d) { other.d = nullptr; } QSqlError& operator=(const QSqlError& other); - QSqlError &operator=(QSqlError &&other) Q_DECL_NOTHROW { swap(other); return *this; } + QSqlError &operator=(QSqlError &&other) noexcept { swap(other); return *this; } bool operator==(const QSqlError& other) const; bool operator!=(const QSqlError& other) const; ~QSqlError(); - void swap(QSqlError &other) Q_DECL_NOTHROW { qSwap(d, other.d); } + void swap(QSqlError &other) noexcept { qSwap(d, other.d); } QString driverText() const; QString databaseText() const; 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; |