1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CBOR: Use "noexcept" directly

Browse Source 
All supported compilers support it.

Doing this just for the new API. We should do it throughout Qt, but only
if it won't interfere with the header review.

Change-Id: Id59bdd8f1a804b809e22fffd153f9254688e5152
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Thiago Macieira 2018-07-08 19:28:09 -07:00
parent 503646a331
commit 1016c0af74
8 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/corelib/serialization/qcborarray.cpp
View File

@ -113,7 +113,7 @@ using namespace QtCbor;
/*! /*!
Constructs an empty QCborArray. Constructs an empty QCborArray.
*/ */
QCborArray::QCborArray() Q_DECL_NOTHROW QCborArray::QCborArray() noexcept
: d(nullptr) : d(nullptr)
{ {
} }
@ -121,7 +121,7 @@ QCborArray::QCborArray() Q_DECL_NOTHROW
/*! /*!
Copies the contents of \a other into this object. Copies the contents of \a other into this object.
*/ */
QCborArray::QCborArray(const QCborArray &other) Q_DECL_NOTHROW QCborArray::QCborArray(const QCborArray &other) noexcept
: d(other.d) : d(other.d)
{ {
} }
@ -148,7 +148,7 @@ QCborArray::~QCborArray()
Replaces the contents of this array with that found in \a other, then Replaces the contents of this array with that found in \a other, then
returns a reference to this object. returns a reference to this object.
*/ */
QCborArray &QCborArray::operator=(const QCborArray &other) Q_DECL_NOTHROW QCborArray &QCborArray::operator=(const QCborArray &other) noexcept
{ {
d = other.d; d = other.d;
return *this; return *this;
@ -180,7 +180,7 @@ QCborArray &QCborArray::operator=(const QCborArray &other) Q_DECL_NOTHROW
\sa isEmpty() \sa isEmpty()
*/ */
qsizetype QCborArray::size() const Q_DECL_NOTHROW qsizetype QCborArray::size() const noexcept
{ {
return d ? d->elements.size() : 0; return d ? d->elements.size() : 0;
} }

18
src/corelib/serialization/qcborarray.h
View File

@ -159,9 +159,9 @@ public:
typedef const QCborValue &const_reference; typedef const QCborValue &const_reference;
typedef qsizetype difference_type; typedef qsizetype difference_type;
QCborArray() Q_DECL_NOTHROW; QCborArray() noexcept;
QCborArray(const QCborArray &other) Q_DECL_NOTHROW; QCborArray(const QCborArray &other) noexcept;
QCborArray &operator=(const QCborArray &other) Q_DECL_NOTHROW; QCborArray &operator=(const QCborArray &other) noexcept;
QCborArray(std::initializer_list<QCborValue> args) QCborArray(std::initializer_list<QCborValue> args)
: QCborArray() : QCborArray()
{ {
@ -171,14 +171,14 @@ public:
} }
~QCborArray(); ~QCborArray();
void swap(QCborArray &other) Q_DECL_NOTHROW void swap(QCborArray &other) noexcept
{ {
qSwap(d, other.d); qSwap(d, other.d);
} }
QCborValue toCborValue() const { return *this; } QCborValue toCborValue() const { return *this; }
qsizetype size() const Q_DECL_NOTHROW; qsizetype size() const noexcept;
bool isEmpty() const { return size() == 0; } bool isEmpty() const { return size() == 0; }
QCborValue at(qsizetype i) const; QCborValue at(qsizetype i) const;
@ -205,7 +205,7 @@ public:
bool contains(const QCborValue &value) const; bool contains(const QCborValue &value) const;
int compare(const QCborArray &other) const Q_DECL_NOTHROW Q_DECL_PURE_FUNCTION; int compare(const QCborArray &other) const noexcept Q_DECL_PURE_FUNCTION;
#if QT_HAS_INCLUDE(<compare>) #if QT_HAS_INCLUDE(<compare>)
std::strong_ordering operator<=>(const QCborArray &other) const std::strong_ordering operator<=>(const QCborArray &other) const
{ {
@ -215,9 +215,9 @@ public:
return std::strong_ordering::less; return std::strong_ordering::less;
} }
#else #else
bool operator==(const QCborArray &other) const Q_DECL_NOTHROW bool operator==(const QCborArray &other) const noexcept
{ return compare(other) == 0; } { return compare(other) == 0; }
bool operator!=(const QCborArray &other) const Q_DECL_NOTHROW bool operator!=(const QCborArray &other) const noexcept
{ return !(*this == other); } { return !(*this == other); }
bool operator<(const QCborArray &other) const bool operator<(const QCborArray &other) const
{ return compare(other) < 0; } { return compare(other) < 0; }
@ -261,7 +261,7 @@ private:
void detach(qsizetype reserve = 0); void detach(qsizetype reserve = 0);
friend QCborValue; friend QCborValue;
explicit QCborArray(QCborContainerPrivate &dd) Q_DECL_NOTHROW; explicit QCborArray(QCborContainerPrivate &dd) noexcept;
QExplicitlySharedDataPointer<QCborContainerPrivate> d; QExplicitlySharedDataPointer<QCborContainerPrivate> d;
}; };

