diff --git a/src/blackcore/db/databasereaderconfig.h b/src/blackcore/db/databasereaderconfig.h index f5cb6084b..fe4493616 100644 --- a/src/blackcore/db/databasereaderconfig.h +++ b/src/blackcore/db/databasereaderconfig.h @@ -152,6 +152,5 @@ namespace BlackCore Q_DECLARE_METATYPE(BlackCore::Db::CDatabaseReaderConfig) Q_DECLARE_METATYPE(BlackCore::Db::CDatabaseReaderConfigList) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif // guard diff --git a/src/blackcore/vatsim/vatsimsettings.h b/src/blackcore/vatsim/vatsimsettings.h index 3f4bfb1a3..3f9877e67 100644 --- a/src/blackcore/vatsim/vatsimsettings.h +++ b/src/blackcore/vatsim/vatsimsettings.h @@ -220,7 +220,6 @@ namespace BlackCore Q_DECLARE_METATYPE(BlackCore::Vatsim::CReaderSettings) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) Q_DECLARE_METATYPE(BlackCore::Vatsim::CRawFsdMessageSettings) Q_DECLARE_METATYPE(BlackCore::Vatsim::CRawFsdMessageSettings::FileWriteMode) diff --git a/src/blackgui/models/listmodelbase.cpp b/src/blackgui/models/listmodelbase.cpp index 4549cc695..3f1ff1663 100644 --- a/src/blackgui/models/listmodelbase.cpp +++ b/src/blackgui/models/listmodelbase.cpp @@ -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()) diff --git a/src/blackgui/settings/atcstationssettings.h b/src/blackgui/settings/atcstationssettings.h index 0c7560294..064c7a9f4 100644 --- a/src/blackgui/settings/atcstationssettings.h +++ b/src/blackgui/settings/atcstationssettings.h @@ -79,6 +79,5 @@ namespace BlackGui Q_DECLARE_METATYPE(BlackGui::Settings::CAtcStationsSettings) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif // guard diff --git a/src/blackgui/settings/dockwidgetsettings.h b/src/blackgui/settings/dockwidgetsettings.h index e5999df1a..c504922fc 100644 --- a/src/blackgui/settings/dockwidgetsettings.h +++ b/src/blackgui/settings/dockwidgetsettings.h @@ -132,6 +132,5 @@ namespace BlackGui Q_DECLARE_METATYPE(BlackGui::Settings::CDockWidgetSettings) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif // guard diff --git a/src/blackgui/settings/guisettings.h b/src/blackgui/settings/guisettings.h index f589eb076..15bcd0ace 100644 --- a/src/blackgui/settings/guisettings.h +++ b/src/blackgui/settings/guisettings.h @@ -108,6 +108,5 @@ namespace BlackGui Q_DECLARE_METATYPE(BlackGui::Settings::CGeneralGuiSettings) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif // guard diff --git a/src/blackgui/settings/navigatorsettings.h b/src/blackgui/settings/navigatorsettings.h index 11d36befc..f435b4df0 100644 --- a/src/blackgui/settings/navigatorsettings.h +++ b/src/blackgui/settings/navigatorsettings.h @@ -111,6 +111,5 @@ namespace BlackGui Q_DECLARE_METATYPE(BlackGui::Settings::CNavigatorSettings) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif // guard diff --git a/src/blackgui/settings/textmessagesettings.h b/src/blackgui/settings/textmessagesettings.h index 1196f1f61..f4284929a 100644 --- a/src/blackgui/settings/textmessagesettings.h +++ b/src/blackgui/settings/textmessagesettings.h @@ -163,6 +163,5 @@ namespace BlackGui Q_DECLARE_METATYPE(BlackGui::Settings::CTextMessageSettings) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif // guard diff --git a/src/blackgui/settings/viewupdatesettings.h b/src/blackgui/settings/viewupdatesettings.h index 82716ae73..76a388876 100644 --- a/src/blackgui/settings/viewupdatesettings.h +++ b/src/blackgui/settings/viewupdatesettings.h @@ -113,6 +113,5 @@ namespace BlackGui Q_DECLARE_METATYPE(BlackGui::Settings::CViewUpdateSettings) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif // guard diff --git a/src/blackmisc/applicationinfolist.h b/src/blackmisc/applicationinfolist.h index 9209cdc22..0f6b072ac 100644 --- a/src/blackmisc/applicationinfolist.h +++ b/src/blackmisc/applicationinfolist.h @@ -52,7 +52,6 @@ namespace BlackMisc } // ns Q_DECLARE_METATYPE(BlackMisc::CApplicationInfoList) -Q_DECLARE_METATYPE(BlackMisc::CSequence) Q_DECLARE_METATYPE(BlackMisc::CCollection) #endif diff --git a/src/blackmisc/audio/audiodeviceinfolist.h b/src/blackmisc/audio/audiodeviceinfolist.h index 5e3218291..3ffcf28c8 100644 --- a/src/blackmisc/audio/audiodeviceinfolist.h +++ b/src/blackmisc/audio/audiodeviceinfolist.h @@ -106,6 +106,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::Audio::CAudioDeviceInfoList) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif //guard diff --git a/src/blackmisc/aviation/aircraftcategorylist.h b/src/blackmisc/aviation/aircraftcategorylist.h index 65dd0dcdf..c5c7465dd 100644 --- a/src/blackmisc/aviation/aircraftcategorylist.h +++ b/src/blackmisc/aviation/aircraftcategorylist.h @@ -102,6 +102,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::Aviation::CAircraftCategoryList) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif //guard diff --git a/src/blackmisc/aviation/aircraftenginelist.h b/src/blackmisc/aviation/aircraftenginelist.h index cee34b976..51d88ff3b 100644 --- a/src/blackmisc/aviation/aircraftenginelist.h +++ b/src/blackmisc/aviation/aircraftenginelist.h @@ -79,6 +79,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::Aviation::CAircraftEngineList) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif //guard diff --git a/src/blackmisc/aviation/aircrafticaocodelist.h b/src/blackmisc/aviation/aircrafticaocodelist.h index 22cf989fb..7bb1a51c1 100644 --- a/src/blackmisc/aviation/aircrafticaocodelist.h +++ b/src/blackmisc/aviation/aircrafticaocodelist.h @@ -148,6 +148,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::Aviation::CAircraftIcaoCodeList) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif //guard diff --git a/src/blackmisc/aviation/aircraftpartslist.h b/src/blackmisc/aviation/aircraftpartslist.h index 025f3b977..f94d564dd 100644 --- a/src/blackmisc/aviation/aircraftpartslist.h +++ b/src/blackmisc/aviation/aircraftpartslist.h @@ -56,7 +56,6 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::Aviation::CAircraftPartsList) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) Q_DECLARE_METATYPE(BlackMisc::Aviation::CAircraftPartsPerCallsign) Q_DECLARE_METATYPE(BlackMisc::Aviation::CAircraftPartsListPerCallsign) diff --git a/src/blackmisc/aviation/aircraftsituationchangelist.h b/src/blackmisc/aviation/aircraftsituationchangelist.h index 49bbdb993..1221f4a40 100644 --- a/src/blackmisc/aviation/aircraftsituationchangelist.h +++ b/src/blackmisc/aviation/aircraftsituationchangelist.h @@ -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) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif //guard diff --git a/src/blackmisc/aviation/aircraftsituationlist.h b/src/blackmisc/aviation/aircraftsituationlist.h index ad7df9248..82ca40d3c 100644 --- a/src/blackmisc/aviation/aircraftsituationlist.h +++ b/src/blackmisc/aviation/aircraftsituationlist.h @@ -222,7 +222,6 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::Aviation::CAircraftSituationList) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) Q_DECLARE_METATYPE(BlackMisc::Aviation::CAircraftSituationPerCallsign) Q_DECLARE_METATYPE(BlackMisc::Aviation::CAircraftSituationListPerCallsign) diff --git a/src/blackmisc/aviation/airlineicaocodelist.h b/src/blackmisc/aviation/airlineicaocodelist.h index cd9ce6484..438515e60 100644 --- a/src/blackmisc/aviation/airlineicaocodelist.h +++ b/src/blackmisc/aviation/airlineicaocodelist.h @@ -139,6 +139,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::Aviation::CAirlineIcaoCodeList) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif //guard diff --git a/src/blackmisc/aviation/airportlist.h b/src/blackmisc/aviation/airportlist.h index 1937b4e52..85d35214d 100644 --- a/src/blackmisc/aviation/airportlist.h +++ b/src/blackmisc/aviation/airportlist.h @@ -82,6 +82,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::Aviation::CAirportList) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif //guard diff --git a/src/blackmisc/aviation/atcstationlist.h b/src/blackmisc/aviation/atcstationlist.h index 161ca6b23..10a18538d 100644 --- a/src/blackmisc/aviation/atcstationlist.h +++ b/src/blackmisc/aviation/atcstationlist.h @@ -97,6 +97,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::Aviation::CAtcStationList) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif //guard diff --git a/src/blackmisc/aviation/callsignset.h b/src/blackmisc/aviation/callsignset.h index 809992209..49a3791d2 100644 --- a/src/blackmisc/aviation/callsignset.h +++ b/src/blackmisc/aviation/callsignset.h @@ -60,6 +60,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::Aviation::CCallsignSet) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif //guard diff --git a/src/blackmisc/aviation/flightplanlist.h b/src/blackmisc/aviation/flightplanlist.h index 66d7b77f1..3e4d6ad70 100644 --- a/src/blackmisc/aviation/flightplanlist.h +++ b/src/blackmisc/aviation/flightplanlist.h @@ -44,6 +44,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::Aviation::CFlightPlanList) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif //guard diff --git a/src/blackmisc/aviation/liverylist.h b/src/blackmisc/aviation/liverylist.h index a8da8e148..b38194a17 100644 --- a/src/blackmisc/aviation/liverylist.h +++ b/src/blackmisc/aviation/liverylist.h @@ -95,6 +95,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::Aviation::CLiveryList) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif //guard diff --git a/src/blackmisc/containerbase.h b/src/blackmisc/containerbase.h index 4b649bb28..e79f4694c 100644 --- a/src/blackmisc/containerbase.h +++ b/src/blackmisc/containerbase.h @@ -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(); } diff --git a/src/blackmisc/countrylist.h b/src/blackmisc/countrylist.h index 887a8e4bd..c39551e13 100644 --- a/src/blackmisc/countrylist.h +++ b/src/blackmisc/countrylist.h @@ -74,6 +74,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::CCountryList) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif //guard diff --git a/src/blackmisc/db/artifactlist.h b/src/blackmisc/db/artifactlist.h index 106f1f2c8..669454cfc 100644 --- a/src/blackmisc/db/artifactlist.h +++ b/src/blackmisc/db/artifactlist.h @@ -119,6 +119,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::Db::CArtifactList) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif //guard diff --git a/src/blackmisc/db/dbinfolist.h b/src/blackmisc/db/dbinfolist.h index a0dd3528f..efb615390 100644 --- a/src/blackmisc/db/dbinfolist.h +++ b/src/blackmisc/db/dbinfolist.h @@ -51,6 +51,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::Db::CDbInfoList) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif //guard diff --git a/src/blackmisc/db/distributionlist.h b/src/blackmisc/db/distributionlist.h index f6a72ca1b..7c0fc12e2 100644 --- a/src/blackmisc/db/distributionlist.h +++ b/src/blackmisc/db/distributionlist.h @@ -82,6 +82,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::Db::CDistributionList) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif //guard diff --git a/src/blackmisc/geo/coordinategeodeticlist.h b/src/blackmisc/geo/coordinategeodeticlist.h index c4358a4e3..0d195604f 100644 --- a/src/blackmisc/geo/coordinategeodeticlist.h +++ b/src/blackmisc/geo/coordinategeodeticlist.h @@ -54,6 +54,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::Geo::CCoordinateGeodeticList) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif //guard diff --git a/src/blackmisc/iconlist.h b/src/blackmisc/iconlist.h index 0f826ed67..1594451de 100644 --- a/src/blackmisc/iconlist.h +++ b/src/blackmisc/iconlist.h @@ -53,6 +53,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::CIconList) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif // guard diff --git a/src/blackmisc/identifierlist.h b/src/blackmisc/identifierlist.h index 727ef32df..9ed760ef8 100644 --- a/src/blackmisc/identifierlist.h +++ b/src/blackmisc/identifierlist.h @@ -54,7 +54,6 @@ namespace BlackMisc } //namespace Q_DECLARE_METATYPE(BlackMisc::CIdentifierList) -Q_DECLARE_METATYPE(BlackMisc::CSequence) // in set: Q_DECLARE_METATYPE(BlackMisc::CCollection) #endif //guard diff --git a/src/blackmisc/input/actionhotkeylist.h b/src/blackmisc/input/actionhotkeylist.h index 79d5de5fa..0942ef49a 100644 --- a/src/blackmisc/input/actionhotkeylist.h +++ b/src/blackmisc/input/actionhotkeylist.h @@ -63,6 +63,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::Input::CActionHotkeyList) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif // guard diff --git a/src/blackmisc/input/joystickbuttonlist.h b/src/blackmisc/input/joystickbuttonlist.h index 170893ded..36c41ca87 100644 --- a/src/blackmisc/input/joystickbuttonlist.h +++ b/src/blackmisc/input/joystickbuttonlist.h @@ -46,6 +46,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::Input::CJoystickButtonList) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif //guard diff --git a/src/blackmisc/input/keyboardkeylist.h b/src/blackmisc/input/keyboardkeylist.h index d67ec3593..410371658 100644 --- a/src/blackmisc/input/keyboardkeylist.h +++ b/src/blackmisc/input/keyboardkeylist.h @@ -52,6 +52,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::Input::CKeyboardKeyList) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif //guard diff --git a/src/blackmisc/logcategorylist.h b/src/blackmisc/logcategorylist.h index f195fb4bf..1a2835a31 100644 --- a/src/blackmisc/logcategorylist.h +++ b/src/blackmisc/logcategorylist.h @@ -142,6 +142,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::CLogCategoryList) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif diff --git a/src/blackmisc/namevariantpairlist.h b/src/blackmisc/namevariantpairlist.h index fc01da653..8270b5c63 100644 --- a/src/blackmisc/namevariantpairlist.h +++ b/src/blackmisc/namevariantpairlist.h @@ -65,6 +65,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::CNameVariantPairList) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif //guard diff --git a/src/blackmisc/network/clientlist.h b/src/blackmisc/network/clientlist.h index 938f95578..fe2b011d6 100644 --- a/src/blackmisc/network/clientlist.h +++ b/src/blackmisc/network/clientlist.h @@ -57,7 +57,6 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::Network::CClientList) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) Q_DECLARE_METATYPE(BlackMisc::Network::CClientPerCallsign) #endif //guard diff --git a/src/blackmisc/network/ecosystemlist.h b/src/blackmisc/network/ecosystemlist.h index d4fc1b5f2..df4dcd435 100644 --- a/src/blackmisc/network/ecosystemlist.h +++ b/src/blackmisc/network/ecosystemlist.h @@ -49,6 +49,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::Network::CEcosystemList) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif //guard diff --git a/src/blackmisc/network/rawfsdmessagelist.h b/src/blackmisc/network/rawfsdmessagelist.h index 84384779f..fe20bb9f5 100644 --- a/src/blackmisc/network/rawfsdmessagelist.h +++ b/src/blackmisc/network/rawfsdmessagelist.h @@ -52,6 +52,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::Network::CRawFsdMessageList) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif //guard diff --git a/src/blackmisc/network/remotefilelist.h b/src/blackmisc/network/remotefilelist.h index 005e9bfd3..f802ebb68 100644 --- a/src/blackmisc/network/remotefilelist.h +++ b/src/blackmisc/network/remotefilelist.h @@ -76,6 +76,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::Network::CRemoteFileList) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif //guard diff --git a/src/blackmisc/network/rolelist.h b/src/blackmisc/network/rolelist.h index 6c6dad5fe..4fcdc6f4b 100644 --- a/src/blackmisc/network/rolelist.h +++ b/src/blackmisc/network/rolelist.h @@ -63,6 +63,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::Network::CRoleList) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif //guard diff --git a/src/blackmisc/network/serverlist.h b/src/blackmisc/network/serverlist.h index 3f0750def..c39ad9afd 100644 --- a/src/blackmisc/network/serverlist.h +++ b/src/blackmisc/network/serverlist.h @@ -68,6 +68,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::Network::CServerList) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif //guard diff --git a/src/blackmisc/network/textmessagelist.h b/src/blackmisc/network/textmessagelist.h index a8083b24d..8ae5b8b71 100644 --- a/src/blackmisc/network/textmessagelist.h +++ b/src/blackmisc/network/textmessagelist.h @@ -120,6 +120,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::Network::CTextMessageList) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif //guard diff --git a/src/blackmisc/network/urllist.h b/src/blackmisc/network/urllist.h index 23def8b6b..74e24c8f2 100644 --- a/src/blackmisc/network/urllist.h +++ b/src/blackmisc/network/urllist.h @@ -139,6 +139,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::Network::CUrlList) Q_DECLARE_METATYPE(BlackMisc::Network::CFailoverUrlList) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif //guard diff --git a/src/blackmisc/network/urlloglist.h b/src/blackmisc/network/urlloglist.h index 9589e2b85..00c2ddb99 100644 --- a/src/blackmisc/network/urlloglist.h +++ b/src/blackmisc/network/urlloglist.h @@ -95,6 +95,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::Network::CUrlLogList) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif //guard diff --git a/src/blackmisc/network/userlist.h b/src/blackmisc/network/userlist.h index 2267b3d57..782d2051a 100644 --- a/src/blackmisc/network/userlist.h +++ b/src/blackmisc/network/userlist.h @@ -45,6 +45,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::Network::CUserList) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif //guard diff --git a/src/blackmisc/platformset.h b/src/blackmisc/platformset.h index 53541b91e..640dd94a2 100644 --- a/src/blackmisc/platformset.h +++ b/src/blackmisc/platformset.h @@ -55,6 +55,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::CPlatformSet) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif //guard diff --git a/src/blackmisc/propertyindexlist.h b/src/blackmisc/propertyindexlist.h index 6e8405ff0..f8f53e3ac 100644 --- a/src/blackmisc/propertyindexlist.h +++ b/src/blackmisc/propertyindexlist.h @@ -43,6 +43,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::CPropertyIndexList) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif //guard diff --git a/src/blackmisc/sequence.h b/src/blackmisc/sequence.h index 6119842ce..bfb192bcc 100644 --- a/src/blackmisc/sequence.h +++ b/src/blackmisc/sequence.h @@ -229,22 +229,6 @@ namespace BlackMisc template void push_back(const CRange &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 - void insert(const CRange &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) -Q_DECLARE_METATYPE(BlackMisc::CSequence) -Q_DECLARE_METATYPE(BlackMisc::CSequence) -Q_DECLARE_METATYPE(BlackMisc::CSequence) -Q_DECLARE_METATYPE(BlackMisc::CSequence) +Q_DECLARE_SEQUENTIAL_CONTAINER_METATYPE(BlackMisc::CSequence) #endif // guard diff --git a/src/blackmisc/simulation/aircraftmodellist.h b/src/blackmisc/simulation/aircraftmodellist.h index 162b9e72c..b2a90e7f3 100644 --- a/src/blackmisc/simulation/aircraftmodellist.h +++ b/src/blackmisc/simulation/aircraftmodellist.h @@ -574,6 +574,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::Simulation::CAircraftModelList) Q_DECLARE_METATYPE(BlackMisc::Simulation::CAircraftModelPerCallsign) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif //guard diff --git a/src/blackmisc/simulation/distributorlist.h b/src/blackmisc/simulation/distributorlist.h index d601b5569..7481fbfbb 100644 --- a/src/blackmisc/simulation/distributorlist.h +++ b/src/blackmisc/simulation/distributorlist.h @@ -85,6 +85,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::Simulation::CDistributorList) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif //guard diff --git a/src/blackmisc/simulation/fscommon/aircraftcfgentrieslist.h b/src/blackmisc/simulation/fscommon/aircraftcfgentrieslist.h index 502383b15..ef4bb974b 100644 --- a/src/blackmisc/simulation/fscommon/aircraftcfgentrieslist.h +++ b/src/blackmisc/simulation/fscommon/aircraftcfgentrieslist.h @@ -83,6 +83,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::Simulation::FsCommon::CAircraftCfgEntriesList) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif // guard diff --git a/src/blackmisc/simulation/fscommon/vpilotmodelruleset.h b/src/blackmisc/simulation/fscommon/vpilotmodelruleset.h index f77e43108..a2cc73630 100644 --- a/src/blackmisc/simulation/fscommon/vpilotmodelruleset.h +++ b/src/blackmisc/simulation/fscommon/vpilotmodelruleset.h @@ -80,6 +80,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::Simulation::FsCommon::CVPilotModelRuleSet) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif //guard diff --git a/src/blackmisc/simulation/interpolationsetuplist.h b/src/blackmisc/simulation/interpolationsetuplist.h index 96195ab72..17530d9c8 100644 --- a/src/blackmisc/simulation/interpolationsetuplist.h +++ b/src/blackmisc/simulation/interpolationsetuplist.h @@ -46,6 +46,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::Simulation::CInterpolationSetupList) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif //guard diff --git a/src/blackmisc/simulation/matchingstatistics.h b/src/blackmisc/simulation/matchingstatistics.h index fba321488..ec0b1b904 100644 --- a/src/blackmisc/simulation/matchingstatistics.h +++ b/src/blackmisc/simulation/matchingstatistics.h @@ -65,6 +65,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::Simulation::CMatchingStatistics) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif // guard diff --git a/src/blackmisc/simulation/settings/modelsettings.h b/src/blackmisc/simulation/settings/modelsettings.h index a577e449b..dc682f252 100644 --- a/src/blackmisc/simulation/settings/modelsettings.h +++ b/src/blackmisc/simulation/settings/modelsettings.h @@ -84,6 +84,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::Simulation::Settings::CModelSettings) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif // guard diff --git a/src/blackmisc/simulation/settings/simulatorsettings.h b/src/blackmisc/simulation/settings/simulatorsettings.h index ea78291f4..44079c02c 100644 --- a/src/blackmisc/simulation/settings/simulatorsettings.h +++ b/src/blackmisc/simulation/settings/simulatorsettings.h @@ -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) -Q_DECLARE_METATYPE(BlackMisc::CSequence) Q_DECLARE_METATYPE(BlackMisc::Simulation::Settings::CSimulatorMessagesSettings) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) 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) diff --git a/src/blackmisc/simulation/settings/swiftpluginsettings.h b/src/blackmisc/simulation/settings/swiftpluginsettings.h index 98537fb33..15b60a501 100644 --- a/src/blackmisc/simulation/settings/swiftpluginsettings.h +++ b/src/blackmisc/simulation/settings/swiftpluginsettings.h @@ -105,6 +105,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::Simulation::Settings::CSwiftPluginSettings) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif // guard diff --git a/src/blackmisc/simulation/simulatedaircraftlist.h b/src/blackmisc/simulation/simulatedaircraftlist.h index 55ea6a91b..b0840e47b 100644 --- a/src/blackmisc/simulation/simulatedaircraftlist.h +++ b/src/blackmisc/simulation/simulatedaircraftlist.h @@ -133,6 +133,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::Simulation::CSimulatedAircraftList) Q_DECLARE_METATYPE(BlackMisc::Simulation::CSimulatedAircraftPerCallsign) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif //guard diff --git a/src/blackmisc/simulation/simulatorinfolist.h b/src/blackmisc/simulation/simulatorinfolist.h index d209b06f4..4edc20ae2 100644 --- a/src/blackmisc/simulation/simulatorinfolist.h +++ b/src/blackmisc/simulation/simulatorinfolist.h @@ -52,6 +52,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::Simulation::CSimulatorInfoList) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif //guard diff --git a/src/blackmisc/simulation/simulatorplugininfolist.h b/src/blackmisc/simulation/simulatorplugininfolist.h index 267367f8c..0ee8fe833 100644 --- a/src/blackmisc/simulation/simulatorplugininfolist.h +++ b/src/blackmisc/simulation/simulatorplugininfolist.h @@ -60,6 +60,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::Simulation::CSimulatorPluginInfoList) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif // guard diff --git a/src/blackmisc/simulation/xplane/navdatareference.h b/src/blackmisc/simulation/xplane/navdatareference.h index 0a6afa6e3..2dfb3f00f 100644 --- a/src/blackmisc/simulation/xplane/navdatareference.h +++ b/src/blackmisc/simulation/xplane/navdatareference.h @@ -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) Q_DECLARE_METATYPE(BlackMisc::CCollection) #endif diff --git a/src/blackmisc/statusmessagelist.h b/src/blackmisc/statusmessagelist.h index 164b9b0f3..26941bf81 100644 --- a/src/blackmisc/statusmessagelist.h +++ b/src/blackmisc/statusmessagelist.h @@ -146,6 +146,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::CStatusMessageList) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif // guard diff --git a/src/blackmisc/variantlist.h b/src/blackmisc/variantlist.h index 4ef6927ef..8ba2a0463 100644 --- a/src/blackmisc/variantlist.h +++ b/src/blackmisc/variantlist.h @@ -38,6 +38,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::CVariantList) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif diff --git a/src/blackmisc/weather/cloudlayerlist.h b/src/blackmisc/weather/cloudlayerlist.h index b8f99ff64..a147f5d86 100644 --- a/src/blackmisc/weather/cloudlayerlist.h +++ b/src/blackmisc/weather/cloudlayerlist.h @@ -54,6 +54,5 @@ namespace BlackMisc } // namespace Q_DECLARE_METATYPE(BlackMisc::Weather::CCloudLayerList) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif //guard diff --git a/src/blackmisc/weather/metarlist.h b/src/blackmisc/weather/metarlist.h index ef659bd16..eba684838 100644 --- a/src/blackmisc/weather/metarlist.h +++ b/src/blackmisc/weather/metarlist.h @@ -50,6 +50,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::Weather::CMetarList) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif //guard diff --git a/src/blackmisc/weather/presentweatherlist.h b/src/blackmisc/weather/presentweatherlist.h index b6c9f7276..7ce7b8fd2 100644 --- a/src/blackmisc/weather/presentweatherlist.h +++ b/src/blackmisc/weather/presentweatherlist.h @@ -45,6 +45,5 @@ namespace BlackMisc } // namespace Q_DECLARE_METATYPE(BlackMisc::Weather::CPresentWeatherList) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif //guard diff --git a/src/blackmisc/weather/temperaturelayerlist.h b/src/blackmisc/weather/temperaturelayerlist.h index 317bcc442..9b82ae40b 100644 --- a/src/blackmisc/weather/temperaturelayerlist.h +++ b/src/blackmisc/weather/temperaturelayerlist.h @@ -55,6 +55,5 @@ namespace BlackMisc } // namespace Q_DECLARE_METATYPE(BlackMisc::Weather::CTemperatureLayerList) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif //guard diff --git a/src/blackmisc/weather/visibilitylayerlist.h b/src/blackmisc/weather/visibilitylayerlist.h index f2a943175..26bf7622d 100644 --- a/src/blackmisc/weather/visibilitylayerlist.h +++ b/src/blackmisc/weather/visibilitylayerlist.h @@ -54,6 +54,5 @@ namespace BlackMisc } // namespace Q_DECLARE_METATYPE(BlackMisc::Weather::CVisibilityLayerList) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif //guard diff --git a/src/blackmisc/weather/weatherdataplugininfolist.h b/src/blackmisc/weather/weatherdataplugininfolist.h index a4b16bd90..961ebcc52 100644 --- a/src/blackmisc/weather/weatherdataplugininfolist.h +++ b/src/blackmisc/weather/weatherdataplugininfolist.h @@ -49,6 +49,5 @@ namespace BlackMisc Q_DECLARE_METATYPE(BlackMisc::Weather::CWeatherDataPluginInfoList) Q_DECLARE_METATYPE(BlackMisc::CCollection) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif // guard diff --git a/src/blackmisc/weather/weathergrid.h b/src/blackmisc/weather/weathergrid.h index 08cf299a8..d06cc2136 100644 --- a/src/blackmisc/weather/weathergrid.h +++ b/src/blackmisc/weather/weathergrid.h @@ -72,6 +72,5 @@ namespace BlackMisc } // namespace Q_DECLARE_METATYPE(BlackMisc::Weather::CWeatherGrid) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif //guard diff --git a/src/blackmisc/weather/windlayerlist.h b/src/blackmisc/weather/windlayerlist.h index 3a8541730..5e6891d01 100644 --- a/src/blackmisc/weather/windlayerlist.h +++ b/src/blackmisc/weather/windlayerlist.h @@ -54,6 +54,5 @@ namespace BlackMisc } // namespace Q_DECLARE_METATYPE(BlackMisc::Weather::CWindLayerList) -Q_DECLARE_METATYPE(BlackMisc::CSequence) #endif //guard diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp index 52029c5aa..50d9a9c3a 100644 --- a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp +++ b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp @@ -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 {