Issue #77 Break cyclic dependency between CPropertyIndex and all other value classes

2026-04-16 18:35:35 +08:00 · 2020-11-01 20:33:43 +00:00
parent 363758e8ea
commit 1991b4847a
97 changed files with 96 additions and 94 deletions
--- a/src/blackmisc/audio/voicesetup.h
+++ b/src/blackmisc/audio/voicesetup.h
@@ -15,7 +15,7 @@
 #include "blackmisc/settingscache.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/metaclass.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/blackmiscexport.h"

 #include <QMetaType>
--- a/src/blackmisc/aviation/aircraftcategory.cpp
+++ b/src/blackmisc/aviation/aircraftcategory.cpp
@@ -10,7 +10,7 @@
 #include "blackmisc/db/datastoreutility.h"
 #include "blackmisc/comparefunctions.h"
 #include "blackmisc/logcategories.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/variant.h"
 #include "blackmisc/stringutils.h"
--- a/src/blackmisc/aviation/aircraftcategory.h
+++ b/src/blackmisc/aviation/aircraftcategory.h
@@ -14,7 +14,7 @@
 #include "blackmisc/db/datastore.h"
 #include "blackmisc/statusmessagelist.h"
 #include "blackmisc/metaclass.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/variant.h"
 #include "blackmisc/blackmiscexport.h"
--- a/src/blackmisc/aviation/aircrafticaocode.cpp
+++ b/src/blackmisc/aviation/aircrafticaocode.cpp
@@ -12,7 +12,7 @@
 #include "blackmisc/db/datastoreutility.h"
 #include "blackmisc/comparefunctions.h"
 #include "blackmisc/logcategories.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/variant.h"
 #include "blackmisc/stringutils.h"
--- a/src/blackmisc/aviation/aircrafticaocode.h
+++ b/src/blackmisc/aviation/aircrafticaocode.h
@@ -16,7 +16,7 @@
 #include "blackmisc/pq/length.h"
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/metaclass.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/statusmessagelist.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/variant.h"
--- a/src/blackmisc/aviation/aircraftlights.h
+++ b/src/blackmisc/aviation/aircraftlights.h
@@ -13,7 +13,7 @@

 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/metaclass.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/variant.h"

--- a/src/blackmisc/aviation/aircraftparts.h
+++ b/src/blackmisc/aviation/aircraftparts.h
@@ -15,7 +15,7 @@
 #include "blackmisc/aviation/aircraftlights.h"
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/metaclass.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/timestampbased.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/variant.h"
--- a/src/blackmisc/aviation/aircraftsituation.cpp
+++ b/src/blackmisc/aviation/aircraftsituation.cpp
@@ -13,7 +13,7 @@
 #include "blackmisc/geo/elevationplane.h"
 #include "blackmisc/pq/length.h"
 #include "blackmisc/pq/units.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/comparefunctions.h"
 #include "blackmisc/variant.h"
 #include "blackmisc/verify.h"
--- a/src/blackmisc/aviation/aircraftsituation.h
+++ b/src/blackmisc/aviation/aircraftsituation.h
@@ -24,7 +24,7 @@
 #include "blackmisc/pq/length.h"
 #include "blackmisc/pq/speed.h"
 #include "blackmisc/pq/time.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/timestampbased.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/variant.h"
--- a/src/blackmisc/aviation/aircraftsituationchange.cpp
+++ b/src/blackmisc/aviation/aircraftsituationchange.cpp
@@ -14,7 +14,7 @@
 #include "blackmisc/pq/units.h"
 #include "blackmisc/math/mathutils.h"
 #include "blackmisc/comparefunctions.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/variant.h"
 #include "blackmisc/verify.h"
 #include "blackmisc/stringutils.h"
--- a/src/blackmisc/aviation/aircraftsituationchange.h
+++ b/src/blackmisc/aviation/aircraftsituationchange.h
@@ -19,7 +19,7 @@
 #include "blackmisc/timestampbased.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/variant.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/blackmiscexport.h"

 namespace BlackMisc
