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