refs #628 Metaclass style compatible with the AStyle beautifier.

2026-04-06 09:57:06 +08:00 · 2016-04-06 15:15:12 +01:00
parent c934384622
commit 4e9d7d3efe
71 changed files with 142 additions and 71 deletions
--- 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)
            );
--- 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),
--- 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"),
--- 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"),
--- 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),
--- 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),
--- 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),
--- 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)
            );
        };
--- 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)
            );
        };
--- 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),
--- 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),
--- 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)
            );
        };
--- 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),
--- 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)
            );
        };
--- 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)
--- 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),
--- 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),
--- 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)
            );
        };
--- 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)
            );
        };
--- 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)
            );