--- a/src/blackmisc/aviation/airlineicaocode.cpp
+++ b/src/blackmisc/aviation/airlineicaocode.cpp
@@ -13,7 +13,7 @@
 #include "blackmisc/comparefunctions.h"
 #include "blackmisc/icons.h"
 #include "blackmisc/logcategories.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/stringutils.h"
 #include "blackmisc/swiftdirectories.h"
--- a/src/blackmisc/aviation/airlineicaocode.h
+++ b/src/blackmisc/aviation/airlineicaocode.h
@@ -15,7 +15,7 @@
 #include "blackmisc/country.h"
 #include "blackmisc/db/datastore.h"
 #include "blackmisc/metaclass.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/statusmessagelist.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/variant.h"
--- a/src/blackmisc/aviation/airport.cpp
+++ b/src/blackmisc/aviation/airport.cpp
@@ -8,7 +8,7 @@

 #include "blackmisc/aviation/airport.h"
 #include "blackmisc/pq/angle.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/variant.h"
 #include "blackmisc/stringutils.h"

--- a/src/blackmisc/aviation/airport.h
+++ b/src/blackmisc/aviation/airport.h
@@ -20,7 +20,7 @@
 #include "blackmisc/metaclass.h"
 #include "blackmisc/pq/length.h"
 #include "blackmisc/country.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/variant.h"

--- a/src/blackmisc/aviation/airporticaocode.h
+++ b/src/blackmisc/aviation/airporticaocode.h
@@ -13,7 +13,7 @@

 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/metaclass.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"

 #include <QMetaType>
--- a/src/blackmisc/aviation/atcstation.cpp
+++ b/src/blackmisc/aviation/atcstation.cpp
@@ -11,7 +11,7 @@
 #include "blackmisc/mixin/mixincompare.h"
 #include "blackmisc/pq/physicalquantity.h"
 #include "blackmisc/pq/units.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/variant.h"
 #include "blackmisc/comparefunctions.h"
 #include "blackmisc/stringutils.h"
--- a/src/blackmisc/aviation/atcstation.h
+++ b/src/blackmisc/aviation/atcstation.h
@@ -23,7 +23,7 @@
 #include "blackmisc/pq/frequency.h"
 #include "blackmisc/pq/length.h"
 #include "blackmisc/pq/time.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/variant.h"

--- a/src/blackmisc/aviation/callsign.h
+++ b/src/blackmisc/aviation/callsign.h
@@ -13,7 +13,7 @@

 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/metaclass.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/variant.h"
 #include <QMetaType>
--- a/src/blackmisc/aviation/livery.cpp
+++ b/src/blackmisc/aviation/livery.cpp
@@ -12,7 +12,7 @@
 #include "blackmisc/mixin/mixincompare.h"
 #include "blackmisc/comparefunctions.h"
 #include "blackmisc/logcategories.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/stringutils.h"
 #include "blackmisc/variant.h"
--- a/src/blackmisc/aviation/livery.h
+++ b/src/blackmisc/aviation/livery.h
@@ -15,7 +15,7 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/db/datastore.h"
 #include "blackmisc/metaclass.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/rgbcolor.h"
 #include "blackmisc/statusmessagelist.h"
 #include "blackmisc/valueobject.h"
--- a/src/blackmisc/aviation/modulator.cpp
+++ b/src/blackmisc/aviation/modulator.cpp
@@ -12,7 +12,7 @@
 #include "blackmisc/aviation/adfsystem.h"
 #include "blackmisc/math/mathutils.h"
 #include "blackmisc/pq/units.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/variant.h"
 #include "blackmisc/comparefunctions.h"
 #include <QtGlobal>
--- a/src/blackmisc/aviation/modulator.h
+++ b/src/blackmisc/aviation/modulator.h
@@ -11,7 +11,7 @@
 #ifndef BLACKMISC_AVIATION_MODULATORUNIT_H
 #define BLACKMISC_AVIATION_MODULATORUNIT_H

