diff --git a/src/blackcore/data/globalsetup.h b/src/blackcore/data/globalsetup.h
index 25dc84e55..11ca523d9 100644
--- a/src/blackcore/data/globalsetup.h
+++ b/src/blackcore/data/globalsetup.h
@@ -164,7 +164,8 @@ namespace BlackCore
             // transient members, to be switched on/off via GUI or set from reader
             bool m_dbDebugFlag = false; //!< can trigger DEBUG on the server, so you need to know what you are doing
 
-            BLACK_METACLASS(CGlobalSetup,
+            BLACK_METACLASS(
+                CGlobalSetup,
                 BLACK_METAMEMBER(wasLoaded),
                 BLACK_METAMEMBER(timestampMSecsSinceEpoch),
                 BLACK_METAMEMBER(dbRootDirectoryUrl),
diff --git a/src/blackcore/data/updateinfo.h b/src/blackcore/data/updateinfo.h
index e39c0e7ce..bd6816c26 100644
--- a/src/blackcore/data/updateinfo.h
+++ b/src/blackcore/data/updateinfo.h
@@ -99,7 +99,8 @@ namespace BlackCore
             QString                         m_latestVersionBeta;          //!< latest version
             QString                         m_lastSupportedVersionBeta;   //!< last supported version
 
-            BLACK_METACLASS(CUpdateInfo,
+            BLACK_METACLASS(
+                CUpdateInfo,
                 BLACK_METAMEMBER(timestampMSecsSinceEpoch),
                 BLACK_METAMEMBER(development),
                 BLACK_METAMEMBER(downloadsStableUrls),
diff --git a/src/blackcore/data/vatsimsetup.h b/src/blackcore/data/vatsimsetup.h
index 73f01405c..0e8584aac 100644
--- a/src/blackcore/data/vatsimsetup.h
+++ b/src/blackcore/data/vatsimsetup.h
@@ -103,7 +103,8 @@ namespace BlackCore
             BlackMisc::Network::CServerList m_voiceServers;   //!< voice servers
             BlackMisc::Network::CUser       m_lastLoginUser;  //!< last login user
 
-            BLACK_METACLASS(CVatsimSetup,
+            BLACK_METACLASS(
+                CVatsimSetup,
                 BLACK_METAMEMBER(serverFileUrls),
                 BLACK_METAMEMBER(dataFileUrls),
                 BLACK_METAMEMBER(metarFileUrls),
diff --git a/src/blackgui/components/data/lastselections.h b/src/blackgui/components/data/lastselections.h
index 687dc4667..ca8f2ea40 100644
--- a/src/blackgui/components/data/lastselections.h
+++ b/src/blackgui/components/data/lastselections.h
@@ -59,7 +59,8 @@ namespace BlackGui
             private:
                 BlackMisc::Simulation::CSimulatorInfo m_simulator; //!< Last simulator selection
 
-                BLACK_METACLASS(CDbOwnModelsComponent,
+                BLACK_METACLASS(
+                    CDbOwnModelsComponent,
                     BLACK_METAMEMBER(simulator)
                 );
             };
diff --git a/src/blackmisc/audio/audiodeviceinfo.h b/src/blackmisc/audio/audiodeviceinfo.h
index 3238173b8..91b2d55e7 100644
--- a/src/blackmisc/audio/audiodeviceinfo.h
+++ b/src/blackmisc/audio/audiodeviceinfo.h
@@ -86,7 +86,8 @@ namespace BlackMisc
             QString m_deviceName; //!< Device name
             QString m_hostName;   //!< We use a DBus based system. Hence an audio device can reside on a differen computers, this here is its name
 
-            BLACK_METACLASS(CAudioDeviceInfo,
+            BLACK_METACLASS(
+                CAudioDeviceInfo,
                 BLACK_METAMEMBER(type),
                 BLACK_METAMEMBER(deviceIndex),
                 BLACK_METAMEMBER(deviceName),
diff --git a/src/blackmisc/audio/settings/settingsaudio.h b/src/blackmisc/audio/settings/settingsaudio.h
index 6bd6a585a..0acc19488 100644
--- a/src/blackmisc/audio/settings/settingsaudio.h
+++ b/src/blackmisc/audio/settings/settingsaudio.h
@@ -50,7 +50,8 @@ namespace BlackMisc
                 QString m_notificationFlags;  //!< play notification for notification x, a little trick to use a string here (streamable, hashable, ..)
                 void initNotificationFlags(); //!< init flags
 
-                BLACK_METACLASS(CSettingsAudio,
+                BLACK_METACLASS(
+                    CSettingsAudio,
                     BLACK_METAMEMBER(notificationFlags)
                 );
             };
diff --git a/src/blackmisc/audio/voiceroom.h b/src/blackmisc/audio/voiceroom.h
index d595a0e73..b6a710718 100644
--- a/src/blackmisc/audio/voiceroom.h
+++ b/src/blackmisc/audio/voiceroom.h
@@ -109,7 +109,8 @@ namespace BlackMisc
             bool m_connected;
             bool m_audioPlaying;
 
-            BLACK_METACLASS(CVoiceRoom,
+            BLACK_METACLASS(
+                CVoiceRoom,
                 BLACK_METAMEMBER(hostname),
                 BLACK_METAMEMBER(channel),
                 BLACK_METAMEMBER(connected),
diff --git a/src/blackmisc/aviation/aircraftengine.h b/src/blackmisc/aviation/aircraftengine.h
index 618b10d01..22c54f4f8 100644
--- a/src/blackmisc/aviation/aircraftengine.h
+++ b/src/blackmisc/aviation/aircraftengine.h
@@ -49,7 +49,8 @@ namespace BlackMisc
             int m_number = 1;
             bool m_on = true;
 
-            BLACK_METACLASS(CAircraftEngine,
+            BLACK_METACLASS(
+                CAircraftEngine,
                 BLACK_METAMEMBER(number, 0, DisabledForJson),
                 BLACK_METAMEMBER(on)
             );
diff --git a/src/blackmisc/aviation/aircrafticaocode.h b/src/blackmisc/aviation/aircrafticaocode.h
index 244de735e..6048dda3c 100644
--- a/src/blackmisc/aviation/aircrafticaocode.h
+++ b/src/blackmisc/aviation/aircrafticaocode.h
@@ -273,7 +273,8 @@ namespace BlackMisc
             //! Create a combined string like L2J
             static QString createdCombinedString(const QString &type, int engineCount, const QString &engine);
 
-            BLACK_METACLASS(CAircraftIcaoCode,
+            BLACK_METACLASS(
+                CAircraftIcaoCode,
                 BLACK_METAMEMBER(dbKey),
                 BLACK_METAMEMBER(timestampMSecsSinceEpoch),
                 BLACK_METAMEMBER(designator),
diff --git a/src/blackmisc/aviation/aircraftlights.h b/src/blackmisc/aviation/aircraftlights.h
index ee0cf09c4..7e4e41a83 100644
--- a/src/blackmisc/aviation/aircraftlights.h
+++ b/src/blackmisc/aviation/aircraftlights.h
@@ -107,7 +107,8 @@ namespace BlackMisc
             bool m_navOn = false;
             bool m_logoOn = false;
 
-            BLACK_METACLASS(CAircraftLights,
+            BLACK_METACLASS(
+                CAircraftLights,
                 BLACK_METAMEMBER_NAMED(strobeOn, "strobe_on"),
                 BLACK_METAMEMBER_NAMED(landingOn, "landing_on"),
                 BLACK_METAMEMBER_NAMED(taxiOn, "taxi_on"),
diff --git a/src/blackmisc/aviation/aircraftparts.h b/src/blackmisc/aviation/aircraftparts.h
index 7207068b7..ed510b4a3 100644
--- a/src/blackmisc/aviation/aircraftparts.h
+++ b/src/blackmisc/aviation/aircraftparts.h
@@ -121,7 +121,8 @@ namespace BlackMisc
             bool m_spoilersOut  = false;
             bool m_isOnGround   = false;
 
-            BLACK_METACLASS(CAircraftParts,
+            BLACK_METACLASS(
+                CAircraftParts,
                 BLACK_METAMEMBER_NAMED(lights, "lights"),
                 BLACK_METAMEMBER_NAMED(gearDown, "gear_down"),
                 BLACK_METAMEMBER_NAMED(flapsPercentage, "flaps_pct"),
diff --git a/src/blackmisc/aviation/aircraftsituation.h b/src/blackmisc/aviation/aircraftsituation.h
index 39986c391..f7aad7459 100644
--- a/src/blackmisc/aviation/aircraftsituation.h
+++ b/src/blackmisc/aviation/aircraftsituation.h
@@ -155,7 +155,8 @@ namespace BlackMisc
             BlackMisc::PhysicalQuantities::CAngle m_bank;
             BlackMisc::PhysicalQuantities::CSpeed m_groundspeed;
 
-            BLACK_METACLASS(CAircraftSituation,
+            BLACK_METACLASS(
+                CAircraftSituation,
                 BLACK_METAMEMBER(correspondingCallsign),
                 BLACK_METAMEMBER(position),
                 BLACK_METAMEMBER(altitude),
diff --git a/src/blackmisc/aviation/airlineicaocode.h b/src/blackmisc/aviation/airlineicaocode.h
index f18eafc7c..b3c960f3b 100644
--- a/src/blackmisc/aviation/airlineicaocode.h
+++ b/src/blackmisc/aviation/airlineicaocode.h
@@ -186,7 +186,8 @@ namespace BlackMisc
             bool m_isOperating = true;      //!< still operating?
             bool m_isMilitary = false;      //!< air force or such
 
-            BLACK_METACLASS(CAirlineIcaoCode,
+            BLACK_METACLASS(
+                CAirlineIcaoCode,
                 BLACK_METAMEMBER(dbKey),
                 BLACK_METAMEMBER(timestampMSecsSinceEpoch),
                 BLACK_METAMEMBER(designator),
diff --git a/src/blackmisc/aviation/airport.h b/src/blackmisc/aviation/airport.h
index a7a952f01..2922ae0fc 100644
--- a/src/blackmisc/aviation/airport.h
+++ b/src/blackmisc/aviation/airport.h
@@ -119,7 +119,8 @@ namespace BlackMisc
             QString                             m_descriptiveName;
             BlackMisc::Geo::CCoordinateGeodetic m_position;
 
-            BLACK_METACLASS(CAirport,
+            BLACK_METACLASS(
+                CAirport,
                 BLACK_METAMEMBER(icao),
                 BLACK_METAMEMBER(descriptiveName),
                 BLACK_METAMEMBER(position),
diff --git a/src/blackmisc/aviation/airporticaocode.h b/src/blackmisc/aviation/airporticaocode.h
index b5c6d0e90..4d66c85de 100644
--- a/src/blackmisc/aviation/airporticaocode.h
+++ b/src/blackmisc/aviation/airporticaocode.h
@@ -59,7 +59,8 @@ namespace BlackMisc
         private:
             QString m_icaoCode;
 
-            BLACK_METACLASS(CAirportIcaoCode,
+            BLACK_METACLASS(
+                CAirportIcaoCode,
                 BLACK_METAMEMBER(icaoCode, 0, CaseInsensitiveComparison)
             );
         };
diff --git a/src/blackmisc/aviation/altitude.h b/src/blackmisc/aviation/altitude.h
index f76563999..f30599e89 100644
--- a/src/blackmisc/aviation/altitude.h
+++ b/src/blackmisc/aviation/altitude.h
@@ -103,7 +103,8 @@ namespace BlackMisc
         private:
             ReferenceDatum m_datum; //!< MSL or AGL?
 
-            BLACK_METACLASS(CAltitude,
+            BLACK_METACLASS(
+                CAltitude,
                 BLACK_METAMEMBER(datum)
             );
         };
diff --git a/src/blackmisc/aviation/atcstation.h b/src/blackmisc/aviation/atcstation.h
index e3341b182..73c97566f 100644
--- a/src/blackmisc/aviation/atcstation.h
+++ b/src/blackmisc/aviation/atcstation.h
@@ -258,7 +258,8 @@ namespace BlackMisc
             CInformationMessage m_metar { CInformationMessage::METAR };
             BlackMisc::Audio::CVoiceRoom              m_voiceRoom;
 
-            BLACK_METACLASS(CAtcStation,
+            BLACK_METACLASS(
+                CAtcStation,
                 BLACK_METAMEMBER(callsign),
                 BLACK_METAMEMBER(controller),
                 BLACK_METAMEMBER(frequency),
diff --git a/src/blackmisc/aviation/callsign.h b/src/blackmisc/aviation/callsign.h
index 8ce6ac13e..bde0f4a84 100644
--- a/src/blackmisc/aviation/callsign.h
+++ b/src/blackmisc/aviation/callsign.h
@@ -159,7 +159,8 @@ namespace BlackMisc
             QString  m_telephonyDesignator;
             TypeHint m_typeHint = NoHint;
 
-            BLACK_METACLASS(CCallsign,
+            BLACK_METACLASS(
+                CCallsign,
                 BLACK_METAMEMBER(callsign, 0, CaseInsensitiveComparison),
                 BLACK_METAMEMBER(callsignAsSet, 0, DisabledForComparison | DisabledForHashing),
                 BLACK_METAMEMBER(telephonyDesignator, 0, DisabledForComparison | DisabledForHashing),
diff --git a/src/blackmisc/aviation/comsystem.h b/src/blackmisc/aviation/comsystem.h
index 475bed72a..62064258c 100644
--- a/src/blackmisc/aviation/comsystem.h
+++ b/src/blackmisc/aviation/comsystem.h
@@ -166,7 +166,8 @@ namespace BlackMisc
             //! \remarks Just a helper method, that is why no CFrequency is returned
             static double channelSpacingToFrequencyKHz(ChannelSpacing channelSpacing);
 
-            BLACK_METACLASS(CComSystem,
+            BLACK_METACLASS(
+                CComSystem,
                 BLACK_METAMEMBER(channelSpacing)
             );
         };
diff --git a/src/blackmisc/aviation/flightplan.h b/src/blackmisc/aviation/flightplan.h
index ee6bf8d77..f94a3c16b 100644
--- a/src/blackmisc/aviation/flightplan.h
+++ b/src/blackmisc/aviation/flightplan.h
@@ -201,7 +201,8 @@ namespace BlackMisc
             QString m_remarks;
             QDateTime m_lastSentOrLoaded;
 
-            BLACK_METACLASS(CFlightPlan,
+            BLACK_METACLASS(
+                CFlightPlan,
                 BLACK_METAMEMBER(equipmentIcao),
                 BLACK_METAMEMBER(originAirportIcao),
                 BLACK_METAMEMBER(destinationAirportIcao),
diff --git a/src/blackmisc/aviation/heading.h b/src/blackmisc/aviation/heading.h
index 4577386bf..3f3c8d4e3 100644
--- a/src/blackmisc/aviation/heading.h
+++ b/src/blackmisc/aviation/heading.h
@@ -77,7 +77,8 @@ namespace BlackMisc
         private:
             ReferenceNorth m_north; //!< magnetic or true?
 
-            BLACK_METACLASS(CHeading,
+            BLACK_METACLASS(
+                CHeading,
                 BLACK_METAMEMBER(north)
             );
         };
diff --git a/src/blackmisc/aviation/informationmessage.h b/src/blackmisc/aviation/informationmessage.h
index 852e93445..dc0827eb3 100644
--- a/src/blackmisc/aviation/informationmessage.h
+++ b/src/blackmisc/aviation/informationmessage.h
@@ -97,7 +97,8 @@ namespace BlackMisc
             QString m_message;
             QDateTime m_receivedTimestamp;
 
-            BLACK_METACLASS(CInformationMessage,
+            BLACK_METACLASS(
+                CInformationMessage,
                 BLACK_METAMEMBER(type),
                 BLACK_METAMEMBER(message),
                 BLACK_METAMEMBER(receivedTimestamp)
diff --git a/src/blackmisc/aviation/livery.h b/src/blackmisc/aviation/livery.h
index d27f47d08..359692aff 100644
--- a/src/blackmisc/aviation/livery.h
+++ b/src/blackmisc/aviation/livery.h
@@ -165,7 +165,8 @@ namespace BlackMisc
             BlackMisc::CRgbColor m_colorTail;     //! color of tail
             bool m_military = false; //! Military livery?
 
-            BLACK_METACLASS(CLivery,
+            BLACK_METACLASS(
+                CLivery,
                 BLACK_METAMEMBER(dbKey),
                 BLACK_METAMEMBER(timestampMSecsSinceEpoch),
                 BLACK_METAMEMBER(airline),
diff --git a/src/blackmisc/aviation/modulator.h b/src/blackmisc/aviation/modulator.h
index 2013915d9..f60e7666c 100644
--- a/src/blackmisc/aviation/modulator.h
+++ b/src/blackmisc/aviation/modulator.h
@@ -149,7 +149,8 @@ namespace BlackMisc
             //! Easy access to derived class (CRTP template parameter)
             AVIO *derived();
 
-            BLACK_METACLASS(CModulator,
+            BLACK_METACLASS(
+                CModulator,
                 BLACK_METAMEMBER(name),
                 BLACK_METAMEMBER(frequencyActive),
                 BLACK_METAMEMBER(frequencyStandby),
diff --git a/src/blackmisc/aviation/selcal.h b/src/blackmisc/aviation/selcal.h
index e6cef17d4..508a617c0 100644
--- a/src/blackmisc/aviation/selcal.h
+++ b/src/blackmisc/aviation/selcal.h
@@ -78,7 +78,8 @@ namespace BlackMisc
             static QList<BlackMisc::PhysicalQuantities::CFrequency> frequencyEquivalents;
             static QStringList allCodePairs;
 
-            BLACK_METACLASS(CSelcal,
+            BLACK_METACLASS(
+                CSelcal,
                 BLACK_METAMEMBER(code)
             );
         };
diff --git a/src/blackmisc/aviation/track.h b/src/blackmisc/aviation/track.h
index 522cc0928..e24d14043 100644
--- a/src/blackmisc/aviation/track.h
+++ b/src/blackmisc/aviation/track.h
@@ -88,7 +88,8 @@ namespace BlackMisc
         private:
             ReferenceNorth m_north; //!< magnetic or true?
 
-            BLACK_METACLASS(CTrack,
+            BLACK_METACLASS(
+                CTrack,
                 BLACK_METAMEMBER(north)
             );
         };
diff --git a/src/blackmisc/aviation/transponder.h b/src/blackmisc/aviation/transponder.h
index 4d812c7b7..f41d5b31c 100644
--- a/src/blackmisc/aviation/transponder.h
+++ b/src/blackmisc/aviation/transponder.h
@@ -176,7 +176,8 @@ namespace BlackMisc
             int m_transponderCode;             //!< Transponder code
             TransponderMode m_transponderMode; //!< Transponder mode
 
-            BLACK_METACLASS(CTransponder,
+            BLACK_METACLASS(
+                CTransponder,
                 BLACK_METAMEMBER(transponderCode),
                 BLACK_METAMEMBER(transponderMode)
             );
diff --git a/src/blackmisc/country.h b/src/blackmisc/country.h
index f6a1d7a56..863edfb05 100644
--- a/src/blackmisc/country.h
+++ b/src/blackmisc/country.h
@@ -93,7 +93,8 @@ namespace BlackMisc
     private:
         QString m_name; //!< country name
 
-        BLACK_METACLASS(CCountry,
+        BLACK_METACLASS(
+            CCountry,
             BLACK_METAMEMBER(dbKey),
             BLACK_METAMEMBER(timestampMSecsSinceEpoch),
             BLACK_METAMEMBER(name)
diff --git a/src/blackmisc/geo/coordinategeodetic.h b/src/blackmisc/geo/coordinategeodetic.h
index 80e1f3b70..fa97ac4be 100644
--- a/src/blackmisc/geo/coordinategeodetic.h
+++ b/src/blackmisc/geo/coordinategeodetic.h
@@ -213,7 +213,8 @@ namespace BlackMisc
             double m_z = 0; //!< normal vector
             BlackMisc::PhysicalQuantities::CLength m_geodeticHeight { 0, BlackMisc::PhysicalQuantities::CLengthUnit::nullUnit() }; //!< height, ellipsoidal or geodetic height
 
-            BLACK_METACLASS(CCoordinateGeodetic,
+            BLACK_METACLASS(
+                CCoordinateGeodetic,
                 BLACK_METAMEMBER(x),
                 BLACK_METAMEMBER(y),
                 BLACK_METAMEMBER(z),
diff --git a/src/blackmisc/icon.h b/src/blackmisc/icon.h
index 762dbe8bd..22fbae846 100644
--- a/src/blackmisc/icon.h
+++ b/src/blackmisc/icon.h
@@ -130,7 +130,8 @@ namespace BlackMisc
         QString m_descriptiveText;  //!< what does it represent?
         QPixmap m_pixmap;           //!< Used with generated pixmaps, when not used with index
 
-        BLACK_METACLASS(CIcon,
+        BLACK_METACLASS(
+            CIcon,
             BLACK_METAMEMBER(index),
             BLACK_METAMEMBER(rotateDegrees, 0, DisabledForComparison | DisabledForHashing),
             BLACK_METAMEMBER(descriptiveText)
diff --git a/src/blackmisc/identifier.h b/src/blackmisc/identifier.h
index c206d0c5b..c49aa4cad 100644
--- a/src/blackmisc/identifier.h
+++ b/src/blackmisc/identifier.h
@@ -98,7 +98,8 @@ namespace BlackMisc
         QString m_processName;     //!< process name
         qint64 m_processId;        //!< PID
 
-        BLACK_METACLASS(CIdentifier,
+        BLACK_METACLASS(
+            CIdentifier,
             BLACK_METAMEMBER(name),
             BLACK_METAMEMBER(machineIdBase64),
             BLACK_METAMEMBER(machineName, 0, DisabledForComparison | DisabledForHashing),
diff --git a/src/blackmisc/input/actionhotkey.h b/src/blackmisc/input/actionhotkey.h
index 2ec20fe7e..7d80e514a 100644
--- a/src/blackmisc/input/actionhotkey.h
+++ b/src/blackmisc/input/actionhotkey.h
@@ -85,7 +85,8 @@ namespace BlackMisc
             CHotkeyCombination m_combination; //!< hotkey combination
             QString m_action; //!< hotkey action
 
-            BLACK_METACLASS(CActionHotkey,
+            BLACK_METACLASS(
+                CActionHotkey,
                 BLACK_METAMEMBER(identifier),
                 BLACK_METAMEMBER(combination),
                 BLACK_METAMEMBER(action)
diff --git a/src/blackmisc/input/hotkeycombination.h b/src/blackmisc/input/hotkeycombination.h
index 94d756c71..ed8b663bb 100644
--- a/src/blackmisc/input/hotkeycombination.h
+++ b/src/blackmisc/input/hotkeycombination.h
@@ -76,7 +76,8 @@ namespace BlackMisc
             CKeyboardKeyList m_keyboardKeys;
             CJoystickButtonList m_joystickButtons;
 
-            BLACK_METACLASS(CHotkeyCombination,
+            BLACK_METACLASS(
+                CHotkeyCombination,
                 BLACK_METAMEMBER(keyboardKeys),
                 BLACK_METAMEMBER(joystickButtons)
             );
diff --git a/src/blackmisc/input/joystickbutton.h b/src/blackmisc/input/joystickbutton.h
index ff6f5327f..7179ab6cb 100644
--- a/src/blackmisc/input/joystickbutton.h
+++ b/src/blackmisc/input/joystickbutton.h
@@ -76,7 +76,8 @@ namespace BlackMisc
 
             static constexpr int m_invalidIndex = -1;
 
-            BLACK_METACLASS(CJoystickButton,
+            BLACK_METACLASS(
+                CJoystickButton,
                 BLACK_METAMEMBER(buttonIndex)
             );
         };
diff --git a/src/blackmisc/input/keyboardkey.h b/src/blackmisc/input/keyboardkey.h
index b01e65772..e334961bb 100644
--- a/src/blackmisc/input/keyboardkey.h
+++ b/src/blackmisc/input/keyboardkey.h
@@ -86,7 +86,8 @@ namespace BlackMisc
 
             KeyCode m_keyCode; //!< Key code
 
-            BLACK_METACLASS(CKeyboardKey,
+            BLACK_METACLASS(
+                CKeyboardKey,
                 BLACK_METAMEMBER(keyCode)
             );
         };
diff --git a/src/blackmisc/logcategory.h b/src/blackmisc/logcategory.h
index 43be92f77..68695c420 100644
--- a/src/blackmisc/logcategory.h
+++ b/src/blackmisc/logcategory.h
@@ -160,7 +160,8 @@ namespace BlackMisc
     private:
         QString m_string;
 
-        BLACK_METACLASS(CLogCategory,
+        BLACK_METACLASS(
+            CLogCategory,
             BLACK_METAMEMBER(string)
         );
     };
diff --git a/src/blackmisc/logpattern.h b/src/blackmisc/logpattern.h
index 42c7d4c44..99672debf 100644
--- a/src/blackmisc/logpattern.h
+++ b/src/blackmisc/logpattern.h
@@ -121,7 +121,8 @@ namespace BlackMisc
 
         static const QHash<QString, CLogPattern> &allHumanReadablePatterns();
 
-        BLACK_METACLASS(CLogPattern,
+        BLACK_METACLASS(
+            CLogPattern,
             BLACK_METAMEMBER(severities),
             BLACK_METAMEMBER(strategy),
             BLACK_METAMEMBER(strings)
diff --git a/src/blackmisc/namevariantpair.h b/src/blackmisc/namevariantpair.h
index e56e1bcdb..6fac5090d 100644
--- a/src/blackmisc/namevariantpair.h
+++ b/src/blackmisc/namevariantpair.h
@@ -71,7 +71,8 @@ namespace BlackMisc
         CVariant m_variant;
         CIcon    m_icon; //!< optional icon
 
-        BLACK_METACLASS(CNameVariantPair,
+        BLACK_METACLASS(
+            CNameVariantPair,
             BLACK_METAMEMBER(name),
             BLACK_METAMEMBER(variant),
             BLACK_METAMEMBER(icon)
diff --git a/src/blackmisc/network/authenticateduser.h b/src/blackmisc/network/authenticateduser.h
index e94cb5e92..b3483eeeb 100644
--- a/src/blackmisc/network/authenticateduser.h
+++ b/src/blackmisc/network/authenticateduser.h
@@ -155,7 +155,8 @@ namespace BlackMisc
             bool                m_authenticated = false;
             CRoleList           m_roles;
 
-            BLACK_METACLASS(CAuthenticatedUser,
+            BLACK_METACLASS(
+                CAuthenticatedUser,
                 BLACK_METAMEMBER(dbKey),
                 BLACK_METAMEMBER(vatsimId),
                 BLACK_METAMEMBER(realname),
diff --git a/src/blackmisc/network/client.h b/src/blackmisc/network/client.h
index 2846fa6f6..1aa262a2a 100644
--- a/src/blackmisc/network/client.h
+++ b/src/blackmisc/network/client.h
@@ -136,7 +136,8 @@ namespace BlackMisc
             QString                                m_server;
             BlackMisc::Network::CVoiceCapabilities m_voiceCapabilities;
 
-            BLACK_METACLASS(CClient,
+            BLACK_METACLASS(
+                CClient,
                 BLACK_METAMEMBER(user),
                 BLACK_METAMEMBER(model),
                 BLACK_METAMEMBER(capabilities, 0, DisabledForComparison | DisabledForJson),
diff --git a/src/blackmisc/network/role.h b/src/blackmisc/network/role.h
index fb55102f4..7670d56f0 100644
--- a/src/blackmisc/network/role.h
+++ b/src/blackmisc/network/role.h
@@ -70,7 +70,8 @@ namespace BlackMisc
             QString m_name;
             QString m_description;
 
-            BLACK_METACLASS(CRole,
+            BLACK_METACLASS(
+                CRole,
                 BLACK_METAMEMBER(dbKey),
                 BLACK_METAMEMBER(name),
                 BLACK_METAMEMBER(description)
diff --git a/src/blackmisc/network/server.h b/src/blackmisc/network/server.h
index af6512a65..67c8e697b 100644
--- a/src/blackmisc/network/server.h
+++ b/src/blackmisc/network/server.h
@@ -114,7 +114,8 @@ namespace BlackMisc
             CUser   m_user;
             bool    m_isAcceptingConnections = true; //!< temp. disable server
 
-            BLACK_METACLASS(CServer,
+            BLACK_METACLASS(
+                CServer,
                 BLACK_METAMEMBER(name),
                 BLACK_METAMEMBER(description),
                 BLACK_METAMEMBER(address),
diff --git a/src/blackmisc/network/textmessage.h b/src/blackmisc/network/textmessage.h
index 8c472c845..f684c8e9b 100644
--- a/src/blackmisc/network/textmessage.h
+++ b/src/blackmisc/network/textmessage.h
@@ -169,7 +169,8 @@ namespace BlackMisc
             BlackMisc::PhysicalQuantities::CFrequency m_frequency {0, BlackMisc::PhysicalQuantities::CFrequencyUnit::nullUnit()};
             bool m_wasSent = false;
 
-            BLACK_METACLASS(CTextMessage,
+            BLACK_METACLASS(
+                CTextMessage,
                 BLACK_METAMEMBER(message),
                 BLACK_METAMEMBER(timestampMSecsSinceEpoch),
                 BLACK_METAMEMBER(senderCallsign),
diff --git a/src/blackmisc/network/url.h b/src/blackmisc/network/url.h
index 39e0b5095..9fc1fcdb7 100644
--- a/src/blackmisc/network/url.h
+++ b/src/blackmisc/network/url.h
@@ -162,7 +162,8 @@ namespace BlackMisc
 
             static QString stripQueryString(const QString query);
 
-            BLACK_METACLASS(CUrl,
+            BLACK_METACLASS(
+                CUrl,
                 BLACK_METAMEMBER(scheme),
                 BLACK_METAMEMBER(host),
                 BLACK_METAMEMBER(port),
diff --git a/src/blackmisc/network/user.h b/src/blackmisc/network/user.h
index d193eff48..4649292a3 100644
--- a/src/blackmisc/network/user.h
+++ b/src/blackmisc/network/user.h
@@ -151,7 +151,8 @@ namespace BlackMisc
             BlackMisc::Aviation::CCallsign m_callsign;
             BlackMisc::Aviation::CAirportIcaoCode m_homebase;
 
-            BLACK_METACLASS(CUser,
+            BLACK_METACLASS(
+                CUser,
                 BLACK_METAMEMBER(id),
                 BLACK_METAMEMBER(realname),
                 BLACK_METAMEMBER(email),
diff --git a/src/blackmisc/network/voicecapabilities.h b/src/blackmisc/network/voicecapabilities.h
index 09b45fbb1..4714a619b 100644
--- a/src/blackmisc/network/voicecapabilities.h
+++ b/src/blackmisc/network/voicecapabilities.h
@@ -74,7 +74,8 @@ namespace BlackMisc
             //! Capabilites from flight plans remarks such as "/V/"
             void setFromFlightPlanRemarks(const QString &flightPlanRemarks);
 
-            BLACK_METACLASS(CVoiceCapabilities,
+            BLACK_METACLASS(
+                CVoiceCapabilities,
                 BLACK_METAMEMBER(voiceCapabilities)
             );
         };
diff --git a/src/blackmisc/pixmap.h b/src/blackmisc/pixmap.h
index 10a0e7b04..9ec34c748 100644
--- a/src/blackmisc/pixmap.h
+++ b/src/blackmisc/pixmap.h
@@ -60,7 +60,8 @@ namespace BlackMisc
         mutable bool m_hasCachedPixmap = false; //!< pixmap? Mutable because of lazy initialization
         mutable QReadWriteLock m_lock;          //!< lock (because of mutable members)
 
-        BLACK_METACLASS(CPixmap,
+        BLACK_METACLASS(
+            CPixmap,
             BLACK_METAMEMBER(array)
         );
     };
diff --git a/src/blackmisc/pq/pqstring.h b/src/blackmisc/pq/pqstring.h
index 5503a6152..730e2c9e5 100644
--- a/src/blackmisc/pq/pqstring.h
+++ b/src/blackmisc/pq/pqstring.h
@@ -76,7 +76,8 @@ namespace BlackMisc
         private:
             QString m_string;
 
-            BLACK_METACLASS(CPqString,
+            BLACK_METACLASS(
+                CPqString,
                 BLACK_METAMEMBER(string)
             );
         };
diff --git a/src/blackmisc/propertyindex.h b/src/blackmisc/propertyindex.h
index bff4a2de9..3bb9b87e3 100644
--- a/src/blackmisc/propertyindex.h
+++ b/src/blackmisc/propertyindex.h
@@ -174,7 +174,8 @@ namespace BlackMisc
         //! Convert list to string
         void setIndexStringByList(const QList<int> &list);
 
-        BLACK_METACLASS(CPropertyIndex,
+        BLACK_METACLASS(
+            CPropertyIndex,
             BLACK_METAMEMBER(indexString)
         );
     };
diff --git a/src/blackmisc/rgbcolor.h b/src/blackmisc/rgbcolor.h
index ae5474123..f50d9a072 100644
--- a/src/blackmisc/rgbcolor.h
+++ b/src/blackmisc/rgbcolor.h
@@ -119,7 +119,8 @@ namespace BlackMisc
 
         static QString intToHex(int h, int digits = 2);
 
-        BLACK_METACLASS(CRgbColor,
+        BLACK_METACLASS(
+            CRgbColor,
             BLACK_METAMEMBER(r),
             BLACK_METAMEMBER(g),
             BLACK_METAMEMBER(b)
diff --git a/src/blackmisc/simulation/aircraftmodel.h b/src/blackmisc/simulation/aircraftmodel.h
index 04ccb6c80..9200aaf6d 100644
--- a/src/blackmisc/simulation/aircraftmodel.h
+++ b/src/blackmisc/simulation/aircraftmodel.h
@@ -300,7 +300,8 @@ namespace BlackMisc
             ModelType      m_modelType = TypeUnknown;              //!< model string is coming representing ...?
             ModelMode      m_modelMode = Include;                  //!< model mode (include / exclude)
 
-            BLACK_METACLASS(CAircraftModel,
+            BLACK_METACLASS(
+                CAircraftModel,
                 BLACK_METAMEMBER(dbKey),
                 BLACK_METAMEMBER(timestampMSecsSinceEpoch),
                 BLACK_METAMEMBER(callsign),
diff --git a/src/blackmisc/simulation/airspaceaircraftsnapshot.h b/src/blackmisc/simulation/airspaceaircraftsnapshot.h
index 50eb82fc2..c1a0cf088 100644
--- a/src/blackmisc/simulation/airspaceaircraftsnapshot.h
+++ b/src/blackmisc/simulation/airspaceaircraftsnapshot.h
@@ -103,7 +103,8 @@ namespace BlackMisc
             BlackMisc::Aviation::CCallsignSet m_vtolAircraftCallsignsByDistance;
             BlackMisc::Aviation::CCallsignSet m_enabledVtolAircraftCallsignsByDistance;
 
-            BLACK_METACLASS(CAirspaceAircraftSnapshot,
+            BLACK_METACLASS(
+                CAirspaceAircraftSnapshot,
                 BLACK_METAMEMBER(timestampMsSinceEpoch),
                 BLACK_METAMEMBER(aircraftCallsignsByDistance, 0, DisabledForComparison),
                 BLACK_METAMEMBER(enabledAircraftCallsignsByDistance, 0, DisabledForComparison),
diff --git a/src/blackmisc/simulation/distributor.h b/src/blackmisc/simulation/distributor.h
index b49f1b82d..8a7947d2d 100644
--- a/src/blackmisc/simulation/distributor.h
+++ b/src/blackmisc/simulation/distributor.h
@@ -107,7 +107,8 @@ namespace BlackMisc
             QString m_alias1;      //!< alias name
             QString m_alias2;      //!< alias name
 
-            BLACK_METACLASS(CDistributor,
+            BLACK_METACLASS(
+                CDistributor,
                 BLACK_METAMEMBER(dbKey, 0, CaseInsensitiveComparison),
                 BLACK_METAMEMBER(timestampMSecsSinceEpoch),
                 BLACK_METAMEMBER(description),
diff --git a/src/blackmisc/simulation/fscommon/aircraftcfgentries.h b/src/blackmisc/simulation/fscommon/aircraftcfgentries.h
index 844fc7625..a5e952344 100644
--- a/src/blackmisc/simulation/fscommon/aircraftcfgentries.h
+++ b/src/blackmisc/simulation/fscommon/aircraftcfgentries.h
@@ -172,7 +172,8 @@ namespace BlackMisc
                 QString m_createdBy;       //!< created by, "distributor"
                 bool m_rotorcraft = false; //!< hint if rotorcraft
 
-                BLACK_METACLASS(CAircraftCfgEntries,
+                BLACK_METACLASS(
+                    CAircraftCfgEntries,
                     BLACK_METAMEMBER(index),
                     BLACK_METAMEMBER(fileName),
                     BLACK_METAMEMBER(title),
diff --git a/src/blackmisc/simulation/fscommon/vpilotmodelrule.h b/src/blackmisc/simulation/fscommon/vpilotmodelrule.h
index ce5c8eaca..d32664011 100644
--- a/src/blackmisc/simulation/fscommon/vpilotmodelrule.h
+++ b/src/blackmisc/simulation/fscommon/vpilotmodelrule.h
@@ -92,7 +92,8 @@ namespace BlackMisc
                 QString m_callsignPrefix;      //!< callsign prefix, aka airline ICAO
                 qint64  m_updatedMsSinceEpoch; //!< updated when
 
-                BLACK_METACLASS(CVPilotModelRule,
+                BLACK_METACLASS(
+                    CVPilotModelRule,
                     BLACK_METAMEMBER(typeCode, 0, CaseInsensitiveComparison),
                     BLACK_METAMEMBER(callsignPrefix, 0, CaseInsensitiveComparison),
                     BLACK_METAMEMBER(modelName, 0, CaseInsensitiveComparison),
diff --git a/src/blackmisc/simulation/simulatedaircraft.h b/src/blackmisc/simulation/simulatedaircraft.h
index 9f6b7f1f2..0bb730bff 100644
--- a/src/blackmisc/simulation/simulatedaircraft.h
+++ b/src/blackmisc/simulation/simulatedaircraft.h
@@ -376,7 +376,8 @@ namespace BlackMisc
             //! Init, which syncronizes some denormalized values
             void init();
 
-            BLACK_METACLASS(CSimulatedAircraft,
+            BLACK_METACLASS(
+                CSimulatedAircraft,
                 BLACK_METAMEMBER(callsign),
                 BLACK_METAMEMBER(pilot),
                 BLACK_METAMEMBER(situation),
diff --git a/src/blackmisc/simulation/simulatorinfo.h b/src/blackmisc/simulation/simulatorinfo.h
index afc9c2ddf..59b732186 100644
--- a/src/blackmisc/simulation/simulatorinfo.h
+++ b/src/blackmisc/simulation/simulatorinfo.h
@@ -140,7 +140,8 @@ namespace BlackMisc
         private:
             int m_simulator = static_cast<int>(None);
 
-            BLACK_METACLASS(CSimulatorInfo,
+            BLACK_METACLASS(
+                CSimulatorInfo,
                 BLACK_METAMEMBER(simulator)
             );
         };
diff --git a/src/blackmisc/simulation/simulatorplugininfo.h b/src/blackmisc/simulation/simulatorplugininfo.h
index dd498cd05..3e832992e 100644
--- a/src/blackmisc/simulation/simulatorplugininfo.h
+++ b/src/blackmisc/simulation/simulatorplugininfo.h
@@ -66,7 +66,8 @@ namespace BlackMisc
             QString m_description;
             bool m_valid { false };
 
-            BLACK_METACLASS(CSimulatorPluginInfo,
+            BLACK_METACLASS(
+                CSimulatorPluginInfo,
                 BLACK_METAMEMBER(identifier, 0, CaseInsensitiveComparison),
                 BLACK_METAMEMBER(name, 0, DisabledForComparison | DisabledForHashing),
                 BLACK_METAMEMBER(simulator, 0, DisabledForComparison | DisabledForHashing),
diff --git a/src/blackmisc/simulation/simulatorsetup.h b/src/blackmisc/simulation/simulatorsetup.h
index 5e92c4366..3fb8227f3 100644
--- a/src/blackmisc/simulation/simulatorsetup.h
+++ b/src/blackmisc/simulation/simulatorsetup.h
@@ -74,7 +74,8 @@ namespace BlackMisc
         private:
             BlackMisc::CNameVariantPairList m_data;
 
-            BLACK_METACLASS(CSimulatorSetup,
+            BLACK_METACLASS(
+                CSimulatorSetup,
                 BLACK_METAMEMBER(data)
             );
         };
diff --git a/src/blackmisc/simulation/xplane/navdatareference.h b/src/blackmisc/simulation/xplane/navdatareference.h
index 22a1822be..1e0f7d352 100644
--- a/src/blackmisc/simulation/xplane/navdatareference.h
+++ b/src/blackmisc/simulation/xplane/navdatareference.h
@@ -59,7 +59,8 @@ namespace BlackMisc
                 int m_id = 0;
                 Geo::CCoordinateGeodetic m_position;
 
-                BLACK_METACLASS(CNavDataReference,
+                BLACK_METACLASS(
+                    CNavDataReference,
                     BLACK_METAMEMBER(id),
                     BLACK_METAMEMBER(position)
                 );
diff --git a/src/blackmisc/statusmessage.h b/src/blackmisc/statusmessage.h
index afe530d6e..e77984368 100644
--- a/src/blackmisc/statusmessage.h
+++ b/src/blackmisc/statusmessage.h
@@ -310,7 +310,8 @@ namespace BlackMisc
         mutable QVector<quintptr> m_handledByObjects;
         mutable QReadWriteLock    m_lock;  //!< lock (because of mutable members)
 
-        BLACK_METACLASS(CStatusMessage,
+        BLACK_METACLASS(
+            CStatusMessage,
             BLACK_METAMEMBER(categories),
             BLACK_METAMEMBER(severity),
             BLACK_METAMEMBER(message),
diff --git a/src/blackmisc/valuecache.h b/src/blackmisc/valuecache.h
index 529f7474d..d6ee64572 100644
--- a/src/blackmisc/valuecache.h
+++ b/src/blackmisc/valuecache.h
@@ -90,7 +90,8 @@ namespace BlackMisc
     private:
         bool m_saved = false;
 
-        BLACK_METACLASS(CValueCachePacket,
+        BLACK_METACLASS(
+            CValueCachePacket,
             BLACK_METAMEMBER(saved)
         );
     };
diff --git a/src/blackmisc/weather/cloudlayer.h b/src/blackmisc/weather/cloudlayer.h
index 2aad49adf..0de143a26 100644
--- a/src/blackmisc/weather/cloudlayer.h
+++ b/src/blackmisc/weather/cloudlayer.h
@@ -139,7 +139,8 @@ namespace BlackMisc
             Coverage m_coverage;
             int m_coveragePercent;
 
-            BLACK_METACLASS(CCloudLayer,
+            BLACK_METACLASS(
+                CCloudLayer,
                 BLACK_METAMEMBER(base),
                 BLACK_METAMEMBER(top),
                 BLACK_METAMEMBER(precipitationRate),
diff --git a/src/blackmisc/weather/gridpoint.h b/src/blackmisc/weather/gridpoint.h
index 8ca3b432b..cde2f6c42 100644
--- a/src/blackmisc/weather/gridpoint.h
+++ b/src/blackmisc/weather/gridpoint.h
@@ -105,7 +105,8 @@ namespace BlackMisc
             CVisibilityLayerList m_visibilityLayers;
             CWindLayerList m_windLayers;
 
-            BLACK_METACLASS(CGridPoint,
+            BLACK_METACLASS(
+                CGridPoint,
                 BLACK_METAMEMBER(latitude),
                 BLACK_METAMEMBER(longitude),
                 BLACK_METAMEMBER(cloudLayers),
diff --git a/src/blackmisc/weather/metar.h b/src/blackmisc/weather/metar.h
index 091e5f2cb..211cb29c4 100644
--- a/src/blackmisc/weather/metar.h
+++ b/src/blackmisc/weather/metar.h
@@ -154,7 +154,8 @@ namespace BlackMisc
             PhysicalQuantities::CTemperature m_dewPoint;
             PhysicalQuantities::CPressure m_altimeter;
 
-            BLACK_METACLASS(CMetar,
+            BLACK_METACLASS(
+                CMetar,
                 BLACK_METAMEMBER(metarMessage),
                 BLACK_METAMEMBER(reportType),
                 BLACK_METAMEMBER(airport),
diff --git a/src/blackmisc/weather/presentweather.h b/src/blackmisc/weather/presentweather.h
index 093d0ab9b..5cc0cf5af 100644
--- a/src/blackmisc/weather/presentweather.h
+++ b/src/blackmisc/weather/presentweather.h
@@ -128,7 +128,8 @@ namespace BlackMisc
             Descriptor m_descriptor = None;
             int m_weatherPhenomena;
 
-            BLACK_METACLASS(CPresentWeather,
+            BLACK_METACLASS(
+                CPresentWeather,
                 BLACK_METAMEMBER(intensity),
                 BLACK_METAMEMBER(descriptor),
                 BLACK_METAMEMBER(weatherPhenomena)
diff --git a/src/blackmisc/weather/temperaturelayer.h b/src/blackmisc/weather/temperaturelayer.h
index 160573edc..43107b152 100644
--- a/src/blackmisc/weather/temperaturelayer.h
+++ b/src/blackmisc/weather/temperaturelayer.h
@@ -85,7 +85,8 @@ namespace BlackMisc
             PhysicalQuantities::CTemperature m_dewPoint;
             double m_relativeHumidity = 0;
 
-            BLACK_METACLASS(CTemperatureLayer,
+            BLACK_METACLASS(
+                CTemperatureLayer,
                 BLACK_METAMEMBER(level),
                 BLACK_METAMEMBER(temperature),
                 BLACK_METAMEMBER(dewPoint),
diff --git a/src/blackmisc/weather/visibilitylayer.h b/src/blackmisc/weather/visibilitylayer.h
index f00570497..f77e1b251 100644
--- a/src/blackmisc/weather/visibilitylayer.h
+++ b/src/blackmisc/weather/visibilitylayer.h
@@ -76,7 +76,8 @@ namespace BlackMisc
             BlackMisc::Aviation::CAltitude m_top;
             PhysicalQuantities::CLength m_visibility;
 
-            BLACK_METACLASS(CVisibilityLayer,
+            BLACK_METACLASS(
+                CVisibilityLayer,
                 BLACK_METAMEMBER(base),
                 BLACK_METAMEMBER(top),
                 BLACK_METAMEMBER(visibility)
diff --git a/src/blackmisc/weather/weatherdataplugininfo.h b/src/blackmisc/weather/weatherdataplugininfo.h
index 9b52e5b3a..5868659b3 100644
--- a/src/blackmisc/weather/weatherdataplugininfo.h
+++ b/src/blackmisc/weather/weatherdataplugininfo.h
@@ -57,7 +57,8 @@ namespace BlackMisc
             QString m_description;
             bool m_valid { false };
 
-            BLACK_METACLASS(CWeatherDataPluginInfo,
+            BLACK_METACLASS(
+                CWeatherDataPluginInfo,
                 BLACK_METAMEMBER(identifier, 0, CaseInsensitiveComparison),
                 BLACK_METAMEMBER(name, 0, DisabledForComparison | DisabledForHashing),
                 BLACK_METAMEMBER(description, 0, DisabledForComparison | DisabledForHashing),
diff --git a/src/blackmisc/weather/windlayer.h b/src/blackmisc/weather/windlayer.h
index 0f7e79bc8..acef5711a 100644
--- a/src/blackmisc/weather/windlayer.h
+++ b/src/blackmisc/weather/windlayer.h
@@ -117,7 +117,8 @@ namespace BlackMisc
             PhysicalQuantities::CSpeed m_speed;
             PhysicalQuantities::CSpeed m_gustSpeed;
 
-            BLACK_METACLASS(CWindLayer,
+            BLACK_METACLASS(
+                CWindLayer,
                 BLACK_METAMEMBER(level),
                 BLACK_METAMEMBER(directionMain),
                 BLACK_METAMEMBER(directionFrom),
diff --git a/tests/blackmisc/testvalueobject.h b/tests/blackmisc/testvalueobject.h
index d912297cf..37492d5cc 100644
--- a/tests/blackmisc/testvalueobject.h
+++ b/tests/blackmisc/testvalueobject.h
@@ -68,7 +68,8 @@ namespace BlackMisc
         QString m_name;
         QString m_description;
 
-        BLACK_METACLASS(CTestValueObject,
+        BLACK_METACLASS(
+            CTestValueObject,
             BLACK_METAMEMBER(name),
             BLACK_METAMEMBER(description)
         );