8
src/corelib/serialization/qcbormap.cpp
View File

@ -199,7 +199,7 @@ using namespace QtCbor;
\sa isEmpty() \sa isEmpty()
*/ */
QCborMap::QCborMap() Q_DECL_NOTHROW QCborMap::QCborMap() noexcept
: d(nullptr) : d(nullptr)
{ {
} }
@ -207,7 +207,7 @@ QCborMap::QCborMap() Q_DECL_NOTHROW
/*! /*!
Creates a QCborMap object that is a copy of \a other. Creates a QCborMap object that is a copy of \a other.
*/ */
QCborMap::QCborMap(const QCborMap &other) Q_DECL_NOTHROW QCborMap::QCborMap(const QCborMap &other) noexcept
: d(other.d) : d(other.d)
{ {
} }
@ -239,7 +239,7 @@ QCborMap::~QCborMap()
Replaces the contents of this object with a copy of \a other, then returns Replaces the contents of this object with a copy of \a other, then returns
a reference to this object. a reference to this object.
*/ */
QCborMap &QCborMap::operator=(const QCborMap &other) Q_DECL_NOTHROW QCborMap &QCborMap::operator=(const QCborMap &other) noexcept
{ {
d = other.d; d = other.d;
return *this; return *this;
@ -278,7 +278,7 @@ QCborMap &QCborMap::operator=(const QCborMap &other) Q_DECL_NOTHROW
\sa isEmpty() \sa isEmpty()
*/ */
qsizetype QCborMap::size() const Q_DECL_NOTHROW qsizetype QCborMap::size() const noexcept
{ {
return d ? d->elements.size() / 2 : 0; return d ? d->elements.size() / 2 : 0;
} }

18
src/corelib/serialization/qcbormap.h
View File

@ -163,9 +163,9 @@ public:
qsizetype operator-(ConstIterator j) const { return (item.i - j.item.i) / 2; } qsizetype operator-(ConstIterator j) const { return (item.i - j.item.i) / 2; }
}; };
QCborMap() Q_DECL_NOTHROW; QCborMap() noexcept;
QCborMap(const QCborMap &other) Q_DECL_NOTHROW; QCborMap(const QCborMap &other) noexcept;
QCborMap &operator=(const QCborMap &other) Q_DECL_NOTHROW; QCborMap &operator=(const QCborMap &other) noexcept;
QCborMap(std::initializer_list<value_type> args) QCborMap(std::initializer_list<value_type> args)
: QCborMap() : QCborMap()
{ {
@ -175,14 +175,14 @@ public:
} }
~QCborMap(); ~QCborMap();
void swap(QCborMap &other) Q_DECL_NOTHROW void swap(QCborMap &other) noexcept
{ {
qSwap(d, other.d); qSwap(d, other.d);
} }
QCborValue toCborValue() const { return *this; } QCborValue toCborValue() const { return *this; }
qsizetype size() const Q_DECL_NOTHROW Q_DECL_PURE_FUNCTION; qsizetype size() const noexcept Q_DECL_PURE_FUNCTION;
bool isEmpty() const { return size() == 0; } bool isEmpty() const { return size() == 0; }
QVector<QCborValue> keys() const; QVector<QCborValue> keys() const;
@ -232,7 +232,7 @@ public:
bool contains(const QCborValue &key) const bool contains(const QCborValue &key) const
{ const_iterator it = find(key); return it != end(); } { const_iterator it = find(key); return it != end(); }
int compare(const QCborMap &other) const Q_DECL_NOTHROW Q_DECL_PURE_FUNCTION; int compare(const QCborMap &other) const noexcept Q_DECL_PURE_FUNCTION;
#if QT_HAS_INCLUDE(<compare>) #if QT_HAS_INCLUDE(<compare>)
std::strong_ordering operator<=>(const QCborMap &other) const std::strong_ordering operator<=>(const QCborMap &other) const
{ {
@ -242,9 +242,9 @@ public:
return std::strong_ordering::less; return std::strong_ordering::less;
} }
#else #else
bool operator==(const QCborMap &other) const Q_DECL_NOTHROW bool operator==(const QCborMap &other) const noexcept
{ return compare(other) == 0; } { return compare(other) == 0; }
bool operator!=(const QCborMap &other) const Q_DECL_NOTHROW bool operator!=(const QCborMap &other) const noexcept
{ return !(*this == other); } { return !(*this == other); }
bool operator<(const QCborMap &other) const bool operator<(const QCborMap &other) const
{ return compare(other) < 0; } { return compare(other) < 0; }
@ -316,7 +316,7 @@ private:
void detach(qsizetype reserve = 0); void detach(qsizetype reserve = 0);
friend QCborValue; friend QCborValue;
explicit QCborMap(QCborContainerPrivate &dd) Q_DECL_NOTHROW; explicit QCborMap(QCborContainerPrivate &dd) noexcept;
QExplicitlySharedDataPointer<QCborContainerPrivate> d; QExplicitlySharedDataPointer<QCborContainerPrivate> d;
}; };

