Formatting, doxygen, typo aircrafts (to aircraft),

removed some debug output, {} in if statements
This commit is contained in:
Klaus Basan
2014-12-15 00:52:58 +01:00
parent ca19ee8053
commit 366769a6b8
43 changed files with 189 additions and 163 deletions

View File

@@ -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;
}

View File

@@ -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:

View File

@@ -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);
}
/*

View File

@@ -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();
/*!

View File

@@ -13,11 +13,6 @@
namespace BlackMisc
{
/*
* Constructor
*/
CPropertyIndex::CPropertyIndex() = default;
/*
* Non nested index
*/

View File

@@ -59,7 +59,7 @@ namespace BlackMisc
};
//! Default constructor.
CPropertyIndex();
CPropertyIndex() = default;
//! Non nested index
CPropertyIndex(int singleProperty);