diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2015-01-19 21:10:49 +0100 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2015-01-21 11:22:50 +0100 |
commit | b9365aed6a6699e4ae1c1638217565a18ebf6de6 (patch) | |
tree | 93713cfec0ab4e0bf7807661ba10aa30c50b59f4 /src/corelib | |
parent | 9fab24f8779fbfc1ab03483d41f41070b3fe9c32 (diff) | |
download | qtbase-b9365aed6a6699e4ae1c1638217565a18ebf6de6.tar.gz |
QtCore: add some more Q_DECL_NOTHROW
QtCore now builds with no -Wnoexcept warnings
(that doesn't mean there aren't tons of functions
that should be marked noexcept, just that all
conditionally noexcept functions aren't noexcept(false)
just because of a forgotten noexcept elsewhere).
Change-Id: I10dacb6b9c9d41d3595fe2f306356d62d3d91c76
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/kernel/qvariant.h | 4 | ||||
-rw-r--r-- | src/corelib/tools/qbytearray.cpp | 2 | ||||
-rw-r--r-- | src/corelib/tools/qbytearray.h | 10 | ||||
-rw-r--r-- | src/corelib/tools/qstring.cpp | 2 | ||||
-rw-r--r-- | src/corelib/tools/qstring.h | 6 |
5 files changed, 11 insertions, 13 deletions
diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h index c33ac834c0..3701144438 100644 --- a/src/corelib/kernel/qvariant.h +++ b/src/corelib/kernel/qvariant.h @@ -189,7 +189,7 @@ class Q_CORE_EXPORT QVariant LastType = 0xffffffff // need this so that gcc >= 3.4 allocates 32 bits for Type }; - inline QVariant(); + QVariant() Q_DECL_NOTHROW : d() {} ~QVariant(); QVariant(Type type); QVariant(int typeId, const void *copy); @@ -520,8 +520,6 @@ inline void qVariantSetValue<QVariant>(QVariant &v, const QVariant &t) v = t; } - -inline QVariant::QVariant() {} inline bool QVariant::isValid() const { return d.type != Invalid; } template<typename T> diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp index a683a36f61..f3844cf58d 100644 --- a/src/corelib/tools/qbytearray.cpp +++ b/src/corelib/tools/qbytearray.cpp @@ -985,7 +985,7 @@ static inline char qToLower(char c) Assigns \a other to this byte array and returns a reference to this byte array. */ -QByteArray &QByteArray::operator=(const QByteArray & other) +QByteArray &QByteArray::operator=(const QByteArray & other) Q_DECL_NOTHROW { other.d->ref.ref(); if (!d->ref.deref()) diff --git a/src/corelib/tools/qbytearray.h b/src/corelib/tools/qbytearray.h index a549585400..0daf2535bc 100644 --- a/src/corelib/tools/qbytearray.h +++ b/src/corelib/tools/qbytearray.h @@ -185,14 +185,14 @@ public: }; Q_DECLARE_FLAGS(Base64Options, Base64Option) - inline QByteArray(); + inline QByteArray() Q_DECL_NOTHROW; QByteArray(const char *, int size = -1); QByteArray(int size, char c); QByteArray(int size, Qt::Initialization); - inline QByteArray(const QByteArray &); + inline QByteArray(const QByteArray &) Q_DECL_NOTHROW; inline ~QByteArray(); - QByteArray &operator=(const QByteArray &); + QByteArray &operator=(const QByteArray &) Q_DECL_NOTHROW; QByteArray &operator=(const char *str); #ifdef Q_COMPILER_RVALUE_REFS inline QByteArray(QByteArray && other) Q_DECL_NOTHROW : d(other.d) { other.d = Data::sharedNull(); } @@ -466,7 +466,7 @@ public: Q_DECLARE_OPERATORS_FOR_FLAGS(QByteArray::Base64Options) -inline QByteArray::QByteArray(): d(Data::sharedNull()) { } +inline QByteArray::QByteArray() Q_DECL_NOTHROW : d(Data::sharedNull()) { } inline QByteArray::~QByteArray() { if (!d->ref.deref()) Data::deallocate(d); } inline int QByteArray::size() const { return d->size; } @@ -496,7 +496,7 @@ inline void QByteArray::detach() { if (d->ref.isShared() || (d->offset != sizeof(QByteArrayData))) reallocData(uint(d->size) + 1u, d->detachFlags()); } inline bool QByteArray::isDetached() const { return !d->ref.isShared(); } -inline QByteArray::QByteArray(const QByteArray &a) : d(a.d) +inline QByteArray::QByteArray(const QByteArray &a) Q_DECL_NOTHROW : d(a.d) { d->ref.ref(); } inline int QByteArray::capacity() const diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index e830ed36e5..d9eb9c7b5d 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -1734,7 +1734,7 @@ void QString::expand(int i) string. */ -QString &QString::operator=(const QString &other) +QString &QString::operator=(const QString &other) Q_DECL_NOTHROW { other.d->ref.ref(); if (!d->ref.deref()) diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h index 71d10f0663..d20d08bc0c 100644 --- a/src/corelib/tools/qstring.h +++ b/src/corelib/tools/qstring.h @@ -215,10 +215,10 @@ public: QString(QChar c); QString(int size, QChar c); inline QString(QLatin1String latin1); - inline QString(const QString &); + inline QString(const QString &) Q_DECL_NOTHROW; inline ~QString(); QString &operator=(QChar c); - QString &operator=(const QString &); + QString &operator=(const QString &) Q_DECL_NOTHROW; inline QString &operator=(QLatin1String latin1); #ifdef Q_COMPILER_RVALUE_REFS inline QString(QString && other) Q_DECL_NOTHROW : d(other.d) { other.d = Data::sharedNull(); } @@ -865,7 +865,7 @@ inline QString &QString::operator=(QLatin1String s) } inline void QString::clear() { if (!isNull()) *this = QString(); } -inline QString::QString(const QString &other) : d(other.d) +inline QString::QString(const QString &other) Q_DECL_NOTHROW : d(other.d) { Q_ASSERT(&other != this); d->ref.ref(); } inline int QString::capacity() const { return d->alloc ? d->alloc - 1 : 0; } |