6
src/corelib/serialization/qcborstream.cpp
View File

@ -2037,7 +2037,7 @@ public:
} }
} }
void handleError(CborError err) Q_DECL_NOTHROW void handleError(CborError err) noexcept
{ {
Q_ASSERT(err); Q_ASSERT(err);
@ -2411,7 +2411,7 @@ QCborStreamReader::Type QCborStreamReader::parentContainerType() const
\sa parentContainerType(), containerDepth(), leaveContainer() \sa parentContainerType(), containerDepth(), leaveContainer()
*/ */
bool QCborStreamReader::hasNext() const Q_DECL_NOTHROW bool QCborStreamReader::hasNext() const noexcept
{ {
return cbor_value_is_valid(&d->currentElement) && return cbor_value_is_valid(&d->currentElement) &&
!cbor_value_at_end(&d->currentElement); !cbor_value_at_end(&d->currentElement);
@ -2487,7 +2487,7 @@ bool QCborStreamReader::next(int maxRecursion)
\sa length(), QCborStreamWriter::startArray(), QCborStreamWriter::startMap() \sa length(), QCborStreamWriter::startArray(), QCborStreamWriter::startMap()
*/ */
bool QCborStreamReader::isLengthKnown() const Q_DECL_NOTHROW bool QCborStreamReader::isLengthKnown() const noexcept
{ {
return cbor_value_is_length_known(&d->currentElement); return cbor_value_is_length_known(&d->currentElement);
} }

6
src/corelib/serialization/qcborstream.h
View File

@ -178,7 +178,7 @@ public:
int containerDepth() const; int containerDepth() const;
QCborStreamReader::Type parentContainerType() const; QCborStreamReader::Type parentContainerType() const;
bool hasNext() const Q_DECL_NOTHROW Q_DECL_PURE_FUNCTION; bool hasNext() const noexcept Q_DECL_PURE_FUNCTION;
bool next(int maxRecursion = 10000); bool next(int maxRecursion = 10000);
Type type() const { return QCborStreamReader::Type(type_); } Type type() const { return QCborStreamReader::Type(type_); }
@ -203,7 +203,7 @@ public:
bool isNull() const { return isSimpleType(QCborSimpleType::Null); } bool isNull() const { return isSimpleType(QCborSimpleType::Null); }
bool isUndefined() const { return isSimpleType(QCborSimpleType::Undefined); } bool isUndefined() const { return isSimpleType(QCborSimpleType::Undefined); }
bool isLengthKnown() const Q_DECL_NOTHROW Q_DECL_PURE_FUNCTION; bool isLengthKnown() const noexcept Q_DECL_PURE_FUNCTION;
quint64 length() const; quint64 length() const;
bool isContainer() const { return isMap() || isArray(); } bool isContainer() const { return isMap() || isArray(); }
@ -240,7 +240,7 @@ private:
StringResult<QByteArray> _readByteArray_helper(); StringResult<QByteArray> _readByteArray_helper();
qsizetype _currentStringChunkSize() const; qsizetype _currentStringChunkSize() const;
template <typename FP> FP _toFloatingPoint() const Q_DECL_NOTHROW template <typename FP> FP _toFloatingPoint() const noexcept
{ {
using UInt = typename QIntegerForSizeof<FP>::Unsigned; using UInt = typename QIntegerForSizeof<FP>::Unsigned;
UInt u = UInt(value64); UInt u = UInt(value64);

12
src/corelib/serialization/qcborvalue.cpp
View File

@ -1395,12 +1395,12 @@ int QCborValue::compare(const QCborValue &other) const
return compareElementRecursive(container, e1, other.container, e2); return compareElementRecursive(container, e1, other.container, e2);
} }
int QCborArray::compare(const QCborArray &other) const Q_DECL_NOTHROW int QCborArray::compare(const QCborArray &other) const noexcept
{ {
return compareContainer(d.data(), other.d.data()); return compareContainer(d.data(), other.d.data());
} }
int QCborMap::compare(const QCborMap &other) const Q_DECL_NOTHROW int QCborMap::compare(const QCborMap &other) const noexcept
{ {
return compareContainer(d.data(), other.d.data()); return compareContainer(d.data(), other.d.data());
} }
@ -2560,22 +2560,22 @@ void QCborValueRef::assign(QCborValueRef that, const QCborValueRef other)
assign(that, other.concrete()); assign(that, other.concrete());
} }
QCborValue QCborValueRef::concrete(QCborValueRef self) Q_DECL_NOTHROW QCborValue QCborValueRef::concrete(QCborValueRef self) noexcept
{ {
return self.d->valueAt(self.i); return self.d->valueAt(self.i);
} }
QCborValue::Type QCborValueRef::concreteType(QCborValueRef self) Q_DECL_NOTHROW QCborValue::Type QCborValueRef::concreteType(QCborValueRef self) noexcept
{ {
return self.d->elements.at(self.i).type; return self.d->elements.at(self.i).type;
} }
inline QCborArray::QCborArray(QCborContainerPrivate &dd) Q_DECL_NOTHROW inline QCborArray::QCborArray(QCborContainerPrivate &dd) noexcept
: d(&dd) : d(&dd)
{ {
} }
inline QCborMap::QCborMap(QCborContainerPrivate &dd) Q_DECL_NOTHROW inline QCborMap::QCborMap(QCborContainerPrivate &dd) noexcept
: d(&dd) : d(&dd)
{ {
} }

22
src/corelib/serialization/qcborvalue.h
View File

@ -164,14 +164,14 @@ public:
QCborValue(const void *) = delete; QCborValue(const void *) = delete;
QCborValue(const QCborValue &other); QCborValue(const QCborValue &other);
QCborValue(QCborValue &&other) Q_DECL_NOTHROW QCborValue(QCborValue &&other) noexcept
: n(other.n), container(other.container), t(other.t) : n(other.n), container(other.container), t(other.t)
{ {
other.t = Undefined; other.t = Undefined;
other.container = nullptr; other.container = nullptr;
} }
QCborValue &operator=(const QCborValue &other); QCborValue &operator=(const QCborValue &other);
QCborValue &operator=(QCborValue &&other) Q_DECL_NOTHROW QCborValue &operator=(QCborValue &&other) noexcept
{ {
QCborValue tmp; QCborValue tmp;
qSwap(*this, tmp); qSwap(*this, tmp);
@ -179,7 +179,7 @@ public:
return *this; return *this;
} }
void swap(QCborValue &other) Q_DECL_NOTHROW void swap(QCborValue &other) noexcept
{ {
qSwap(n, other.n); qSwap(n, other.n);
qSwap(container, other.container); qSwap(container, other.container);
@ -261,9 +261,9 @@ public:
return std::partial_ordering::less; return std::partial_ordering::less;
} }
#else #else
bool operator==(const QCborValue &other) const Q_DECL_NOTHROW bool operator==(const QCborValue &other) const noexcept
{ return compare(other) == 0; } { return compare(other) == 0; }
bool operator!=(const QCborValue &other) const Q_DECL_NOTHROW bool operator!=(const QCborValue &other) const noexcept
{ return !(*this == other); } { return !(*this == other); }
bool operator<(const QCborValue &other) const bool operator<(const QCborValue &other) const
{ return compare(other) < 0; } { return compare(other) < 0; }
@ -323,8 +323,8 @@ class Q_CORE_EXPORT QCborValueRef
public: public:
operator QCborValue() const { return concrete(); } operator QCborValue() const { return concrete(); }
QCborValueRef(const QCborValueRef &) Q_DECL_NOTHROW = default; QCborValueRef(const QCborValueRef &) noexcept = default;
QCborValueRef(QCborValueRef &&) Q_DECL_NOTHROW = default; QCborValueRef(QCborValueRef &&) noexcept = default;
QCborValueRef &operator=(const QCborValue &other) QCborValueRef &operator=(const QCborValue &other)
{ assign(*this, other); return *this; } { assign(*this, other); return *this; }
QCborValueRef &operator=(QCborValue &&other) QCborValueRef &operator=(QCborValue &&other)
@ -435,11 +435,11 @@ private:
static void assign(QCborValueRef that, const QCborValue &other); static void assign(QCborValueRef that, const QCborValue &other);
static void assign(QCborValueRef that, QCborValue &&other); static void assign(QCborValueRef that, QCborValue &&other);
static void assign(QCborValueRef that, const QCborValueRef other); static void assign(QCborValueRef that, const QCborValueRef other);
static QCborValue concrete(QCborValueRef that) Q_DECL_NOTHROW; static QCborValue concrete(QCborValueRef that) noexcept;
QCborValue concrete() const Q_DECL_NOTHROW { return concrete(*this); } QCborValue concrete() const noexcept { return concrete(*this); }
static QCborValue::Type concreteType(QCborValueRef self) Q_DECL_NOTHROW Q_DECL_PURE_FUNCTION; static QCborValue::Type concreteType(QCborValueRef self) noexcept Q_DECL_PURE_FUNCTION;
QCborValue::Type concreteType() const Q_DECL_NOTHROW { return concreteType(*this); } QCborValue::Type concreteType() const noexcept { return concreteType(*this); }
// this will actually be invalid... // this will actually be invalid...
Q_DECL_CONSTEXPR QCborValueRef() : d(nullptr), i(0) {} Q_DECL_CONSTEXPR QCborValueRef() : d(nullptr), i(0) {}