Issue #15 Register CSequence as a sequential container metatype

This commit is contained in:
Mat Sutcliffe
2020-07-27 16:59:30 +01:00
parent 3bd444dfb7
commit e8a0a0b6ba
73 changed files with 5 additions and 95 deletions

View File

@@ -152,6 +152,5 @@ namespace BlackCore
Q_DECLARE_METATYPE(BlackCore::Db::CDatabaseReaderConfig)
Q_DECLARE_METATYPE(BlackCore::Db::CDatabaseReaderConfigList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackCore::Db::CDatabaseReaderConfig>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackCore::Db::CDatabaseReaderConfig>)
#endif // guard

View File

@@ -220,7 +220,6 @@ namespace BlackCore
Q_DECLARE_METATYPE(BlackCore::Vatsim::CReaderSettings)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackCore::Vatsim::CReaderSettings>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackCore::Vatsim::CReaderSettings>)
Q_DECLARE_METATYPE(BlackCore::Vatsim::CRawFsdMessageSettings)
Q_DECLARE_METATYPE(BlackCore::Vatsim::CRawFsdMessageSettings::FileWriteMode)

View File

@@ -401,7 +401,7 @@ namespace BlackGui
{
if (container.isEmpty()) { return; }
beginInsertRows(QModelIndex(), 0, 0);
m_container.insert(container);
m_container.push_back(container);
endInsertRows();
if (this->hasFilter())

View File

@@ -79,6 +79,5 @@ namespace BlackGui
Q_DECLARE_METATYPE(BlackGui::Settings::CAtcStationsSettings)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackGui::Settings::CAtcStationsSettings>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackGui::Settings::CAtcStationsSettings>)
#endif // guard

View File

@@ -132,6 +132,5 @@ namespace BlackGui
Q_DECLARE_METATYPE(BlackGui::Settings::CDockWidgetSettings)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackGui::Settings::CDockWidgetSettings>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackGui::Settings::CDockWidgetSettings>)
#endif // guard

View File

@@ -108,6 +108,5 @@ namespace BlackGui
Q_DECLARE_METATYPE(BlackGui::Settings::CGeneralGuiSettings)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackGui::Settings::CGeneralGuiSettings>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackGui::Settings::CGeneralGuiSettings>)
#endif // guard

View File

@@ -111,6 +111,5 @@ namespace BlackGui
Q_DECLARE_METATYPE(BlackGui::Settings::CNavigatorSettings)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackGui::Settings::CNavigatorSettings>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackGui::Settings::CNavigatorSettings>)
#endif // guard

View File

@@ -163,6 +163,5 @@ namespace BlackGui
Q_DECLARE_METATYPE(BlackGui::Settings::CTextMessageSettings)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackGui::Settings::CTextMessageSettings>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackGui::Settings::CTextMessageSettings>)
#endif // guard

View File

@@ -113,6 +113,5 @@ namespace BlackGui
Q_DECLARE_METATYPE(BlackGui::Settings::CViewUpdateSettings)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackGui::Settings::CViewUpdateSettings>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackGui::Settings::CViewUpdateSettings>)
#endif // guard

View File

@@ -52,7 +52,6 @@ namespace BlackMisc
} // ns
Q_DECLARE_METATYPE(BlackMisc::CApplicationInfoList)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::CApplicationInfo>)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::CApplicationInfo>)
#endif

View File

@@ -106,6 +106,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Audio::CAudioDeviceInfoList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Audio::CAudioDeviceInfo>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Audio::CAudioDeviceInfo>)
#endif //guard

View File

@@ -102,6 +102,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Aviation::CAircraftCategoryList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Aviation::CAircraftCategory>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Aviation::CAircraftCategory>)
#endif //guard

View File

@@ -79,6 +79,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Aviation::CAircraftEngineList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Aviation::CAircraftEngine>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Aviation::CAircraftEngine>)
#endif //guard

View File

@@ -148,6 +148,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Aviation::CAircraftIcaoCodeList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Aviation::CAircraftIcaoCode>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Aviation::CAircraftIcaoCode>)
#endif //guard

View File

@@ -56,7 +56,6 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Aviation::CAircraftPartsList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Aviation::CAircraftParts>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Aviation::CAircraftParts>)
Q_DECLARE_METATYPE(BlackMisc::Aviation::CAircraftPartsPerCallsign)
Q_DECLARE_METATYPE(BlackMisc::Aviation::CAircraftPartsListPerCallsign)

View File

