AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QUuid: add some noexcept

Browse Source 
Change-Id: I43647e558a761ff6e7a275e30382919ba038f467
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Marc Mutz 2015-04-03 21:46:36 +02:00
parent 23330d498d
commit 09c1bd2eb0
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/corelib/plugin/quuid.cpp
View File

@ -721,7 +721,7 @@ QDataStream &operator>>(QDataStream &s, QUuid &id)
Returns \c true if this is the null UUID Returns \c true if this is the null UUID
{00000000-0000-0000-0000-000000000000}; otherwise returns \c false. {00000000-0000-0000-0000-000000000000}; otherwise returns \c false.
*/ */
bool QUuid::isNull() const bool QUuid::isNull() const Q_DECL_NOTHROW
{ {
return data4[0] == 0 && data4[1] == 0 && data4[2] == 0 && data4[3] == 0 && return data4[0] == 0 && data4[1] == 0 && data4[2] == 0 && data4[3] == 0 &&
data4[4] == 0 && data4[5] == 0 && data4[6] == 0 && data4[7] == 0 && data4[4] == 0 && data4[5] == 0 && data4[6] == 0 && data4[7] == 0 &&
@ -770,7 +770,7 @@ bool QUuid::isNull() const
\sa version() \sa version()
*/ */
QUuid::Variant QUuid::variant() const QUuid::Variant QUuid::variant() const Q_DECL_NOTHROW
{ {
if (isNull()) if (isNull())
return VarUnknown; return VarUnknown;
@ -791,7 +791,7 @@ QUuid::Variant QUuid::variant() const
\sa variant() \sa variant()
*/ */
QUuid::Version QUuid::version() const QUuid::Version QUuid::version() const Q_DECL_NOTHROW
{ {
// Check the 4 MSB of data3 // Check the 4 MSB of data3
Version ver = (Version)(data3>>12); Version ver = (Version)(data3>>12);
@ -814,7 +814,7 @@ QUuid::Version QUuid::version() const
\sa variant() \sa variant()
*/ */
bool QUuid::operator<(const QUuid &other) const bool QUuid::operator<(const QUuid &other) const Q_DECL_NOTHROW
{ {
if (variant() != other.variant()) if (variant() != other.variant())
return variant() < other.variant(); return variant() < other.variant();
@ -841,7 +841,7 @@ bool QUuid::operator<(const QUuid &other) const
\sa variant() \sa variant()
*/ */
bool QUuid::operator>(const QUuid &other) const bool QUuid::operator>(const QUuid &other) const Q_DECL_NOTHROW
{ {
return other < *this; return other < *this;
} }

34
src/corelib/plugin/quuid.h
View File

@ -75,13 +75,13 @@ public:
}; };
#if defined(Q_COMPILER_UNIFORM_INIT) && !defined(Q_QDOC) #if defined(Q_COMPILER_UNIFORM_INIT) && !defined(Q_QDOC)
Q_DECL_CONSTEXPR QUuid() : data1(0), data2(0), data3(0), data4{0,0,0,0,0,0,0,0} {} Q_DECL_CONSTEXPR QUuid() Q_DECL_NOTHROW : data1(0), data2(0), data3(0), data4{0,0,0,0,0,0,0,0} {}
Q_DECL_CONSTEXPR QUuid(uint l, ushort w1, ushort w2, uchar b1, uchar b2, uchar b3, Q_DECL_CONSTEXPR QUuid(uint l, ushort w1, ushort w2, uchar b1, uchar b2, uchar b3,
uchar b4, uchar b5, uchar b6, uchar b7, uchar b8) uchar b4, uchar b5, uchar b6, uchar b7, uchar b8) Q_DECL_NOTHROW
: data1(l), data2(w1), data3(w2), data4{b1, b2, b3, b4, b5, b6, b7, b8} {} : data1(l), data2(w1), data3(w2), data4{b1, b2, b3, b4, b5, b6, b7, b8} {}
#else #else
QUuid() QUuid() Q_DECL_NOTHROW
{ {
data1 = 0; data1 = 0;
data2 = 0; data2 = 0;
@ -89,7 +89,7 @@ public:
for(int i = 0; i < 8; i++) for(int i = 0; i < 8; i++)
data4[i] = 0; data4[i] = 0;
} }
QUuid(uint l, ushort w1, ushort w2, uchar b1, uchar b2, uchar b3, uchar b4, uchar b5, uchar b6, uchar b7, uchar b8) QUuid(uint l, ushort w1, ushort w2, uchar b1, uchar b2, uchar b3, uchar b4, uchar b5, uchar b6, uchar b7, uchar b8) Q_DECL_NOTHROW
{ {
data1 = l; data1 = l;
data2 = w1; data2 = w1;
@ -112,9 +112,9 @@ public:
QByteArray toByteArray() const; QByteArray toByteArray() const;
QByteArray toRfc4122() const; QByteArray toRfc4122() const;
static QUuid fromRfc4122(const QByteArray &); static QUuid fromRfc4122(const QByteArray &);
bool isNull() const; bool isNull() const Q_DECL_NOTHROW;
Q_DECL_RELAXED_CONSTEXPR bool operator==(const QUuid &orig) const Q_DECL_RELAXED_CONSTEXPR bool operator==(const QUuid &orig) const Q_DECL_NOTHROW
{ {
if (data1 != orig.data1 || data2 != orig.data2 || if (data1 != orig.data1 || data2 != orig.data2 ||
data3 != orig.data3) data3 != orig.data3)
@ -127,24 +127,24 @@ public:
return true; return true;
} }
Q_DECL_RELAXED_CONSTEXPR bool operator!=(const QUuid &orig) const Q_DECL_RELAXED_CONSTEXPR bool operator!=(const QUuid &orig) const Q_DECL_NOTHROW
{ {
return !(*this == orig); return !(*this == orig);
} }
bool operator<(const QUuid &other) const; bool operator<(const QUuid &other) const Q_DECL_NOTHROW;
bool operator>(const QUuid &other) const; bool operator>(const QUuid &other) const Q_DECL_NOTHROW;
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
// On Windows we have a type GUID that is used by the platform API, so we // On Windows we have a type GUID that is used by the platform API, so we
// provide convenience operators to cast from and to this type. // provide convenience operators to cast from and to this type.
#if defined(Q_COMPILER_UNIFORM_INIT) && !defined(Q_QDOC) #if defined(Q_COMPILER_UNIFORM_INIT) && !defined(Q_QDOC)
Q_DECL_CONSTEXPR QUuid(const GUID &guid) Q_DECL_CONSTEXPR QUuid(const GUID &guid) Q_DECL_NOTHROW
: data1(guid.Data1), data2(guid.Data2), data3(guid.Data3), : data1(guid.Data1), data2(guid.Data2), data3(guid.Data3),
data4{guid.Data4[0], guid.Data4[1], guid.Data4[2], guid.Data4[3], data4{guid.Data4[0], guid.Data4[1], guid.Data4[2], guid.Data4[3],
guid.Data4[4], guid.Data4[5], guid.Data4[6], guid.Data4[7]} {} guid.Data4[4], guid.Data4[5], guid.Data4[6], guid.Data4[7]} {}
#else #else
QUuid(const GUID &guid) QUuid(const GUID &guid) Q_DECL_NOTHROW
{ {
data1 = guid.Data1; data1 = guid.Data1;
data2 = guid.Data2; data2 = guid.Data2;
@ -154,24 +154,24 @@ public:
} }
#endif #endif
Q_DECL_RELAXED_CONSTEXPR QUuid &operator=(const GUID &guid) Q_DECL_RELAXED_CONSTEXPR QUuid &operator=(const GUID &guid) Q_DECL_NOTHROW
{ {
*this = QUuid(guid); *this = QUuid(guid);
return *this; return *this;
} }
Q_DECL_RELAXED_CONSTEXPR operator GUID() const Q_DECL_RELAXED_CONSTEXPR operator GUID() const Q_DECL_NOTHROW
{ {
GUID guid = { data1, data2, data3, { data4[0], data4[1], data4[2], data4[3], data4[4], data4[5], data4[6], data4[7] } }; GUID guid = { data1, data2, data3, { data4[0], data4[1], data4[2], data4[3], data4[4], data4[5], data4[6], data4[7] } };
return guid; return guid;
} }
Q_DECL_RELAXED_CONSTEXPR bool operator==(const GUID &guid) const Q_DECL_RELAXED_CONSTEXPR bool operator==(const GUID &guid) const Q_DECL_NOTHROW
{ {
return *this == QUuid(guid); return *this == QUuid(guid);
} }
Q_DECL_RELAXED_CONSTEXPR bool operator!=(const GUID &guid) const Q_DECL_RELAXED_CONSTEXPR bool operator!=(const GUID &guid) const Q_DECL_NOTHROW
{ {
return !(*this == guid); return !(*this == guid);
} }
@ -192,8 +192,8 @@ public:
#endif #endif
QUuid::Variant variant() const; QUuid::Variant variant() const Q_DECL_NOTHROW;
QUuid::Version version() const; QUuid::Version version() const Q_DECL_NOTHROW;
uint data1; uint data1;
ushort data2; ushort data2;