-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/pq/frequency.h"

 namespace BlackMisc
--- a/src/blackmisc/aviation/transponder.cpp
+++ b/src/blackmisc/aviation/transponder.cpp
@@ -7,7 +7,7 @@
 */

 #include "blackmisc/aviation/transponder.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/variant.h"

 #include <QRegularExpression>
--- a/src/blackmisc/aviation/transponder.h
+++ b/src/blackmisc/aviation/transponder.h
@@ -14,7 +14,7 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/dictionary.h"
 #include "blackmisc/metaclass.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/variant.h"

--- a/src/blackmisc/country.h
+++ b/src/blackmisc/country.h
@@ -13,7 +13,7 @@

 #include "blackmisc/db/datastore.h"
 #include "blackmisc/metaclass.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/variant.h"
 #include "blackmisc/blackmiscexport.h"
--- a/src/blackmisc/datacache.h
+++ b/src/blackmisc/datacache.h
@@ -14,7 +14,7 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/threadutils.h"
 #include "blackmisc/identifier.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/logcategories.h"
 #include "blackmisc/valuecache.h"
--- a/src/blackmisc/directories.h
+++ b/src/blackmisc/directories.h
@@ -13,7 +13,7 @@

 #include "blackmisc/settingscache.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/blackmiscexport.h"

 #include <QString>
--- a/src/blackmisc/geo/coordinategeodetic.cpp
+++ b/src/blackmisc/geo/coordinategeodetic.cpp
@@ -8,7 +8,7 @@

 #include "blackmisc/geo/coordinategeodetic.h"
 #include "blackmisc/logmessage.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/variant.h"
 #include "blackmisc/verify.h"

--- a/src/blackmisc/geo/coordinategeodetic.h
+++ b/src/blackmisc/geo/coordinategeodetic.h
@@ -19,7 +19,7 @@
 #include "blackmisc/pq/units.h"
 #include "blackmisc/math/mathutils.h"
 #include "blackmisc/metaclass.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/mixin/mixinstring.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/mixin/mixinmetatype.h"
--- a/src/blackmisc/geo/elevationplane.cpp
+++ b/src/blackmisc/geo/elevationplane.cpp
@@ -9,7 +9,7 @@
 #include "elevationplane.h"
 #include "coordinategeodetic.h"
 #include "blackmisc/pq/length.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"

 using namespace BlackMisc::Aviation;
 using namespace BlackMisc::PhysicalQuantities;
--- a/src/blackmisc/identifier.cpp
+++ b/src/blackmisc/identifier.cpp
@@ -9,7 +9,7 @@
 #include "blackmisc/identifier.h"
 #include "blackmisc/comparefunctions.h"
 #include "blackmisc/stringutils.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"

 #include <QCoreApplication>
 #include <QHostInfo>
--- a/src/blackmisc/input/actionhotkey.h
+++ b/src/blackmisc/input/actionhotkey.h
@@ -13,7 +13,7 @@

 #include "blackmisc/input/hotkeycombination.h"
 #include "blackmisc/metaclass.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/variant.h"
 #include "blackmisc/identifier.h"
--- a/src/blackmisc/input/joystickbutton.h
+++ b/src/blackmisc/input/joystickbutton.h
@@ -13,7 +13,7 @@

 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/metaclass.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/variant.h"

--- a/src/blackmisc/input/keyboardkey.cpp
+++ b/src/blackmisc/input/keyboardkey.cpp
@@ -13,7 +13,7 @@
 #include <QtDebug>
 #include <QtGlobal>

-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/variant.h"

 namespace BlackMisc
--- a/src/blackmisc/input/keyboardkey.h
+++ b/src/blackmisc/input/keyboardkey.h
@@ -14,7 +14,7 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/input/keycodes.h"
 #include "blackmisc/metaclass.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/variant.h"