@@ -61,6 +61,5 @@ Q_DECLARE_METATYPE(BlackMisc::Aviation::CAircraftSituationChangeList)
Q_DECLARE_METATYPE(BlackMisc::Aviation::CAircraftSituationChangePerCallsign)
Q_DECLARE_METATYPE(BlackMisc::Aviation::CAircraftSituationChangeListPerCallsign)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Aviation::CAircraftSituationChange>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Aviation::CAircraftSituationChange>)
#endif //guard

View File

@@ -222,7 +222,6 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Aviation::CAircraftSituationList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Aviation::CAircraftSituation>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Aviation::CAircraftSituation>)
Q_DECLARE_METATYPE(BlackMisc::Aviation::CAircraftSituationPerCallsign)
Q_DECLARE_METATYPE(BlackMisc::Aviation::CAircraftSituationListPerCallsign)

View File

@@ -139,6 +139,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Aviation::CAirlineIcaoCodeList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Aviation::CAirlineIcaoCode>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Aviation::CAirlineIcaoCode>)
#endif //guard

View File

@@ -82,6 +82,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Aviation::CAirportList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Aviation::CAirport>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Aviation::CAirport>)
#endif //guard

View File

@@ -97,6 +97,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Aviation::CAtcStationList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Aviation::CAtcStation>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Aviation::CAtcStation>)
#endif //guard

View File

@@ -60,6 +60,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Aviation::CCallsignSet)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Aviation::CCallsign>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Aviation::CCallsign>)
#endif //guard

View File

@@ -44,6 +44,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Aviation::CFlightPlanList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Aviation::CFlightPlan>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Aviation::CFlightPlan>)
#endif //guard

View File

@@ -95,6 +95,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Aviation::CLiveryList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Aviation::CLivery>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Aviation::CLivery>)
#endif //guard

View File

@@ -137,7 +137,7 @@ namespace BlackMisc
QJsonValueRef ref = (*i);
typename Derived::value_type val;
ref >> val;
derived().insert(std::move(val));
derived().push_back(std::move(val));
}
}
@@ -227,7 +227,7 @@ namespace BlackMisc
{
derived().clear();
argument.beginArray();
while (!argument.atEnd()) { typename Derived::value_type value; argument >> value; derived().insert(value); }
while (!argument.atEnd()) { typename Derived::value_type value; argument >> value; derived().push_back(value); }
argument.endArray();
}

View File

@@ -74,6 +74,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::CCountryList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::CCountry>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::CCountry>)
#endif //guard

View File

@@ -119,6 +119,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Db::CArtifactList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Db::CArtifact>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Db::CArtifact>)
#endif //guard

View File

@@ -51,6 +51,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Db::CDbInfoList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Db::CDbInfo>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Db::CDbInfo>)
#endif //guard

View File

@@ -82,6 +82,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Db::CDistributionList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Db::CDistribution>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Db::CDistribution>)
#endif //guard

View File

@@ -54,6 +54,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Geo::CCoordinateGeodeticList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Geo::CCoordinateGeodetic>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Geo::CCoordinateGeodetic>)
#endif //guard

View File

@@ -53,6 +53,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::CIconList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::CIcon>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::CIcon>)
#endif // guard

View File

@@ -54,7 +54,6 @@ namespace BlackMisc
} //namespace
Q_DECLARE_METATYPE(BlackMisc::CIdentifierList)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::CIdentifier>)
// in set: Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::CIdentifier>)
#endif //guard

View File

@@ -63,6 +63,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Input::CActionHotkeyList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Input::CActionHotkey>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Input::CActionHotkey>)
#endif // guard

View File

@@ -46,6 +46,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Input::CJoystickButtonList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Input::CJoystickButton>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Input::CJoystickButton>)
#endif //guard

View File

@@ -52,6 +52,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Input::CKeyboardKeyList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Input::CKeyboardKey>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Input::CKeyboardKey>)
#endif //guard

View File

@@ -142,6 +142,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::CLogCategoryList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::CLogCategory>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::CLogCategory>)
#endif

View File

@@ -65,6 +65,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::CNameVariantPairList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::CNameVariantPair>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::CNameVariantPair>)
#endif //guard

View File

@@ -57,7 +57,6 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Network::CClientList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Network::CClient>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Network::CClient>)
Q_DECLARE_METATYPE(BlackMisc::Network::CClientPerCallsign)
#endif //guard

View File

@@ -49,6 +49,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Network::CEcosystemList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Network::CEcosystem>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Network::CEcosystem>)
#endif //guard

View File

