flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-03 07:35:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Style

Browse Source
This commit is contained in:
Klaus Basan
2018-07-31 01:02:52 +02:00
parent 4ca6bb11aa
commit 418584c5e3
9 changed files with 43 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/blackmisc/network/role.cpp
View File

@@ -10,6 +10,7 @@
#include "blackmisc/network/role.h"
#include <QJsonValue>
#include <QtGlobal>
#include <QStringBuilder>
namespace BlackMisc
{
@@ -22,8 +23,8 @@ namespace BlackMisc
QString CRole::convertToQString(bool i18n) const
{
Q_UNUSED(i18n);
return "Role: " + m_name +
" description: " + m_description +
return "Role: " % m_name %
" description: " % m_description %
this->getDbKeyAsStringInParentheses(" ");
}
@@ -31,34 +32,28 @@ namespace BlackMisc
{
if (index.isMyself()) { return CVariant::from(*this); }
if (IDatastoreObjectWithIntegerKey::canHandleIndex(index)) { return IDatastoreObjectWithIntegerKey::propertyByIndex(index); }
ColumnIndex i = index.frontCasted<ColumnIndex>();
const ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i)
{
case IndexName:
return CVariant::fromValue(this->m_name);
case IndexDescription:
return CVariant::fromValue(this->m_description);
default:
return CValueObject::propertyByIndex(index);
case IndexName: return CVariant::fromValue(m_name);
case IndexDescription: return CVariant::fromValue(m_description);
default: break;
}
return CValueObject::propertyByIndex(index);
}
void CRole::setPropertyByIndex(const CPropertyIndex &index, const CVariant &variant)
{
if (index.isMyself()) { (*this) = variant.to<CRole>(); return; }
if (IDatastoreObjectWithIntegerKey::canHandleIndex(index)) { IDatastoreObjectWithIntegerKey::setPropertyByIndex(index, variant); return; }
ColumnIndex i = index.frontCasted<ColumnIndex>();
const ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i)
{
case IndexName:
this->setName(variant.value<QString>());
break;
case IndexDescription:
this->setDescription(variant.value<QString>());
default:
CValueObject::setPropertyByIndex(index, variant);
break;
case IndexName: this->setName(variant.value<QString>()); break;
case IndexDescription: this->setDescription(variant.value<QString>()); break;
default: break;
}
CValueObject::setPropertyByIndex(index, variant);
}
CRole CRole::fromDatabaseJson(const QJsonObject &json)

6
src/blackmisc/pair.h
View File

@@ -25,9 +25,9 @@ namespace BlackMisc
{
namespace PhysicalQuantities
{
using CAnglePair = QPair<CAngle, CAngle>; //!< Pair of angle
using CLengthPair = QPair<CLength, CLength>; //!< Pair of length
using CSpeedPair = QPair<CSpeed, CSpeed>; //!< Pair of speed
using CAnglePair = QPair<CAngle, CAngle>; //!< Pair of angle
using CLengthPair = QPair<CLength, CLength>; //!< Pair of length
using CSpeedPair = QPair<CSpeed, CSpeed>; //!< Pair of speed
}
namespace Aviation
{

4
src/blackmisc/simulation/remoteaircraftprovider.cpp
View File

@@ -36,9 +36,9 @@ namespace BlackMisc
CSimulatedAircraftList CRemoteAircraftProvider::getAircraftInRange() const
{
QReadLocker l(&m_lockAircraft);
const QList<CSimulatedAircraft> aircraft = m_aircraftInRange.values();
const QList<CSimulatedAircraft> aircraftInRange = m_aircraftInRange.values();
l.unlock();
return CSimulatedAircraftList(aircraft);
return CSimulatedAircraftList(aircraftInRange);
}
CCallsignSet CRemoteAircraftProvider::getAircraftInRangeCallsigns() const