--- a/src/blackmisc/mixin/mixinindex.h
+++ b/src/blackmisc/mixin/mixinindex.h
@@ -15,7 +15,6 @@
 #include "blackmisc/inheritancetraits.h"
 #include "blackmisc/predicates.h"
 #include "blackmisc/propertyindexref.h"
-#include "blackmisc/propertyindex.h"
 #include "blackmisc/variant.h"

 #include <QDBusArgument>
--- a/src/blackmisc/mixin/mixinmetatype.h
+++ b/src/blackmisc/mixin/mixinmetatype.h
@@ -12,6 +12,7 @@
 #define BLACKMISC_MIXIN_MIXINMETATYPE_H

 #include "blackmisc/inheritancetraits.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/variantprivate.h"
 #include <QMetaType>
 #include <QtGlobal>
--- a/src/blackmisc/namevariantpair.h
+++ b/src/blackmisc/namevariantpair.h
@@ -13,7 +13,7 @@

 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/metaclass.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/variant.h"

--- a/src/blackmisc/network/authenticateduser.cpp
+++ b/src/blackmisc/network/authenticateduser.cpp
@@ -9,7 +9,7 @@
 #include "blackmisc/network/authenticateduser.h"
 #include "blackmisc/icons.h"
 #include "blackmisc/logcategories.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/variant.h"

--- a/src/blackmisc/network/authenticateduser.h
+++ b/src/blackmisc/network/authenticateduser.h
@@ -16,7 +16,7 @@
 #include "blackmisc/db/datastore.h"
 #include "blackmisc/metaclass.h"
 #include "blackmisc/network/rolelist.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/statusmessagelist.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/variant.h"
--- a/src/blackmisc/network/client.h
+++ b/src/blackmisc/network/client.h
@@ -17,7 +17,7 @@
 #include "blackmisc/aviation/callsign.h"
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/metaclass.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/variant.h"
 #include <QMetaType>
--- a/src/blackmisc/network/fsdsetup.cpp
+++ b/src/blackmisc/network/fsdsetup.cpp
@@ -8,7 +8,7 @@

 #include "blackmisc/network/fsdsetup.h"
 #include "blackmisc/logcategories.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/stringutils.h"
 #include "blackmisc/variant.h"
--- a/src/blackmisc/network/fsdsetup.h
+++ b/src/blackmisc/network/fsdsetup.h
@@ -14,7 +14,7 @@
 #include "blackmisc/statusmessagelist.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/metaclass.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/blackmiscexport.h"

 #include <QMetaType>
--- a/src/blackmisc/network/rawfsdmessage.cpp
+++ b/src/blackmisc/network/rawfsdmessage.cpp
@@ -8,7 +8,7 @@

 #include "blackmisc/network/rawfsdmessage.h"
 #include "blackmisc/logcategories.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/stringutils.h"
 #include "blackmisc/variant.h"
--- a/src/blackmisc/network/rawfsdmessage.h
+++ b/src/blackmisc/network/rawfsdmessage.h
@@ -15,7 +15,7 @@
 #include "blackmisc/valueobject.h"
 #include "blackmisc/variant.h"
 #include "blackmisc/metaclass.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/blackmiscexport.h"

 #include <QDateTime>
--- a/src/blackmisc/network/remotefile.h
+++ b/src/blackmisc/network/remotefile.h
@@ -15,7 +15,7 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/timestampbased.h"
 #include "blackmisc/metaclass.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/variant.h"

--- a/src/blackmisc/network/role.h
+++ b/src/blackmisc/network/role.h
@@ -14,7 +14,7 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/db/datastore.h"
 #include "blackmisc/metaclass.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/variant.h"

--- a/src/blackmisc/network/server.cpp
+++ b/src/blackmisc/network/server.cpp
@@ -9,7 +9,7 @@
 #include "blackmisc/network/server.h"
 #include "blackmisc/logcategories.h"
 #include "blackmisc/stringutils.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/comparefunctions.h"
 #include "blackmisc/obfuscation.h"