@@ -52,6 +52,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Network::CRawFsdMessageList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Network::CRawFsdMessage>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Network::CRawFsdMessage>)
#endif //guard

View File

@@ -76,6 +76,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Network::CRemoteFileList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Network::CRemoteFile>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Network::CRemoteFile>)
#endif //guard

View File

@@ -63,6 +63,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Network::CRoleList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Network::CRole>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Network::CRole>)
#endif //guard

View File

@@ -68,6 +68,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Network::CServerList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Network::CServer>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Network::CServer>)
#endif //guard

View File

@@ -120,6 +120,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Network::CTextMessageList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Network::CTextMessage>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Network::CTextMessage>)
#endif //guard

View File

@@ -139,6 +139,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Network::CUrlList)
Q_DECLARE_METATYPE(BlackMisc::Network::CFailoverUrlList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Network::CUrl>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Network::CUrl>)
#endif //guard

View File

@@ -95,6 +95,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Network::CUrlLogList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Network::CUrlLog>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Network::CUrlLog>)
#endif //guard

View File

@@ -45,6 +45,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Network::CUserList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Network::CUser>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Network::CUser>)
#endif //guard

View File

@@ -55,6 +55,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::CPlatformSet)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::CPlatform>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::CPlatform>)
#endif //guard

View File

@@ -43,6 +43,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::CPropertyIndexList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::CPropertyIndex>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::CPropertyIndex>)
#endif //guard

View File

@@ -229,22 +229,6 @@ namespace BlackMisc
template <typename I>
void push_back(const CRange<I> &range) { std::copy(range.begin(), range.end(), std::back_inserter(*this)); }
//! Synonym for push_back.
void insert(const T &value) { push_back(value); }
//! Synonym for push_back.
void insert(T &&value) { push_back(std::move(value)); }
//! Synonym for push_back.
void insert(const CSequence &other) { push_back(other); }
//! Synonym for push_back.
void insert(CSequence &&other) { push_back(std::move(other)); }
//! Synonym for push_back.
template <typename I>
void insert(const CRange<I> &range) { std::copy(range.begin(), range.end(), std::back_inserter(*this)); }
//! Concatenates two sequences and returns the result.
CSequence join(const CSequence &other) const { CSequence copy(*this); copy.push_back(other); return copy; }
@@ -585,10 +569,6 @@ namespace BlackMisc
};
} //namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::CSequence<int>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<uint>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<qlonglong>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<qulonglong>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<double>)
Q_DECLARE_SEQUENTIAL_CONTAINER_METATYPE(BlackMisc::CSequence)
#endif // guard

View File

@@ -574,6 +574,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Simulation::CAircraftModelList)
Q_DECLARE_METATYPE(BlackMisc::Simulation::CAircraftModelPerCallsign)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Simulation::CAircraftModel>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Simulation::CAircraftModel>)
#endif //guard

View File

@@ -85,6 +85,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Simulation::CDistributorList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Simulation::CDistributor>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Simulation::CDistributor>)
#endif //guard

View File

@@ -83,6 +83,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Simulation::FsCommon::CAircraftCfgEntriesList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Simulation::FsCommon::CAircraftCfgEntries>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Simulation::FsCommon::CAircraftCfgEntries>)
#endif // guard

View File

@@ -80,6 +80,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Simulation::FsCommon::CVPilotModelRuleSet)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Simulation::FsCommon::CVPilotModelRule>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Simulation::FsCommon::CVPilotModelRule>)
#endif //guard

View File

@@ -46,6 +46,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Simulation::CInterpolationSetupList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Simulation::CInterpolationAndRenderingSetupPerCallsign>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Simulation::CInterpolationAndRenderingSetupPerCallsign>)
#endif //guard

View File

@@ -65,6 +65,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Simulation::CMatchingStatistics)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Simulation::CMatchingStatisticsEntry>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Simulation::CMatchingStatisticsEntry>)
#endif // guard

View File

@@ -84,6 +84,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Simulation::Settings::CModelSettings)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Simulation::Settings::CModelSettings>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Simulation::Settings::CModelSettings>)
#endif // guard

View File

