flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-13 15:45:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T270, added CVariant long long functions and used those in formatter

Browse Source
This commit is contained in:
Klaus Basan
2018-05-25 21:25:21 +02:00
parent 06a835a5de
commit 117862e756
4 changed files with 45 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackmisc/timestampbased.cpp
View File

@@ -242,7 +242,7 @@ namespace BlackMisc
switch (i)
{
case IndexUtcTimestamp: this->setUtcTimestamp(variant.toDateTime()); return;
case IndexMSecsSinceEpoch: this->setMSecsSinceEpoch(variant.toInt()); return;
case IndexMSecsSinceEpoch: this->setMSecsSinceEpoch(variant.toQInt64()); return;
case IndexUtcTimestampFormattedYmdhms:
case IndexUtcTimestampFormattedYmdhmsz:
case IndexUtcTimestampFormattedHm:

6
src/blackmisc/variant.cpp
View File

@@ -69,6 +69,12 @@ namespace BlackMisc
return isIntegral() || type() == QMetaType::Float || type() == QMetaType::Double;
}
qint64 CVariant::toQInt64(bool *ok) const
{
if (this->type() == QMetaType::LongLong) { return this->toLongLong(ok); }
return this->toInt(ok);
}
int CVariant::compareImpl(const CVariant &a, const CVariant &b)
{
if (a.userType() < b.userType()) { return -1; }

18
src/blackmisc/variant.h
View File

@@ -83,6 +83,7 @@ namespace BlackMisc
static bool baseIsA(const void *, int) { return false; }
};
// *INDENT-OFF*
/*!
* When a derived class and a base class both inherit from Mixin::MetaType,
* the derived class uses this macro to disambiguate the inherited members.
@@ -92,6 +93,7 @@ namespace BlackMisc
using ::BlackMisc::Mixin::MetaType<DERIVED>::getMetaTypeId; \
using ::BlackMisc::Mixin::MetaType<DERIVED>::getClassName; \
using ::BlackMisc::Mixin::MetaType<DERIVED>::isA;
// *INDENT-ON*
} // Mixin
@@ -244,14 +246,26 @@ namespace BlackMisc
bool toBool() const { return m_v.toBool(); }
//! Convert this variant to an integer.
int toInt() const { return m_v.toInt(); }
int toInt(bool *ok = nullptr) const { return m_v.toInt(ok); }
//! Convert this variant to a longlong integer.
qlonglong toLongLong(bool *ok = nullptr) const { return m_v.toLongLong(ok); }
//! Convert this variant to a unsigned longlong integer.
qulonglong toULongLong(bool *ok = nullptr) const { return m_v.toULongLong(ok); }
//! COnvert to qint64, which is used for all timestamps
qint64 toQInt64(bool *ok = nullptr) const;
//! Convert this variant to double.
double toDouble() const { return m_v.toDouble(); }
double toDouble(bool *ok = nullptr) const { return m_v.toDouble(ok); }
//! Convert this variant to QDateTime.
QDateTime toDateTime() const { return m_v.toDateTime(); }
//! Convert this variant to QUrl.
QUrl toUrl() const { return m_v.toUrl(); }
//! Set the variant to null.
void clear() { m_v.clear(); }