--- a/src/blackmisc/network/server.h
+++ b/src/blackmisc/network/server.h
@@ -18,7 +18,7 @@
 #include "blackmisc/obfuscation.h"
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/metaclass.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/statusmessagelist.h"
 #include "blackmisc/timestampbased.h"
 #include "blackmisc/valueobject.h"
--- a/src/blackmisc/network/settings/networksettings.h
+++ b/src/blackmisc/network/settings/networksettings.h
@@ -11,7 +11,7 @@
 #ifndef BLACKMISC_NETWORK_SETTINGS_NETWORKSETTINGS_H
 #define BLACKMISC_NETWORK_SETTINGS_NETWORKSETTINGS_H

-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/metaclass.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/variant.h"
--- a/src/blackmisc/network/textmessage.h
+++ b/src/blackmisc/network/textmessage.h
@@ -16,7 +16,7 @@
 #include "blackmisc/metaclass.h"
 #include "blackmisc/pq/frequency.h"
 #include "blackmisc/pq/units.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/timestampbased.h"
 #include "blackmisc/valueobject.h"
--- a/src/blackmisc/network/url.cpp
+++ b/src/blackmisc/network/url.cpp
@@ -8,7 +8,7 @@

 #include "blackmisc/network/url.h"
 #include "blackmisc/network/networkutils.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"

 #include <QJsonValue>
 #include <QPair>
--- a/src/blackmisc/network/url.h
+++ b/src/blackmisc/network/url.h
@@ -12,7 +12,7 @@
 #define BLACKMISC_NETWORK_URL_H

 #include "blackmisc/metaclass.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/variant.h"
 #include "blackmisc/blackmiscexport.h"
--- a/src/blackmisc/network/urllog.cpp
+++ b/src/blackmisc/network/urllog.cpp
@@ -8,7 +8,7 @@

 #include "blackmisc/network/urllog.h"
 #include "blackmisc/network/networkutils.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/stringutils.h"

 #include <QJsonValue>
--- a/src/blackmisc/network/urllog.h
+++ b/src/blackmisc/network/urllog.h
@@ -15,7 +15,7 @@
 #include "blackmisc/timestampbased.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"

 #include <QJsonObject>
 #include <QString>
--- a/src/blackmisc/network/user.cpp
+++ b/src/blackmisc/network/user.cpp
@@ -8,7 +8,7 @@

 #include "blackmisc/network/user.h"
 #include "blackmisc/aviation/airporticaocode.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/stringutils.h"
 #include "blackmisc/variant.h"
--- a/src/blackmisc/network/user.h
+++ b/src/blackmisc/network/user.h
@@ -15,7 +15,7 @@
 #include "blackmisc/aviation/callsign.h"
 #include "blackmisc/obfuscation.h"
 #include "blackmisc/metaclass.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/statusmessagelist.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/variant.h"
--- a/src/blackmisc/orderable.h
+++ b/src/blackmisc/orderable.h
@@ -12,7 +12,7 @@
 #define BLACKMISC_ORDERABLE_H

 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/variant.h"

 #include <QString>
--- a/src/blackmisc/platform.h
+++ b/src/blackmisc/platform.h
@@ -13,7 +13,7 @@

 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/metaclass.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/variant.h"

--- a/src/blackmisc/pq/physicalquantity.cpp
+++ b/src/blackmisc/pq/physicalquantity.cpp
@@ -9,7 +9,7 @@
 #include "blackmisc/pq/measurementunit.h"
 #include "blackmisc/pq/physicalquantity.h"
 #include "blackmisc/pq/pqstring.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/pq/length.h"
 #include "blackmisc/pq/pressure.h"
 #include "blackmisc/pq/frequency.h"
