diff --git a/src/blackcore/airspacemonitor.h b/src/blackcore/airspacemonitor.h index 74c9b2446..dfd8babfc 100644 --- a/src/blackcore/airspacemonitor.h +++ b/src/blackcore/airspacemonitor.h @@ -267,7 +267,7 @@ namespace BlackCore //! \ingroup reverselookup BlackMisc::Simulation::CAircraftModel reverseLookupModelWithFlightplanData( const BlackMisc::Aviation::CCallsign &callsign, const QString &aircraftIcao, - const QString &airlineIcao, const QString &livery, const QString &modelString, + const QString &airlineIcao, const QString &liveryString, const QString &modelString, BlackMisc::Simulation::CAircraftModel::ModelType type, BlackMisc::CStatusMessageList *log); //! Create aircraft in range, this is the only place where a new aircraft should be added diff --git a/src/blackgui/editors/fsdsetupform.ui b/src/blackgui/editors/fsdsetupform.ui index c79bf6e84..a9545d256 100644 --- a/src/blackgui/editors/fsdsetupform.ui +++ b/src/blackgui/editors/fsdsetupform.ui @@ -6,8 +6,8 @@ 0 0 - 272 - 80 + 255 + 82 @@ -15,16 +15,16 @@ - 0 + 1 - 0 + 1 - 0 + 1 - 0 + 1 4 diff --git a/src/blackmisc/network/server.h b/src/blackmisc/network/server.h index 836b4c2bc..7b72f38d2 100644 --- a/src/blackmisc/network/server.h +++ b/src/blackmisc/network/server.h @@ -205,7 +205,7 @@ namespace BlackMisc //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex void setPropertyByIndex(const CPropertyIndex &index, const CVariant &variant); - //! Compare by index + //! \copydoc BlackMisc::Mixin::Index::comparePropertyByIndex int comparePropertyByIndex(const CPropertyIndex &index, const CServer &compareValue) const; //! \copydoc BlackMisc::Mixin::String::toQString()