@@ -650,10 +650,8 @@ Q_DECLARE_METATYPE(BlackMisc::Simulation::Settings::CSimulatorSettings)
Q_DECLARE_METATYPE(BlackMisc::Simulation::Settings::CSimulatorSettings::CGSource)
Q_DECLARE_METATYPE(BlackMisc::Simulation::Settings::CFsxP3DSettings)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Simulation::Settings::CSimulatorSettings>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Simulation::Settings::CSimulatorSettings>)
Q_DECLARE_METATYPE(BlackMisc::Simulation::Settings::CSimulatorMessagesSettings)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Simulation::Settings::CSimulatorMessagesSettings>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Simulation::Settings::CSimulatorMessagesSettings>)
Q_DECLARE_METATYPE(BlackMisc::Simulation::Settings::CSimulatorMessagesSettings::TextMessageTypeFlag)
Q_DECLARE_METATYPE(BlackMisc::Simulation::Settings::CSimulatorMessagesSettings::TextMessageType)
Q_DECLARE_OPERATORS_FOR_FLAGS(BlackMisc::Simulation::Settings::CSimulatorMessagesSettings::TextMessageType)

View File

@@ -105,6 +105,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Simulation::Settings::CSwiftPluginSettings)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Simulation::Settings::CSwiftPluginSettings>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Simulation::Settings::CSwiftPluginSettings>)
#endif // guard

View File

@@ -133,6 +133,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Simulation::CSimulatedAircraftList)
Q_DECLARE_METATYPE(BlackMisc::Simulation::CSimulatedAircraftPerCallsign)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Simulation::CSimulatedAircraft>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Simulation::CSimulatedAircraft>)
#endif //guard

View File

@@ -52,6 +52,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Simulation::CSimulatorInfoList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Simulation::CSimulatorInfo>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Simulation::CSimulatorInfo>)
#endif //guard

View File

@@ -60,6 +60,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Simulation::CSimulatorPluginInfoList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Simulation::CSimulatorPluginInfo>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Simulation::CSimulatorPluginInfo>)
#endif // guard

View File

@@ -104,7 +104,6 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Simulation::XPlane::CNavDataReference)
Q_DECLARE_METATYPE(BlackMisc::Simulation::XPlane::CNavDataReferenceList)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Simulation::XPlane::CNavDataReference>)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Simulation::XPlane::CNavDataReference>)
#endif

View File

@@ -146,6 +146,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::CStatusMessageList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::CStatusMessage>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::CStatusMessage>)
#endif // guard

View File

@@ -38,6 +38,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::CVariantList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::CVariant>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::CVariant>)
#endif

View File

@@ -54,6 +54,5 @@ namespace BlackMisc
} // namespace
Q_DECLARE_METATYPE(BlackMisc::Weather::CCloudLayerList)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Weather::CCloudLayer>)
#endif //guard

View File

@@ -50,6 +50,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Weather::CMetarList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Weather::CMetar>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Weather::CMetar>)
#endif //guard

View File

@@ -45,6 +45,5 @@ namespace BlackMisc
} // namespace
Q_DECLARE_METATYPE(BlackMisc::Weather::CPresentWeatherList)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Weather::CPresentWeather>)
#endif //guard

View File

@@ -55,6 +55,5 @@ namespace BlackMisc
} // namespace
Q_DECLARE_METATYPE(BlackMisc::Weather::CTemperatureLayerList)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Weather::CTemperatureLayer>)
#endif //guard

View File

@@ -54,6 +54,5 @@ namespace BlackMisc
} // namespace
Q_DECLARE_METATYPE(BlackMisc::Weather::CVisibilityLayerList)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Weather::CVisibilityLayer>)
#endif //guard

View File

@@ -49,6 +49,5 @@ namespace BlackMisc
Q_DECLARE_METATYPE(BlackMisc::Weather::CWeatherDataPluginInfoList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackMisc::Weather::CWeatherDataPluginInfo>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Weather::CWeatherDataPluginInfo>)
#endif // guard

View File

@@ -72,6 +72,5 @@ namespace BlackMisc
} // namespace
Q_DECLARE_METATYPE(BlackMisc::Weather::CWeatherGrid)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Weather::CGridPoint>)
#endif //guard

View File

@@ -54,6 +54,5 @@ namespace BlackMisc
} // namespace
Q_DECLARE_METATYPE(BlackMisc::Weather::CWindLayerList)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackMisc::Weather::CWindLayer>)
#endif //guard

View File

@@ -1211,7 +1211,7 @@ namespace BlackSimPlugin
if (!pendingSimObj.hasCallsign()) { continue; }
if (pendingSimObj.isTerrainProbe() || aircraftCallsignsInRange.contains(pendingSimObj.getCallsign()))
{
toBeAddedAircraft.insert(pendingSimObj.getAircraft());
toBeAddedAircraft.push_back(pendingSimObj.getAircraft());
}
else
{