--- a/src/blackmisc/pq/physicalquantity.h
+++ b/src/blackmisc/pq/physicalquantity.h
@@ -18,7 +18,7 @@
 #include "blackmisc/mixin/mixinjson.h"
 #include "blackmisc/pq/pqstring.h"
 #include "blackmisc/pq/units.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/mixin/mixinindex.h"
 #include "blackmisc/mixin/mixinstring.h"
 #include "blackmisc/mixin/mixinmetatype.h"
--- a/src/blackmisc/rgbcolor.h
+++ b/src/blackmisc/rgbcolor.h
@@ -13,7 +13,7 @@

 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/metaclass.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/variant.h"

--- a/src/blackmisc/simulation/aircraftmodel.h
+++ b/src/blackmisc/simulation/aircraftmodel.h
@@ -28,7 +28,7 @@
 #include "blackmisc/metaclass.h"
 #include "blackmisc/orderable.h"
 #include "blackmisc/pixmap.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/blackmiscexport.h"

 #include <QFlags>
--- a/src/blackmisc/simulation/airspaceaircraftsnapshot.h
+++ b/src/blackmisc/simulation/airspaceaircraftsnapshot.h
@@ -16,7 +16,7 @@
 #include "blackmisc/metaclass.h"
 #include "blackmisc/pq/length.h"
 #include "blackmisc/pq/units.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/simulation/simulatedaircraftlist.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/variant.h"
--- a/src/blackmisc/simulation/distributor.h
+++ b/src/blackmisc/simulation/distributor.h
@@ -15,7 +15,7 @@
 #include "blackmisc/db/datastore.h"
 #include "blackmisc/metaclass.h"
 #include "blackmisc/orderable.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/statusmessagelist.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/variant.h"
--- a/src/blackmisc/simulation/fscommon/aircraftcfgentries.h
+++ b/src/blackmisc/simulation/fscommon/aircraftcfgentries.h
@@ -13,7 +13,7 @@

 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/metaclass.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/simulation/aircraftmodel.h"
 #include "blackmisc/timestampbased.h"
 #include "blackmisc/valueobject.h"
--- a/src/blackmisc/simulation/fscommon/vpilotmodelrule.h
+++ b/src/blackmisc/simulation/fscommon/vpilotmodelrule.h
@@ -13,7 +13,7 @@

 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/metaclass.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/simulation/aircraftmodel.h"
 #include "blackmisc/timestampbased.h"
 #include "blackmisc/valueobject.h"
--- a/src/blackmisc/simulation/matchingstatistics.h
+++ b/src/blackmisc/simulation/matchingstatistics.h
@@ -14,6 +14,7 @@
 #include "matchingstatisticsentry.h"
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/timestampobjectlist.h"
+#include "blackmisc/sequence.h"
 #include "blackmisc/collection.h"
 #include "blackmisc/mixin/mixinmetatype.h"

