mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-05 01:05:34 +08:00
Formatting, doxygen, typo aircrafts (to aircraft),
removed some debug output, {} in if statements
This commit is contained in:
@@ -64,11 +64,11 @@ namespace BlackMisc
|
||||
bool CAircraftIcao::matchesWildcardIcao(const CAircraftIcao &otherIcao) const
|
||||
{
|
||||
if ((*this) == otherIcao) return true;
|
||||
if (otherIcao.hasAircraftDesignator() && otherIcao.getAircraftDesignator() != this->getAircraftDesignator()) return false;
|
||||
if (otherIcao.hasAirlineDesignator() && otherIcao.getAirlineDesignator() != this->getAirlineDesignator()) return false;
|
||||
if (otherIcao.hasAircraftCombinedType() && otherIcao.getAircraftCombinedType() != this->getAircraftCombinedType()) return false;
|
||||
if (otherIcao.hasLivery() && otherIcao.getLivery() != this->getLivery()) return false;
|
||||
if (otherIcao.hasAircraftColor() && otherIcao.getAircraftColor() != this->getAircraftColor()) return false;
|
||||
if (otherIcao.hasAircraftDesignator() && otherIcao.getAircraftDesignator() != this->getAircraftDesignator()) { return false; }
|
||||
if (otherIcao.hasAirlineDesignator() && otherIcao.getAirlineDesignator() != this->getAirlineDesignator()) { return false; }
|
||||
if (otherIcao.hasAircraftCombinedType() && otherIcao.getAircraftCombinedType() != this->getAircraftCombinedType()) { return false; }
|
||||
if (otherIcao.hasLivery() && otherIcao.getLivery() != this->getLivery()) { return false; }
|
||||
if (otherIcao.hasAircraftColor() && otherIcao.getAircraftColor() != this->getAircraftColor()) { return false; }
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -25,9 +25,7 @@ namespace BlackMisc
|
||||
{
|
||||
namespace Aviation
|
||||
{
|
||||
/*!
|
||||
* Value object encapsulating a list of aircrafts.
|
||||
*/
|
||||
//! Value object encapsulating a list of aircrafts.
|
||||
class CAircraftList : public CSequence<CAircraft>
|
||||
{
|
||||
public:
|
||||
|
||||
@@ -103,10 +103,6 @@ namespace BlackMisc
|
||||
ICoordinateGeodetic::propertyByIndex(index) :
|
||||
CValueObject::propertyByIndex(index);
|
||||
}
|
||||
|
||||
Q_ASSERT_X(false, "CAirport", "index unknown");
|
||||
QString m = QString("no property, index ").append(index.toQString());
|
||||
return CVariant::fromValue(m);
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@@ -30,9 +30,7 @@ inline void initBlackMiscResources()
|
||||
Q_INIT_RESOURCE(blackmisc);
|
||||
}
|
||||
|
||||
/*!
|
||||
* Free functions in BlackMisc
|
||||
*/
|
||||
//! Free functions in BlackMisc
|
||||
namespace BlackMisc
|
||||
{
|
||||
namespace PhysicalQuantities
|
||||
@@ -103,9 +101,7 @@ namespace BlackMisc
|
||||
//! Init resources
|
||||
void initResources();
|
||||
|
||||
/*!
|
||||
* Checked version from QVariant
|
||||
*/
|
||||
//! Checked version from QVariant
|
||||
template <class T> void setFromQVariant(T *value, const QVariant &variant)
|
||||
{
|
||||
Q_ASSERT(variant.canConvert<T>());
|
||||
@@ -135,10 +131,8 @@ namespace BlackMisc
|
||||
*/
|
||||
QVariant complexQtTypeFromDbusArgument(const QDBusArgument &argument, int type);
|
||||
|
||||
/*!
|
||||
* \brief Display all user metatypes
|
||||
* \remarks Used in order to debug code, do not remove
|
||||
*/
|
||||
//! brief Display all user metatypes
|
||||
//! \remarks Used in order to debug code, do not remove
|
||||
void displayAllUserMetatypesTypes();
|
||||
|
||||
/*!
|
||||
|
||||
@@ -13,11 +13,6 @@
|
||||
|
||||
namespace BlackMisc
|
||||
{
|
||||
/*
|
||||
* Constructor
|
||||
*/
|
||||
CPropertyIndex::CPropertyIndex() = default;
|
||||
|
||||
/*
|
||||
* Non nested index
|
||||
*/
|
||||
|
||||
@@ -59,7 +59,7 @@ namespace BlackMisc
|
||||
};
|
||||
|
||||
//! Default constructor.
|
||||
CPropertyIndex();
|
||||
CPropertyIndex() = default;
|
||||
|
||||
//! Non nested index
|
||||
CPropertyIndex(int singleProperty);
|
||||
|
||||
Reference in New Issue
Block a user