summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qvariant.cpp
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-20 10:13:49 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-24 19:45:59 +0200
commitc2cf5f824a09adf0362f015c1b9d1817dabb04c3 (patch)
tree54cb2e3bf0bc02d86ccf8f0e8286daaf7092fe59 /src/corelib/kernel/qvariant.cpp
parentc4245e7b8ceb233a06cea1ace9439795738adbf8 (diff)
Whitespace cleanup in corelib/kernel
Change-Id: If061ef0af5ced4384e20a82afcea3712fa7e45d7 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/corelib/kernel/qvariant.cpp')
-rw-r--r--src/corelib/kernel/qvariant.cpp23
1 files changed, 10 insertions, 13 deletions
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp
index 55fd001cfd..f2e2ae2c2e 100644
--- a/src/corelib/kernel/qvariant.cpp
+++ b/src/corelib/kernel/qvariant.cpp
@@ -979,7 +979,7 @@ QMetaType QVariant::metaType() const
/*!
Assigns the value of the variant \a variant to this variant.
*/
-QVariant& QVariant::operator=(const QVariant &variant)
+QVariant &QVariant::operator=(const QVariant &variant)
{
if (this == &variant)
return *this;
@@ -1062,7 +1062,6 @@ void QVariant::clear()
Returns \nullptr if the type is QMetaType::UnknownType or doesn't exist.
*/
-
/*!
\fn QVariant::Type QVariant::nameToType(const char *name)
\deprecated Use QMetaType instead
@@ -1198,7 +1197,7 @@ void QVariant::load(QDataStream &s)
if (!isValid()) {
if (s.version() < QDataStream::Qt_5_0) {
- // Since we wrote something, we should read something
+ // Since we wrote something, we should read something
QString x;
s >> x;
}
@@ -1273,7 +1272,7 @@ void QVariant::save(QDataStream &s) const
typeId = 75;
} else if (typeId >= Qt5KeySequence && typeId <= Qt5QQuaternion) {
// and as a result these types received lower ids too
- typeId +=1;
+ typeId += 1;
} else if (typeId > Qt5QQuaternion || typeId == QMetaType::QUuid) {
// These existed in Qt 4 only as a custom type
typeId = 127;
@@ -1309,7 +1308,7 @@ void QVariant::save(QDataStream &s) const
\sa{Serializing Qt Data Types}{Format of the QDataStream operators}
*/
-QDataStream& operator>>(QDataStream &s, QVariant &p)
+QDataStream &operator>>(QDataStream &s, QVariant &p)
{
p.load(s);
return s;
@@ -1320,7 +1319,7 @@ QDataStream& operator>>(QDataStream &s, QVariant &p)
\sa{Serializing Qt Data Types}{Format of the QDataStream operators}
*/
-QDataStream& operator<<(QDataStream &s, const QVariant &p)
+QDataStream &operator<<(QDataStream &s, const QVariant &p)
{
p.save(s);
return s;
@@ -2221,7 +2220,8 @@ static bool integralEquals(uint promotedType, const QVariant::Private *d1, const
namespace {
template<typename Numeric>
-int spaceShip(Numeric lhs, Numeric rhs) {
+int spaceShip(Numeric lhs, Numeric rhs)
+{
bool smaller;
if constexpr (std::is_same_v<Numeric, QObject *>)
smaller = std::less<QObject *>()(lhs, rhs); // can't use less all the time because of bool
@@ -2320,7 +2320,8 @@ static bool pointerEquals(const QVariant::Private *d1, const QVariant::Private *
return d1->get<QObject *>() == d2->get<QObject *>();
}
-static int pointerCompare(const QVariant::Private *d1, const QVariant::Private *d2) {
+static int pointerCompare(const QVariant::Private *d1, const QVariant::Private *d2)
+{
return spaceShip<QObject *>(d1->get<QObject *>(), d2->get<QObject *>());
}
#endif
@@ -2387,19 +2388,16 @@ std::optional<int> QVariant::compare(const QVariant &lhs, const QVariant &rhs)
return t.compare(lhs.constData(), rhs.constData());
}
-
/*!
\fn const void *QVariant::constData() const
\fn const void* QVariant::data() const
\internal
*/
-
-
/*!
\internal
*/
-void* QVariant::data()
+void *QVariant::data()
{
detach();
// set is_null to false, as the caller is likely to write some data into this variant
@@ -2407,7 +2405,6 @@ void* QVariant::data()
return const_cast<void *>(constData());
}
-
/*!
Returns \c true if this is a null variant, false otherwise.