--- a/src/blackmisc/simulation/settings/modelsettings.h
+++ b/src/blackmisc/simulation/settings/modelsettings.h
@@ -14,7 +14,7 @@
 #include "blackmisc/simulation/distributorlistpreferences.h"
 #include "blackmisc/settingscache.h"
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"

 namespace BlackMisc
 {
--- a/src/blackmisc/simulation/settings/simulatorsettings.h
+++ b/src/blackmisc/simulation/settings/simulatorsettings.h
@@ -18,7 +18,7 @@
 #include "blackmisc/pq/length.h"
 #include "blackmisc/settingscache.h"
 #include "blackmisc/statusmessage.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/directoryutils.h"
 #include "blackmisc/blackmiscexport.h"

--- a/src/blackmisc/simulation/settings/swiftpluginsettings.h
+++ b/src/blackmisc/simulation/settings/swiftpluginsettings.h
@@ -14,7 +14,7 @@
 #include "blackmisc/simulation/simulatorinfo.h"
 #include "blackmisc/simulation/aircraftmodel.h"
 #include "blackmisc/settingscache.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/blackmiscexport.h"

 namespace BlackMisc
--- a/src/blackmisc/simulation/simulatedaircraft.cpp
+++ b/src/blackmisc/simulation/simulatedaircraft.cpp
@@ -10,7 +10,7 @@
 #include "blackmisc/comparefunctions.h"
 #include "blackmisc/pq/constants.h"
 #include "blackmisc/verify.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/simulation/simulatedaircraft.h"
 #include "blackmisc/stringutils.h"
 #include <QStringBuilder>
--- a/src/blackmisc/simulation/simulatedaircraft.h
+++ b/src/blackmisc/simulation/simulatedaircraft.h
@@ -30,7 +30,7 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/mixin/mixincompare.h"
 #include "blackmisc/metaclass.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/variant.h"

--- a/src/blackmisc/simulation/simulatorinfo.h
+++ b/src/blackmisc/simulation/simulatorinfo.h
@@ -13,7 +13,7 @@

 #include "blackmisc/statusmessage.h"
 #include "blackmisc/metaclass.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/blackmiscexport.h"

--- a/src/blackmisc/simulation/simulatorinternals.h
+++ b/src/blackmisc/simulation/simulatorinternals.h
@@ -16,7 +16,7 @@
 #include "blackmisc/dictionary.h"
 #include "blackmisc/metaclass.h"
 #include "blackmisc/namevariantpairlist.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/variant.h"

--- a/src/blackmisc/simulation/xplane/navdatareference.h
+++ b/src/blackmisc/simulation/xplane/navdatareference.h
@@ -19,7 +19,7 @@
 #include "blackmisc/geo/longitude.h"
 #include "blackmisc/metaclass.h"
 #include "blackmisc/pq/length.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/sequence.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/variant.h"
--- a/src/blackmisc/statusmessage.cpp
+++ b/src/blackmisc/statusmessage.cpp
@@ -8,7 +8,7 @@

 #include "blackmisc/statusmessage.h"
 #include "blackmisc/statusexception.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/iconlist.h"
 #include "blackmisc/logpattern.h"
 #include "blackmisc/comparefunctions.h"
--- a/src/blackmisc/statusmessage.h
+++ b/src/blackmisc/statusmessage.h
@@ -15,7 +15,7 @@
 #include "blackmisc/timestampbased.h"
 #include "blackmisc/orderable.h"
 #include "blackmisc/mixin/mixinicon.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/mixin/mixinstring.h"
 #include "blackmisc/typetraits.h"
 #include "blackmisc/blackmiscexport.h"
--- a/src/blackmisc/test/testservice.h
+++ b/src/blackmisc/test/testservice.h
@@ -29,7 +29,7 @@
 #include "blackmisc/network/user.h"
 #include "blackmisc/pq/length.h"
 #include "blackmisc/pq/speed.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/propertyindexvariantmap.h"
 #include "blackmisc/variantlist.h"
 #include "blackmisc/simulation/fscommon/aircraftcfgentrieslist.h"
--- a/src/blackmisc/test/testserviceinterface.h
+++ b/src/blackmisc/test/testserviceinterface.h
@@ -29,7 +29,7 @@
 #include "blackmisc/network/user.h"
 #include "blackmisc/pq/length.h"
 #include "blackmisc/pq/speed.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/propertyindexvariantmap.h"
 #include "blackmisc/simulation/fscommon/aircraftcfgentrieslist.h"
 #include "blackmisc/simulation/simulatedaircraft.h"
--- a/src/blackmisc/timestampbased.h
+++ b/src/blackmisc/timestampbased.h
@@ -12,7 +12,7 @@
 #define BLACKMISC_TIMESTAMPBASED_H

 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/variant.h"

 #include <QDateTime>
--- a/src/blackmisc/valuecache.h
+++ b/src/blackmisc/valuecache.h
@@ -19,7 +19,7 @@
 #include "blackmisc/dictionary.h"
 #include "blackmisc/identifier.h"
 #include "blackmisc/metaclass.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/range.h"
 #include "blackmisc/slot.h"
 #include "blackmisc/statusmessagelist.h"
--- a/src/blackmisc/variant.cpp
+++ b/src/blackmisc/variant.cpp
@@ -12,7 +12,7 @@
 #include "blackmisc/imageutils.h"
 #include "blackmisc/dictionary.h"
 #include "blackmisc/logmessage.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/variantlist.h"
 #include "blackmisc/stringutils.h"
--- a/src/blackmisc/weather/cloudlayer.cpp
+++ b/src/blackmisc/weather/cloudlayer.cpp
@@ -7,7 +7,7 @@
 */

 #include "blackmisc/weather/cloudlayer.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/variant.h"

 #include <QHash>
--- a/src/blackmisc/weather/cloudlayer.h
+++ b/src/blackmisc/weather/cloudlayer.h
@@ -14,7 +14,7 @@
 #include "blackmisc/aviation/altitude.h"
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/metaclass.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/variant.h"

--- a/src/blackmisc/weather/gridpoint.cpp
+++ b/src/blackmisc/weather/gridpoint.cpp
@@ -7,7 +7,7 @@
 */

 #include "blackmisc/weather/gridpoint.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/variant.h"

 #include <QtDebug>
--- a/src/blackmisc/weather/gridpoint.h
+++ b/src/blackmisc/weather/gridpoint.h
@@ -20,7 +20,7 @@
 #include "blackmisc/pq/constants.h"
 #include "blackmisc/pq/units.h"
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/variant.h"
 #include "blackmisc/metaclass.h"
--- a/src/blackmisc/weather/presentweather.cpp
+++ b/src/blackmisc/weather/presentweather.cpp
@@ -7,7 +7,7 @@
 */

 #include "blackmisc/weather/presentweather.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/variant.h"

 namespace BlackMisc
--- a/src/blackmisc/weather/presentweather.h
+++ b/src/blackmisc/weather/presentweather.h
@@ -14,7 +14,7 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/dictionary.h"
 #include "blackmisc/metaclass.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/variant.h"

--- a/src/blackmisc/weather/temperaturelayer.cpp
+++ b/src/blackmisc/weather/temperaturelayer.cpp
@@ -7,7 +7,7 @@
 */

 #include "blackmisc/weather/temperaturelayer.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/variant.h"

 using namespace BlackMisc::Aviation;
--- a/src/blackmisc/weather/temperaturelayer.h
+++ b/src/blackmisc/weather/temperaturelayer.h
@@ -16,7 +16,7 @@
 #include "blackmisc/metaclass.h"
 #include "blackmisc/pq/temperature.h"
 #include "blackmisc/pq/units.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/variant.h"

--- a/src/blackmisc/weather/visibilitylayer.cpp
+++ b/src/blackmisc/weather/visibilitylayer.cpp
@@ -7,7 +7,7 @@
 */

 #include "blackmisc/weather/visibilitylayer.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/variant.h"

 using namespace BlackMisc::PhysicalQuantities;
--- a/src/blackmisc/weather/visibilitylayer.h
+++ b/src/blackmisc/weather/visibilitylayer.h
@@ -16,7 +16,7 @@
 #include "blackmisc/metaclass.h"
 #include "blackmisc/pq/length.h"
 #include "blackmisc/pq/units.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/variant.h"

--- a/src/blackmisc/weather/windlayer.cpp
+++ b/src/blackmisc/weather/windlayer.cpp
@@ -8,7 +8,7 @@

 #include "blackmisc/weather/windlayer.h"
 #include "blackmisc/pq/physicalquantity.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/variant.h"

 using namespace BlackMisc::PhysicalQuantities;
--- a/src/blackmisc/weather/windlayer.h
+++ b/src/blackmisc/weather/windlayer.h
@@ -16,7 +16,7 @@
 #include "blackmisc/metaclass.h"
 #include "blackmisc/pq/angle.h"
 #include "blackmisc/pq/speed.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/variant.h"