SGSubsystem classes: Whitespace standardisation of the declarations.

This is a clean up commit prior to the subsystem API standardisation to simplify
the diffs.  It includes all SGSubsystem and SGSubsystemGroup derived classes.

docs-mini/README.introduction

@@ -54,7 +54,6 @@ SGSubsystem and define at least a small set of functions:
     class FGFX : public SGSubsystem
     {
     public:
-
         FGFX();
         virtual ~FGFX();
 
@@ -63,7 +62,7 @@ SGSubsystem and define at least a small set of functions:
         virtual void bind();
         virtual void unbind();
         virtual void update(double dt);
-    }
+    };
 
 The init() functions should make sure everything is set and ready so the
 update() function can be run by the main loop. The reinit() function handles

src/AIModel/AIManager.hxx

@@ -37,7 +37,6 @@ typedef SGSharedPtr<FGAIBase> FGAIBasePtr;
 
 class FGAIManager : public SGSubsystem
 {
-
 public:
     FGAIManager();
     virtual ~FGAIManager();
@@ -108,6 +107,7 @@ public:
 
     double radarRangeM() const
     { return _radarRangeM; }
+
 private:
     // FGSubmodelMgr is a friend for access to the AI_list
     friend class FGSubmodelMgr;

src/AIModel/performancedb.hxx

@@ -41,6 +41,7 @@ public:
     PerformanceData* getDefaultPerformance() const;
 
     static const char* subsystemName() { return "aircraft-performance-db"; }
+
 private:
     void load(const SGPath& path);
 

src/AIModel/submodel.hxx

@@ -19,11 +19,10 @@
 class FGAIBase;
 class FGAIManager;
 
-class FGSubmodelMgr : public SGSubsystem, public SGPropertyChangeListener
+class FGSubmodelMgr : public SGSubsystem,
+                      public SGPropertyChangeListener
 {
-
 public:
-
     typedef struct {
         SGPropertyNode_ptr trigger_node;
         SGPropertyNode_ptr prop;
@@ -107,7 +106,6 @@ public:
     void shutdown() override;
 
 private:
-
     typedef std::vector <submodel*> submodel_vector_type;
     typedef submodel_vector_type::iterator submodel_vector_iterator;
 
@@ -186,7 +184,6 @@ private:
 
     SGVec3d getCartOffsetPos(submodel* sm) const;
     void setOffsetPos(submodel* sm);
-
 };
 
 #endif // __SYSTEMS_SUBMODEL_HXX

src/Aircraft/FlightHistory.hxx

@@ -31,13 +31,15 @@
 
 typedef std::vector<SGGeod> SGGeodVec;
 
-class PagedPathForHistory : public SGReferenced {
+class PagedPathForHistory : public SGReferenced
+{
 public:
     PagedPathForHistory() : last_seen(0) {}
     virtual ~PagedPathForHistory() {}
     SGGeodVec path;
     time_t last_seen;
 };
+
 typedef SGSharedPtr<PagedPathForHistory> PagedPathForHistory_ptr;
 
 const unsigned int SAMPLE_BUCKET_WIDTH = 1024;
@@ -88,7 +90,6 @@ private:
     };
 
 
-    
     /**
      * Bucket is a fixed-size container of samples. This is a crude slab
      * allocation of samples, in chunks defined by the width constant above.

src/Aircraft/controls.hxx

@@ -31,9 +31,7 @@
 
 class FGControls : public SGSubsystem
 {
-
 public:
-
     enum {
         ALL_ENGINES = -1,
         MAX_ENGINES = 12
@@ -251,12 +249,11 @@ private:
     int vertical_mode;
     int lateral_mode;
 
-
     SGPropertyNode_ptr auto_coordination;
     SGPropertyNode_ptr auto_coordination_factor;
     simgear::TiedPropertyList _tiedProperties;
-public:
 
+public:
     FGControls();
     ~FGControls();
 
@@ -640,6 +637,7 @@ public:
     void set_autopilot_engage( int ap, bool val );
 
     static const char* subsystemName() { return "controls"; }
+
 private:
     inline void do_autocoordination() {
         // check for autocoordination
@@ -650,7 +648,6 @@ private:
     }
 };
 
-
 #endif // _CONTROLS_HXX
 
 

src/Airports/airportdynamicsmanager.hxx

@@ -50,6 +50,7 @@ public:
     FGAirportDynamicsRef dynamicsForICAO(const std::string& icao);
 
     static const char* subsystemName() { return "airport-dynamics"; }
+
 private:
     typedef std::map<std::string, FGAirportDynamicsRef> ICAODynamicsDict;
     ICAODynamicsDict m_dynamics;

src/Autopilot/analogcomponent.hxx

@@ -40,8 +40,8 @@ namespace FGXMLAutopilot {
  *   <li>an optional periodical definition</li>
  * </ul>
  */
-class AnalogComponent : public Component {
-
+class AnalogComponent : public Component
+{
 private:
     /**
      * @brief a flag signalling that the output property value shall be fed back

src/Autopilot/autopilot.cxx

@@ -50,18 +50,15 @@ class StateMachineComponent : public Component
 {
 public:
     StateMachineComponent( SGPropertyNode& props_root,
-                         SGPropertyNode& cfg )
-  {
+                           SGPropertyNode& cfg ) {
         inner = simgear::StateMachine::createFromPlist(&cfg, &props_root);
     }
 
-  virtual bool configure( const std::string & nodeName, SGPropertyNode_ptr config)
-  {
+    virtual bool configure( const std::string & nodeName, SGPropertyNode_ptr config) {
         return false;
     }
     
-  virtual void update( bool firstTime, double dt )
-  {
+    virtual void update( bool firstTime, double dt ) {
         SG_UNUSED(firstTime);
         inner->update(dt);
     }

src/Autopilot/autopilotgroup.cxx

@@ -40,8 +40,7 @@ using std::vector;
 using simgear::PropertyList;
 using FGXMLAutopilot::Autopilot;
 
-class FGXMLAutopilotGroupImplementation:
-  public FGXMLAutopilotGroup
+class FGXMLAutopilotGroupImplementation : public FGXMLAutopilotGroup
 {
 public:
     FGXMLAutopilotGroupImplementation(const std::string& nodeName):
@@ -60,7 +59,6 @@ class FGXMLAutopilotGroupImplementation:
 private:
     void initFrom( SGPropertyNode_ptr rootNode, const char * childName );
     std::string _nodeName;
-
 };
 
 //------------------------------------------------------------------------------

src/Autopilot/autopilotgroup.hxx

@@ -36,9 +36,9 @@ public:
     void addAutopilotFromFile( const std::string & name, SGPropertyNode_ptr apNode, const char * path );
     virtual void addAutopilot( const std::string & name, SGPropertyNode_ptr apNode, SGPropertyNode_ptr config ) = 0;
     virtual void removeAutopilot( const std::string & name ) = 0;
+
 protected:
     FGXMLAutopilotGroup() : SGSubsystemGroup("FGXMLAutopilotGroup") {}
-
 };
 
 #endif // _XMLAUTO_HXX

src/Autopilot/component.hxx

@@ -35,17 +35,15 @@ namespace FGXMLAutopilot {
 /**
  * @brief Base class for other autopilot components
  */
-class Component : public SGSubsystem {
-
+class Component : public SGSubsystem
+{
 private:
-
     SGSharedPtr<const SGCondition> _condition;
     SGPropertyNode_ptr _enable_prop;
     std::string * _enable_value;
     bool _enabled;
 
 protected:
-
     virtual bool configure( SGPropertyNode& cfg_node,
                             const std::string& cfg_name,
                             SGPropertyNode& prop_root );
@@ -85,7 +83,6 @@ protected:
     bool _honor_passive;
 
 public:
-    
     /**
      * @brief A constructor for an empty Component.
      */
@@ -139,6 +136,6 @@ public:
     bool isPropertyEnabled();
 };
 
-
 }
+
 #endif // COMPONENT_HXX

src/Autopilot/digitalcomponent.hxx

@@ -90,11 +90,13 @@ typedef SGSharedPtr<DigitalOutput> DigitalOutput_ptr;
  *   <li>any number of output properties</li>
  * </ul>
  */
-class DigitalComponent : public Component {
+class DigitalComponent : public Component
+{
 public:
     DigitalComponent();
 
-    class InputMap : public std::map<const std::string,SGSharedPtr<const SGCondition> > {
+    class InputMap : public std::map<const std::string,SGSharedPtr<const SGCondition> >
+    {
     public:
         bool get_value( const std::string & name ) const;
     };

src/Autopilot/digitalfilter.hxx

@@ -64,7 +64,6 @@ public:
 
     virtual bool configure( SGPropertyNode& prop_root,
                             SGPropertyNode& cfg );
-
 };
 
 } // namespace FGXMLAutopilot

src/Autopilot/flipflop.hxx

@@ -63,8 +63,10 @@ public:
 /**
  * @brief A simple flipflop implementation
  */
-class FlipFlop : public Logic {
+class FlipFlop : public Logic
+{
 public:
+
 protected:
     /**
      * @brief Over-rideable hook method to allow derived classes to refine top-level
@@ -92,7 +94,6 @@ private:
     * @brief Pointer to the actual flip flop implementation
     */
     SGSharedPtr<FlipFlopImplementation> _implementation;
-
 };
 
 }

src/Autopilot/logic.hxx

@@ -32,11 +32,13 @@ namespace FGXMLAutopilot {
 /**
  * @brief A simple logic class writing <condition> to a property
  */
-class Logic : public DigitalComponent {
+class Logic : public DigitalComponent
+{
 public:
     bool get_input() const;
     void set_output( bool value );
     bool get_output() const;
+
 protected:
     void update( bool firstTime, double dt );
 };

src/Autopilot/pidcontroller.hxx

@@ -37,8 +37,8 @@ namespace FGXMLAutopilot {
 /**
  * Roy Ovesen's PID controller
  */
-class PIDController : public AnalogComponent {
-
+class PIDController : public AnalogComponent
+{
 private:
     // Configuration values
     InputValueList Kp;          // proportional gain
@@ -65,6 +65,7 @@ protected:
     virtual bool configure( SGPropertyNode& cfg_node,
                             const std::string& cfg_name,
                             SGPropertyNode& prop_root );
+
 public:
     PIDController();
     ~PIDController() {}

src/Autopilot/pisimplecontroller.hxx

@@ -37,10 +37,10 @@ namespace FGXMLAutopilot {
 /**
  * A simplistic P [ + I ] PI controller
  */
-class PISimpleController : public AnalogComponent {
+class PISimpleController : public AnalogComponent
+{
 
 private:
-
     // proportional component data
     InputValueList _Kp;
 
@@ -54,7 +54,6 @@ protected:
                             SGPropertyNode& prop_root );
 
 public:
-
     PISimpleController();
     ~PISimpleController() {}
 

src/Autopilot/predictor.hxx

@@ -44,8 +44,8 @@ namespace FGXMLAutopilot {
  *   0.1 would mean (9 parts past value + 1 part current value) / 10
  *   0.25 would mean (3 parts past value + 1 part current value) / 4
  */
-class Predictor : public AnalogComponent {
-
+class Predictor : public AnalogComponent
+{
 private:
     double _last_value;
     double _average;

src/Autopilot/route_mgr.hxx

@@ -101,6 +101,7 @@ public:
     flightgear::WayptRef waypointFromString(const std::string& target);
 
     static const char* subsystemName() { return "route-manager"; }
+
 private:
     bool commandDefineUserWaypoint(const SGPropertyNode * arg, SGPropertyNode * root);
     bool commandDeleteUserWaypoint(const SGPropertyNode * arg, SGPropertyNode * root);
@@ -226,5 +227,4 @@ private:
     void setAlternate(const std::string &icao);
 };
 
-
 #endif // _ROUTE_MGR_HXX

src/Canvas/canvas_mgr.hxx

@@ -22,8 +22,7 @@
 #include <simgear/canvas/CanvasMgr.hxx>
 #include <simgear/props/PropertyBasedMgr.hxx>
 
-class CanvasMgr:
-  public simgear::canvas::CanvasMgr
+class CanvasMgr : public simgear::canvas::CanvasMgr
 {
 public:
     CanvasMgr();
@@ -43,6 +42,7 @@ class CanvasMgr:
     unsigned int getCanvasTexId(const simgear::canvas::CanvasPtr& canvas) const;
 
     static const char* subsystemName() { return "Canvas"; }
+
 protected:
 
     osg::observer_ptr<osg::Camera>      _gui_camera;

src/Canvas/gui_mgr.hxx

@@ -34,8 +34,7 @@ namespace osgGA
 }
 
 class GUIEventHandler;
-class GUIMgr:
-  public SGSubsystem
+class GUIMgr : public SGSubsystem
 {
 public:
     GUIMgr();
@@ -69,7 +68,6 @@ class GUIMgr:
     void ungrabPointer(const simgear::canvas::WindowPtr& window);
 
 protected:
-
     simgear::canvas::GroupPtr           _desktop;
     osg::ref_ptr<GUIEventHandler>       _event_handler;
 

src/Cockpit/NavDisplay.hxx

@@ -78,6 +78,7 @@ public:
 
     bool anyRuleForType(const std::string& type) const;
     bool isPositionedShown(FGPositioned* pos);
+
 protected:
     std::string _name;
     int _num;
@@ -145,7 +146,6 @@ private:
     SGPropertyNode_ptr _Radar_controls;
 
 
-    
     SGPropertyNode_ptr _font_node;
     SGPropertyNode_ptr _ai_enabled_node;
     SGPropertyNode_ptr _navRadio1Node;

src/Cockpit/agradar.hxx

@@ -30,9 +30,9 @@
 
 #include "wxradar.hxx"
 
-class agRadar : public wxRadarBg{
+class agRadar : public wxRadarBg
+{
 public:
-
     agRadar ( SGPropertyNode *node );
     agRadar ();
     virtual ~agRadar ();

src/Cockpit/cockpitDisplayManager.hxx

@@ -36,7 +36,6 @@ namespace flightgear
 class CockpitDisplayManager : public SGSubsystemGroup
 {
 public:
-
     CockpitDisplayManager ();
     virtual ~CockpitDisplayManager ();
 

src/Cockpit/groundradar.hxx

@@ -36,7 +36,9 @@ class FGPavement;
 // Built-in layer for the atc radar.
 ////////////////////////////////////////////////////////////////////////
 
-class GroundRadar : public SGSubsystem, public SGPropertyChangeListener, private FGODGauge
+class GroundRadar : public SGSubsystem,
+                    public SGPropertyChangeListener,
+                    private FGODGauge
 {
 public:
     static const int TextureHalfSize = 256;
@@ -45,6 +47,7 @@ public:
     void updateTexture();
     virtual void valueChanged(SGPropertyNode*);
     virtual void update (double dt);
+
 protected:
     void createTexture(const char* texture_name);
 

src/Cockpit/wxradar.hxx

@@ -36,9 +36,10 @@
 
 class FGODGauge;
 
-class wxRadarBg : public SGSubsystem, public SGPropertyChangeListener {
+class wxRadarBg : public SGSubsystem,
+                  public SGPropertyChangeListener
+{
 public:
-
     wxRadarBg(SGPropertyNode *node);
     wxRadarBg();
     virtual ~wxRadarBg();
@@ -200,5 +201,4 @@ SGPropertyNode *wxRadarBg::getInstrumentNode(const char *name, const char *value
     return result;
 }
 
-
 #endif // _INST_WXRADAR_HXX

src/Environment/environment_ctrl.hxx

@@ -25,10 +25,13 @@
 #include <simgear/structure/subsystem_mgr.hxx>
 
 namespace Environment {
-    class LayerInterpolateController : public SGSubsystem {
+
+class LayerInterpolateController : public SGSubsystem
+{
 public:
     static LayerInterpolateController * createInstance( SGPropertyNode_ptr rootNode );
 };
+
 } // namespace
 
 #endif // _ENVIRONMENT_CTRL_HXX

src/Environment/environment_mgr.hxx

@@ -38,9 +38,7 @@ class SGSky;
  */
 class FGEnvironmentMgr : public SGSubsystemGroup
 {
-
 public:
-
     enum {
         MAX_CLOUD_LAYERS = 5
     };
@@ -60,7 +58,6 @@ public:
      */
     virtual FGEnvironment getEnvironment () const;
 
-
     /**
      * Get the environment information for another location.
      */
@@ -68,6 +65,7 @@ public:
                                           double alt) const;
 
     virtual FGEnvironment getEnvironment(const SGGeod& aPos) const;
+
 private:
     void updateClosestAirport();
 

src/Environment/ephemeris.hxx

@@ -36,7 +36,6 @@ class SGPropertyNode;
 class Ephemeris : public SGSubsystem
 {
 public:
-
     Ephemeris();
     ~Ephemeris();
 
@@ -50,6 +49,7 @@ public:
     static const char* subsystemName() { return "ephemeris"; }
 
     SGEphemeris* data();
+
 private:
     std::unique_ptr<SGEphemeris> _impl;
     SGPropertyNode_ptr _latProp;
@@ -57,4 +57,3 @@ private:
 };
 
 #endif // of FG_ENVIRONMENT_EPHEMERIS_HXX
-

src/Environment/realwx_ctrl.cxx

@@ -171,6 +171,7 @@ public:
 
     typedef std::vector<LiveMetarProperties_ptr> MetarPropertiesList;
     MetarPropertiesList::iterator findMetarAtPath(const string &propPath);
+
 protected:
     void bind();
     void unbind();
@@ -189,7 +190,6 @@ protected:
     simgear::TiedPropertyList _tiedProperties;
     MetarPropertiesList _metarProperties;
     MetarRequester* _requester;
-
 };
 
 static bool commandRequestMetar(const SGPropertyNode * arg, SGPropertyNode * root)
@@ -400,7 +400,8 @@ void BasicRealWxController::checkNearbyMetar()
 
 /* -------------------------------------------------------------------------------- */
 
-class NoaaMetarRealWxController : public BasicRealWxController, MetarRequester {
+class NoaaMetarRealWxController : public BasicRealWxController, MetarRequester
+{
 public:
     NoaaMetarRealWxController( SGPropertyNode_ptr rootNode );
 
@@ -410,6 +411,7 @@ public:
     virtual ~NoaaMetarRealWxController()
     {
     }
+
 private:
     std::string noaa_base_url;
 };

src/Environment/realwx_ctrl.hxx

@@ -25,7 +25,9 @@
 
 #include <simgear/structure/subsystem_mgr.hxx>
 #include <simgear/props/props.hxx>
+
 namespace Environment {
+
 class RealWxController : public SGSubsystem
 {
 public:

src/Environment/ridge_lift.hxx

@@ -38,9 +38,9 @@ using std::string;
 
 #include <simgear/props/tiedpropertylist.hxx>
 
-class FGRidgeLift : public SGSubsystem {
+class FGRidgeLift : public SGSubsystem
+{
 public:
-
     FGRidgeLift();
     ~FGRidgeLift();
 

src/Environment/terrainsampler.cxx

@@ -40,10 +40,12 @@ using std::string;
 #include <simgear/props/tiedpropertylist.hxx>
 
 namespace Environment {
+
 /**
  * @brief Class for presampling the terrain roughness
  */
-class AreaSampler : public SGSubsystem {
+class AreaSampler : public SGSubsystem
+{
 public:
     AreaSampler( SGPropertyNode_ptr rootNode );
     virtual ~AreaSampler();
@@ -327,6 +329,7 @@ public:
     virtual void bind();
     virtual void unbind();
     virtual void update (double delta_time_sec);
+
 private:
     inline string areaSubsystemName( unsigned i ) {
         ostringstream name;

src/Environment/terrainsampler.hxx

@@ -26,6 +26,7 @@
 #include <simgear/structure/subsystem_mgr.hxx>
 
 namespace Environment {
+
 class TerrainSampler : public SGSubsystemGroup
 {
 public:

src/FDM/ExternalNet/ExternalNet.hxx

@@ -31,10 +31,9 @@
 #include <FDM/flight.hxx>
 
 
-class FGExternalNet: public FGInterface {
-
+class FGExternalNet : public FGInterface
+{
 private:
-
     int data_in_port;
     int data_out_port;
     int cmd_port;
@@ -49,7 +48,6 @@ private:
     FGNetFDM fdm;
 
 public:
-
     // Constructor
     FGExternalNet( double dt, std::string host, int dop, int dip, int cp );
 
@@ -61,8 +59,6 @@ public:
 
     // update the fdm
     void update( double dt );
-
 };
 
-
 #endif // _EXTERNAL_NET_HXX

src/FDM/ExternalPipe/ExternalPipe.hxx

@@ -32,10 +32,9 @@
 #include <FDM/flight.hxx>
 
 
-class FGExternalPipe: public FGInterface {
-
+class FGExternalPipe : public FGInterface
+{
 private:
-
     bool valid;
 
     std::string fifo_name_1;
@@ -63,8 +62,8 @@ private:
     void update_property( double dt );
 
     void process_set_command( const string_list &tokens );
-public:
 
+public:
     // Constructor
     FGExternalPipe( double dt, std::string fifo_name, std::string protocol );
 
@@ -76,8 +75,6 @@ public:
 
     // update the fdm
     void update( double dt );
-
 };
 
-
 #endif // _EXTERNAL_PIPE_HXX

src/FDM/JSBSim/JSBSim.hxx

@@ -98,11 +98,12 @@ CLASS DOCUMENTATION
 CLASS DECLARATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-class FGJSBsim: public FGInterface {
-
+class FGJSBsim : public FGInterface
+{
 public:
     /// Constructor
     FGJSBsim( double dt );
+
     /// Destructor
     ~FGJSBsim();
 
@@ -221,6 +222,7 @@ public:
     double get_agl_ft(double t, const JSBSim::FGColumnVector3& loc,
                       double alt_off, double contact[3], double normal[3],
                       double vel[3], double angularVel[3]);
+
 private:
     JSBSim::FGFDMExec *fdmex;
     JSBSim::FGInitialCondition *fgic;
@@ -324,5 +326,4 @@ private:
     void update_external_forces(double t_off);
 };
 
-
 #endif // _JSBSIM_HXX

src/FDM/LaRCsim/LaRCsim.hxx

@@ -32,10 +32,9 @@
 #include "IO360.hxx"
 #include "LaRCsimIC.hxx"
 
-class FGLaRCsim: public FGInterface {
-
+class FGLaRCsim : public FGInterface
+{
 private:
-
     FGNewEngine eng;
     LaRCsimIC* lsic;
     void set_ls(void);
@@ -46,7 +45,6 @@ private:
     double mass, i_xx, i_yy, i_zz, i_xz;
 
 public:
-
     FGLaRCsim( double dt );
     ~FGLaRCsim(void);
 
@@ -103,7 +101,4 @@ public:
     }
 };
 
-
 #endif // _LARCSIM_HXX
-
-

src/FDM/NullFDM.hxx

@@ -29,8 +29,8 @@
 #include "flight.hxx"
 
 
-class FGNullFDM: public FGInterface {
-
+class FGNullFDM : public FGInterface
+{
 public:
     FGNullFDM( double dt );
     ~FGNullFDM();
@@ -42,5 +42,4 @@ public:
     void update( double dt );
 };
 
-
 #endif // _NULLFDM_HXX

src/FDM/SP/ACMS.hxx

@@ -41,12 +41,10 @@ public:
     void update( double dt );
 
 private:
-
     SGPropertyNode_ptr _alt, _speed, _climb_rate;
     SGPropertyNode_ptr _pitch, _roll, _heading;
     SGPropertyNode_ptr _acc_lat, _acc_lon, _acc_down;
     SGPropertyNode_ptr _temp, _wow;
 };
 
-
 #endif // _ACMS_HXX

src/FDM/SP/ADA.hxx

@@ -26,10 +26,9 @@ class SGSocket;
 #include <FDM/flight.hxx>
 
 
-class FGADA: public FGInterface {
-
+class FGADA : public FGInterface
+{
 private:
-	
     SGSocket *fdmsock;
 #if 0
     // Auxilliary Flight Model parameters, basically for HUD
@@ -71,7 +70,6 @@ private:
     bool copy_from_FGADA();
 
 public:
-
     FGADA( double dt );
     ~FGADA();
 
@@ -80,8 +78,6 @@ public:
 
     // update position based on inputs, positions, velocities, etc.
     void update(double dt);
-
 };
 
-
 #endif // _ADA_HXX

src/FDM/SP/Balloon.h

@@ -25,7 +25,7 @@
 
 FUNCTIONAL DESCRIPTION
 ------------------------------------------------------------------------------
-interface to the the hot air balloon simulator
+interface to the hot air balloon simulator
 
 HISTORY
 ------------------------------------------------------------------------------
@@ -55,12 +55,11 @@ HISTORY
 /****************************************************************************/
 
 
-class FGBalloonSim: public FGInterface {
-
+class FGBalloonSim : public FGInterface
+{
     balloon current_balloon;
 
 public:
-
     FGBalloonSim( double dt );
     ~FGBalloonSim();
 
@@ -77,10 +76,5 @@ public:
     void update( double dt );
 };
 
-
 /****************************************************************************/
 #endif /*BalloonSimInterface_H*/
-
-
-
-

src/FDM/SP/MagicCarpet.hxx

@@ -28,8 +28,8 @@
 #include <FDM/flight.hxx>
 
 
-class FGMagicCarpet: public FGInterface {
-
+class FGMagicCarpet : public FGInterface
+{
 public:
     FGMagicCarpet( double dt );
     ~FGMagicCarpet();
@@ -39,8 +39,6 @@ public:
 
     // update position based on inputs, positions, velocities, etc.
     void update( double dt );
-
 };
 
-
 #endif // _MAGICCARPET_HXX

src/FDM/UFO.hxx

@@ -27,15 +27,17 @@
 #include "flight.hxx"
 
 
-class FGUFO: public FGInterface {
+class FGUFO : public FGInterface
+{
 private:
-
-    class lowpass {
+    class lowpass
+    {
     private:
         static double _dt;
         double _coeff;
         double _last;
         bool _initialized;
+
     public:
         lowpass(double coeff) : _coeff(coeff), _initialized(false) {}
         static inline void set_delta(double dt) { _dt = dt; }
@@ -67,8 +69,6 @@ public:
 
     // update position based on inputs, positions, velocities, etc.
     void update( double dt );
-
 };
 
-
 #endif // _UFO_HXX

src/FDM/YASim/YASim.hxx

@@ -6,7 +6,8 @@
 
 namespace yasim { class FGFDM; };
 
-class YASim : public FGInterface {
+class YASim : public FGInterface
+{
 public:
     YASim(double dt);
     ~YASim();
@@ -20,7 +21,6 @@ public:
     virtual void update(double dt);
 
 private:
-
     void report();
     void copyFromYASim();
     void copyToYASim(bool copyState);

src/FDM/fdm_shell.hxx

@@ -57,8 +57,8 @@ public:
     FGInterface* getInterface() const;
     
     static const char* subsystemName() { return "flight"; }
-private:
 
+private:
     void createImplementation();
 
     TankPropertiesList _tankProperties;

src/FDM/flight.hxx

@@ -99,7 +99,8 @@ class FGAIAircraft;
  * life/visibility, computes the track if the 
  * position has changed.
  */
-class TrackComputer {
+class TrackComputer
+{
 public:
     inline TrackComputer( double & track, double & path, const SGGeod & position ) : 
         _track( track ),
@@ -118,6 +119,7 @@ public:
             _path = atan2( d, distance ) * SGD_RADIANS_TO_DEGREES;
         }
     }
+
 private:
     double & _track;
     double & _path;
@@ -126,8 +128,8 @@ private:
 };
 
 // This is based heavily on LaRCsim/ls_generic.h
-class FGInterface : public SGSubsystem {
-  
+class FGInterface : public SGSubsystem
+{
     // Has the init() method been called.  This is used to delay
     // initialization until scenery can be loaded and we know the true
     // ground elevation.
@@ -221,9 +223,7 @@ class FGInterface : public SGSubsystem {
     void set_A_Z_pilot(double z)
     { _set_Accels_Pilot_Body(_state.a_pilot_body_v[0], _state.a_pilot_body_v[1], z); }
 
-
 protected:
-
     int _calc_multiloop (double dt);
 
 
@@ -386,7 +386,6 @@ protected:
     inline void _set_Climb_Rate(double rate) { _state.climb_rate = rate; }
 
 public:
-  
     FGInterface();
     FGInterface( double dt );
     virtual ~FGInterface();

src/GUI/new_gui.hxx

@@ -30,7 +30,6 @@ class puFont;
 class NewGUI : public SGSubsystem
 {
 public:
-
     /**
      * Constructor.
      */
@@ -174,7 +173,6 @@ public:
     static const char* subsystemName() { return "gui"; }
 
 protected:
-
     /**
      * Test if the menubar is visible.
      *
@@ -203,6 +201,7 @@ protected:
 
     bool getMenuBarOverlapHide() const;
     void setMenuBarOverlapHide(bool hide);
+
 private:
     void createMenuBarImplementation();
 
@@ -237,9 +236,7 @@ private:
     // cache of loaded dialog proeprties
     typedef std::map<std::string,SGPropertyNode_ptr> NameDialogDict;
     NameDialogDict _dialog_props;
-
 };
 
-
 #endif // __NEW_GUI_HXX
 

src/Input/FGEventInput.hxx

@@ -46,7 +46,8 @@ struct FGEventData {
     double dt;
 };
 
-class FGEventSetting : public SGReferenced {
+class FGEventSetting : public SGReferenced
+{
 public:
     FGEventSetting( SGPropertyNode_ptr base );
 
@@ -87,11 +88,11 @@ public:
     std::string reportBytes(const std::string& moduleName) const;
 
     virtual void valueChanged(SGPropertyNode * node);
+
 protected:
     unsigned int reportId;
     std::string nasalFunction;
     bool dirty;
-
 };
 
 typedef SGSharedPtr<FGReportSetting> FGReportSetting_ptr;
@@ -119,9 +120,10 @@ typedef std::vector<FGReportSetting_ptr> report_setting_list_t;
  * </event>
  */
 class FGInputDevice;
-class FGInputEvent : public SGReferenced,FGCommonInput {
+class FGInputEvent : public SGReferenced,
+                     FGCommonInput
+{
 public:
-
     /*
      * Constructor for the class. The arg node shall point
      * to the property corresponding to the <event>  node
@@ -170,7 +172,8 @@ protected:
     double lastSettingValue;
 };
 
-class FGButtonEvent : public FGInputEvent {
+class FGButtonEvent : public FGInputEvent
+{
 public:
     FGButtonEvent( FGInputDevice * device, SGPropertyNode_ptr node );
     virtual void fire( FGEventData & eventData );
@@ -181,7 +184,8 @@ protected:
     bool lastState;
 };
 
-class FGAxisEvent : public FGInputEvent {
+class FGAxisEvent : public FGInputEvent
+{
 public:
     FGAxisEvent( FGInputDevice * device, SGPropertyNode_ptr node );
     ~FGAxisEvent();
@@ -189,6 +193,7 @@ public:
     void SetMaxRange( double value ) { maxRange = value; }
     void SetMinRange( double value ) { minRange = value; }
     void SetRange( double min, double max ) { minRange = min; maxRange = max; }
+
 protected:
     virtual void fire( FGEventData & eventData );
     double tolerance;
@@ -203,16 +208,20 @@ protected:
     bool mirrorInterpolater = false;
 };
 
-class FGRelAxisEvent : public FGAxisEvent {
+class FGRelAxisEvent : public FGAxisEvent
+{
 public:
     FGRelAxisEvent( FGInputDevice * device, SGPropertyNode_ptr node );
+
 protected:
     virtual void fire( SGBinding * binding, FGEventData & eventData );
 };
 
-class FGAbsAxisEvent : public FGAxisEvent {
+class FGAbsAxisEvent : public FGAxisEvent
+{
 public:
     FGAbsAxisEvent( FGInputDevice * device, SGPropertyNode_ptr node ) : FGAxisEvent( device, node ) {}
+
 protected:
     virtual void fire( SGBinding * binding, FGEventData & eventData );
 };
@@ -224,7 +233,8 @@ typedef class SGSharedPtr<FGInputEvent> FGInputEvent_ptr;
  * all operating systems. This is the base class for the O/S-specific
  * implementation of input device handlers
  */
-class FGInputDevice : public SGReferenced {
+class FGInputDevice : public SGReferenced
+{
 public:
     FGInputDevice() {}
     FGInputDevice( std::string aName, std::string aSerial = {} ) :
@@ -306,7 +316,9 @@ typedef SGSharedPtr<FGInputDevice> FGInputDevice_ptr;
 /*
  * The Subsystem for the event input device
  */
-class FGEventInput : public SGSubsystem,FGCommonInput {
+class FGEventInput : public SGSubsystem,
+                     FGCommonInput
+{
 public:
     FGEventInput();
     virtual ~FGEventInput();
@@ -317,6 +329,7 @@ public:
 
     const static unsigned MAX_DEVICES = 1000;
     const static unsigned INVALID_DEVICE_INDEX = MAX_DEVICES + 1;
+
 protected:
     static const char * PROPERTY_ROOT;
 

src/Input/FGHIDEventInput.hxx

@@ -46,6 +46,7 @@ public:
     void shutdown() override;
 
     static const char* subsystemName() { return "input-hid"; }
+
 private:
     class FGHIDEventInputPrivate;
 

src/Input/FGJoystickInput.hxx

@@ -36,7 +36,9 @@
 ////////////////////////////////////////////////////////////////////////
 // The Joystick Input Class
 ////////////////////////////////////////////////////////////////////////
-class FGJoystickInput : public SGSubsystem,FGCommonInput {
+class FGJoystickInput : public SGSubsystem,
+                        FGCommonInput
+{
 public:
     FGJoystickInput();
     virtual ~FGJoystickInput();
@@ -101,7 +103,6 @@ private:
 
     joystick joysticks[MAX_JOYSTICKS];
     void updateJoystick(int index, joystick* joy, double dt);
-
 };
 
 #endif

src/Input/FGKeyboardInput.hxx

@@ -37,7 +37,9 @@
 ////////////////////////////////////////////////////////////////////////
 // The Keyboard Input Class
 ////////////////////////////////////////////////////////////////////////
-class FGKeyboardInput : public SGSubsystem,FGCommonInput {
+class FGKeyboardInput : public SGSubsystem,
+                        FGCommonInput
+{
 public:
     FGKeyboardInput();
     virtual ~FGKeyboardInput();

src/Input/FGLinuxEventInput.hxx

@@ -39,7 +39,8 @@ struct FGLinuxEventData : public FGEventData {
 /*
  * A implementation for linux event devices
  */
-class FGLinuxInputDevice : public FGInputDevice {
+class FGLinuxInputDevice : public FGInputDevice
+{
 public:
     FGLinuxInputDevice();
     FGLinuxInputDevice( std::string name, std::string devname, std::string aSerial );
@@ -56,6 +57,7 @@ public:
     int GetFd() { return fd; }
 
     double Normalize( struct input_event & event );
+
 private:
     std::string devname;
     int fd;
@@ -63,7 +65,8 @@ private:
     std::map<unsigned int,input_absinfo> absinfo;
 };
 
-class FGLinuxEventInput : public FGEventInput {
+class FGLinuxEventInput : public FGEventInput
+{
 public:
     FGLinuxEventInput();
     virtual ~ FGLinuxEventInput();

src/Input/FGMacOSXEventInput.hxx

@@ -42,7 +42,8 @@ struct FGMacOSXEventData : public FGEventData {
 //
 // Mac OS X specific FGEventInput
 //
-class FGMacOSXEventInput : public FGEventInput {
+class FGMacOSXEventInput : public FGEventInput
+{
 public:
     FGMacOSXEventInput();
 
@@ -51,6 +52,7 @@ public:
     virtual void init();
     virtual void postinit();
     virtual void shutdown();
+
 private:
     friend class FGMacOSXEventInputPrivate;
 

src/Input/FGMouseInput.hxx

@@ -38,7 +38,9 @@ namespace osgGA { class GUIEventAdapter; }
 ////////////////////////////////////////////////////////////////////////
 // The Mouse Input Class
 ////////////////////////////////////////////////////////////////////////
-class FGMouseInput : public SGSubsystem, FGCommonInput {
+class FGMouseInput : public SGSubsystem,
+                     FGCommonInput
+{
 public:
     FGMouseInput();
     virtual ~FGMouseInput() = default;
@@ -64,12 +66,12 @@ public:
      * @brief check if the active mode passes clicks through to the UI or not
      */
     bool isActiveModePassThrough() const;
+
 private:
     void processMotion(int x, int y, const osgGA::GUIEventAdapter* ea);
 
     class FGMouseInputPrivate;
     std::unique_ptr<FGMouseInputPrivate> d;
-  
 };
 
 #endif

src/Input/input.hxx

@@ -56,7 +56,6 @@ public:
     virtual ~FGInput();
 
     static const char* subsystemName() { return "input"; }
-
 };
 
 #endif // _INPUT_HXX

src/Instrumentation/HUD/HUD.hxx

@@ -40,7 +40,8 @@ class fntTexFont;
 class FGViewer;
 class ClipBox;
 
-class LineSegment {
+class LineSegment
+{
 public:
     LineSegment(GLfloat x0, GLfloat y0, GLfloat x1, GLfloat y1)
         : _x0(x0), _y0(y0), _x1(x1), _y1(y1) {}
@@ -56,7 +57,8 @@ private:
 
 
 
-class LineList {
+class LineList
+{
 public:
     void add(const LineSegment& seg) { _list.push_back(seg); }
     void erase() { _list.erase(_list.begin(), _list.end()); }
@@ -76,7 +78,8 @@ private:
 
 
 
-class HUDText {
+class HUDText
+{
 public:
     HUDText(fntRenderer *f, float x, float y, const char *s, int align = 0, int digits = 0);
     void draw();
@@ -91,7 +94,8 @@ private:
 
 
 
-class TextList {
+class TextList
+{
 public:
     TextList() { _font = 0; }
 
@@ -111,7 +115,9 @@ private:
 
 
 
-class HUD : public SGSubsystem, public SGPropertyChangeListener {
+class HUD : public SGSubsystem,
+            public SGPropertyChangeListener
+{
 public:
     HUD();
     ~HUD();

src/Instrumentation/KLN89/kln89.hxx

@@ -74,8 +74,8 @@ typedef airport_id_str_map_type::iterator airport_id_str_map_iterator;
 typedef std::vector<KLN89Page*> kln89_page_list_type;
 typedef kln89_page_list_type::iterator kln89_page_list_itr;
 
-class KLN89 : public DCLGPS {
-	
+class KLN89 : public DCLGPS
+{
     friend class KLN89Page;
     friend class KLN89AptPage;
     friend class KLN89VorPage;

src/Instrumentation/adf.hxx

@@ -39,9 +39,7 @@ class SGSampleGroup;
  */
 class ADF : public AbstractInstrument
 {
-
 public:
-
     ADF ( SGPropertyNode *node );
     virtual ~ADF ();
 
@@ -49,7 +47,6 @@ public:
     virtual void update (double delta_time_sec);
 
 private:
-
     void set_bearing (double delta_time_sec, double bearing);
 
     void search (double frequency, const SGGeod& pos);
@@ -82,5 +79,4 @@ private:
     SGSharedPtr<SGSampleGroup> _sgr;
 };
 
-
 #endif // __INSTRUMENTS_ADF_HXX

src/Instrumentation/airspeed_indicator.hxx

@@ -36,9 +36,7 @@ class FGEnvironmentMgr;
  */
 class AirspeedIndicator : public SGSubsystem
 {
-
 public:
-
     AirspeedIndicator ( SGPropertyNode *node );
     virtual ~AirspeedIndicator ();
 

src/Instrumentation/altimeter.hxx

@@ -29,9 +29,7 @@
  */
 class Altimeter : public SGSubsystem
 {
-
 public:
-
     Altimeter (SGPropertyNode *node, const std::string& aDefaultName, double quantum = 0);
     virtual ~Altimeter ();
 

src/Instrumentation/attitude_indicator.hxx

@@ -38,9 +38,7 @@
  */
 class AttitudeIndicator : public SGSubsystem
 {
-
 public:
-
     AttitudeIndicator ( SGPropertyNode *node );
     virtual ~AttitudeIndicator ();
 
@@ -51,7 +49,6 @@ public:
     virtual void update (double dt);
 
 private:
-
     std::string _name;
     int _num;
     std::string _suction;

src/Instrumentation/clock.hxx

@@ -26,7 +26,8 @@
  * /instrumentation/clock/indicated-sec
  * /instrumentation/clock/indicated-string
  */
-class Clock : public SGSubsystem {
+class Clock : public SGSubsystem
+{
 public:
     Clock(SGPropertyNode *node);
     virtual ~Clock();

src/Instrumentation/commradio.cxx

@@ -454,8 +454,9 @@ private:
 
 /* ------------- The CommRadio implementation ---------------------- */
 
-class CommRadioImpl: public CommRadio, OutputProperties {
-
+class CommRadioImpl: public CommRadio,
+                     OutputProperties
+{
 public:
     CommRadioImpl(SGPropertyNode_ptr node);
     virtual ~CommRadioImpl();
@@ -487,7 +488,6 @@ private:
     void updateAudio();
 
     SGSampleGroup* _sampleGroup = nullptr;
-
 };
 
 CommRadioImpl::CommRadioImpl(SGPropertyNode_ptr node) :

src/Instrumentation/commradio.hxx

@@ -28,7 +28,8 @@
 
 namespace Instrumentation {
 
-class SignalQualityComputer : public SGReferenced {
+class SignalQualityComputer : public SGReferenced
+{
 public:
     virtual ~SignalQualityComputer();
     virtual double computeSignalQuality( double distance_nm ) const = 0;

src/Instrumentation/dclgps.hxx

@@ -94,7 +94,8 @@ typedef std::map < std::string, gps_waypoint_array > gps_waypoint_map;
 typedef gps_waypoint_map::iterator gps_waypoint_map_iterator;
 typedef gps_waypoint_map::const_iterator gps_waypoint_map_const_iterator;
 
-class GPSFlightPlan {
+class GPSFlightPlan
+{
 public:
     std::vector<GPSWaypoint*> waypoints;
     inline bool IsEmpty() { return waypoints.empty(); }
@@ -102,12 +103,13 @@ public:
 
 // TODO - probably de-public the internals of the next 2 classes and add some methods!
 // Instrument approach procedure base class
-class FGIAP {
+class FGIAP
+{
 public:
     FGIAP();
     virtual ~FGIAP() = 0;
-//protected:
 
+//protected:
     std::string _aptIdent; // The ident of the airport this approach is for
     std::string _ident;    // The approach ident.
     std::string _name;     // The full approach name.
@@ -116,10 +118,12 @@ public:
 };
 
 // Non-precision instrument approach procedure
-class FGNPIAP : public FGIAP {
+class FGNPIAP : public FGIAP
+{
 public:
     FGNPIAP();
     ~FGNPIAP();
+
 //private:
 public:
     std::vector<GPSFlightPlan*> _approachRoutes;    // The approach route(s) from the IAF(s) to the IF.
@@ -133,8 +137,8 @@ typedef std::map < std::string, iap_list_type > iap_map_type;
 typedef iap_map_type::iterator iap_map_iterator;
 
 //    A class to encapsulate hr:min representation of time.
-
-class ClockTime {
+class ClockTime
+{
 public:
     ClockTime();
     ClockTime(int hr, int min);
@@ -168,8 +172,8 @@ private:
 
 // AlignedProjection - a class to project an area local to a runway onto an orthogonal co-ordinate system
 // with the origin at the threshold and the runway aligned with the y axis.
-class AlignedProjection {
-
+class AlignedProjection
+{
 public:
     AlignedProjection();
     AlignedProjection(const SGGeod& centre, double heading);
@@ -187,14 +191,13 @@ private:
     SGGeod _origin;   // lat/lon of local area origin (the threshold)
     double _theta;    // the rotation angle for alignment in radians
     double _correction_factor;    // Reduction in surface distance per degree of longitude due to latitude.  Saves having to do a cos() every call.
-
 };
 
 // ------------------------------------------------------------------------------
 
 // TODO - merge generic GPS functions instead and split out KLN specific stuff.
-class DCLGPS : public SGSubsystem {
-	
+class DCLGPS : public SGSubsystem
+{
 public:
     DCLGPS(RenderArea2D* instrument);
     virtual ~DCLGPS() = 0;
@@ -326,7 +329,6 @@ protected:
 
     // Data and lookup functions
 
-
 protected:
     void LoadApproachData();
 
@@ -445,6 +447,7 @@ protected:
     ClockTime _powerOnTime; // Time (hr:min) of unit power-up.
     bool _powerOnTimerSet;  // Indicates that we have set the above following power-up.
     void SetPowerOnTimer();
+
 public:
     void ResetPowerOnTimer();
     // Set the alarm to go off at a given time.
@@ -453,6 +456,7 @@ public:
         _alarmTime.set_min(min);
         _alarmSet = true;
     }
+
 protected:
     ClockTime _alarmTime;
     bool _alarmSet;
@@ -487,6 +491,7 @@ protected:
     // More hackery since we aren't actually storing an approach class... Doh!
     std::string _approachAbbrev;
     std::string _approachRwyStr;
+
 private:
     simgear::TiedPropertyList _tiedProperties;
 };

src/Instrumentation/dme.hxx

@@ -34,9 +34,7 @@ class FGNavRecord;
  */
 class DME : public AbstractInstrument
 {
-
 public:
-
     DME ( SGPropertyNode *node );
     virtual ~DME ();
 
@@ -70,5 +68,4 @@ private:
     class AudioIdent * _audioIdent;
 };
 
-
 #endif // __INSTRUMENTS_DME_HXX

src/Instrumentation/heading_indicator.hxx

@@ -34,9 +34,7 @@
  */
 class HeadingIndicator : public SGSubsystem
 {
-
 public:
-
     HeadingIndicator ( SGPropertyNode *node );
     HeadingIndicator ();
     virtual ~HeadingIndicator ();
@@ -48,7 +46,6 @@ public:
     virtual void update (double dt);
 
 private:
-
     Gyro _gyro;
     double _last_heading_deg;
 
@@ -62,7 +59,6 @@ private:
     SGPropertyNode_ptr _heading_out_node;
     SGPropertyNode_ptr _heading_bug_error_node;
     SGPropertyNode_ptr _heading_bug_node;
-
 };
 
 #endif // __INSTRUMENTS_HEADING_INDICATOR_HXX

src/Instrumentation/heading_indicator_dg.hxx

@@ -32,9 +32,7 @@
  */
 class HeadingIndicatorDG : public SGSubsystem
 {
-
 public:
-
     HeadingIndicatorDG ( SGPropertyNode *node );
     HeadingIndicatorDG ();
     virtual ~HeadingIndicatorDG ();
@@ -46,7 +44,6 @@ public:
     virtual void update (double dt);
 
 private:
-
     Gyro _gyro;
     double _last_heading_deg, _last_indicated_heading_dg;
 

src/Instrumentation/heading_indicator_fg.hxx

@@ -34,9 +34,7 @@
  */
 class HeadingIndicatorFG : public SGSubsystem
 {
-
 public:
-
     HeadingIndicatorFG ( SGPropertyNode *node );
     HeadingIndicatorFG ();
     virtual ~HeadingIndicatorFG ();
@@ -48,7 +46,6 @@ public:
     virtual void update (double dt);
 
 private:
-
     Gyro _gyro;
     double _last_heading_deg;
 
@@ -63,9 +60,6 @@ private:
     SGPropertyNode_ptr _error_node;
     SGPropertyNode_ptr _nav1_error_node;
     SGPropertyNode_ptr _off_node;
-
-
-    
 };
 
 #endif // __INSTRUMENTS_HEADING_INDICATOR_HXX

src/Instrumentation/inst_vertical_speed_indicator.hxx

@@ -50,9 +50,7 @@ class SGInterpTable;
  */
 class InstVerticalSpeedIndicator : public SGSubsystem
 {
-
 public:
-
     InstVerticalSpeedIndicator ( SGPropertyNode *node );
     virtual ~InstVerticalSpeedIndicator ();
 
@@ -61,7 +59,6 @@ public:
     virtual void update (double dt);
 
 private:
-
     std::string _name;
     int _num;
 

src/Instrumentation/instrument_mgr.hxx

@@ -28,7 +28,6 @@
 class FGInstrumentMgr : public SGSubsystemGroup
 {
 public:
-
     FGInstrumentMgr ();
     virtual ~FGInstrumentMgr ();
 

src/Instrumentation/kr_87.hxx

@@ -185,5 +185,4 @@ public:
     inline bool get_et_ann() const { return et_ann; }
 };
 
-
 #endif // _FG_KR_87_HXX

src/Instrumentation/mag_compass.hxx

@@ -40,9 +40,7 @@
  */
 class MagCompass : public SGSubsystem
 {
-
 public:
-
     MagCompass ( SGPropertyNode *node);
     MagCompass ();
     virtual ~MagCompass ();
@@ -52,7 +50,6 @@ public:
     virtual void update (double dt);
 
 private:
-
     double _rate_degps;
 
     std::string _name;
@@ -71,7 +68,6 @@ private:
     SGPropertyNode_ptr _y_accel_node;
     SGPropertyNode_ptr _z_accel_node;
     SGPropertyNode_ptr _out_node;
-
 };
 
 #endif // __INSTRUMENTS_MAG_COMPASS_HXX

src/Instrumentation/marker_beacon.hxx

@@ -33,7 +33,6 @@ class SGSampleGroup;
 
 class FGMarkerBeacon : public AbstractInstrument
 {
-
     // Inputs
     SGPropertyNode_ptr lon_node;
     SGPropertyNode_ptr lat_node;
@@ -57,7 +56,6 @@ class FGMarkerBeacon : public AbstractInstrument
     SGSharedPtr<SGSampleGroup> _sgr;
 
 public:
-
     enum fgMkrBeacType {
         NOBEACON = 0,
         INNER,

src/Instrumentation/mrg.hxx

@@ -35,9 +35,7 @@
 
 class MasterReferenceGyro : public SGSubsystem
 {
-
 public:
-
     MasterReferenceGyro ( SGPropertyNode *node );
     MasterReferenceGyro ();
     virtual ~MasterReferenceGyro ();
@@ -49,7 +47,6 @@ public:
     virtual void update (double dt);
 
 private:
-
     static const double gravity; //conversion factor
 
     std::string _name;

src/Instrumentation/navradio.hxx

@@ -34,7 +34,8 @@
 
 class SGSampleGroup;
 
-class FGNavRadio : public AbstractInstrument, public SGPropertyChangeListener
+class FGNavRadio : public AbstractInstrument,
+                   public SGPropertyChangeListener
 {
     SGPropertyNode_ptr _radio_node;
 
@@ -165,11 +166,10 @@ class FGNavRadio : public AbstractInstrument, public SGPropertyChangeListener
 
     FGNavRecord* findPrimaryNavaid(const SGGeod& aPos, double aFreqMHz);
 
-      
     // implement SGPropertyChangeListener
     virtual void valueChanged (SGPropertyNode * prop);
-public:
 
+public:
     FGNavRadio(SGPropertyNode *node);
     ~FGNavRadio();
 
@@ -182,5 +182,4 @@ public:
     void updateNav();
 };
 
-
 #endif // _FG_NAVRADIO_HXX

src/Instrumentation/newnavradio.cxx

@@ -802,13 +802,15 @@ void GS::display( NavIndicator & navIndicator )
 
 /* ------------- The NavRadio implementation ---------------------- */
 
-class NavRadioImpl : public NavRadio {
+class NavRadioImpl : public NavRadio
+{
 public:
     NavRadioImpl( SGPropertyNode_ptr node );
     virtual ~NavRadioImpl();
 
     virtual void update( double dt );
     virtual void init();
+
 private:
     void search();
 
@@ -818,6 +820,7 @@ private:
 
         void init();
         void update( double dt );
+
     private:
         NavRadioImpl * _navRadioImpl;
         SGPropertyNode_ptr is_valid_node;

src/Instrumentation/newnavradio.hxx

@@ -27,6 +27,7 @@
 #include <simgear/structure/subsystem_mgr.hxx>
 
 namespace Instrumentation {
+
 class NavRadio : public SGSubsystem
 {
 public:

src/Instrumentation/rad_alt.hxx

@@ -31,12 +31,10 @@
 class RadarAltimeter : public SGSubsystem
 {
 public:
-
     RadarAltimeter ( SGPropertyNode *node );
     virtual ~RadarAltimeter ();
 
 private:
-
     virtual void init ();
     virtual void update (double dt);
 
@@ -54,7 +52,6 @@ private:
     SGPropertyNode_ptr _serviceable_node;
     SGPropertyNode_ptr _sceneryLoaded;
 
-    
     SGVec3d _antennaOffset; // in aircraft local XYZ frame
 
     std::string _name;
@@ -63,7 +60,6 @@ private:
     double _interval;
 
     double _min_radalt;
-
 };
 
 #endif // _INST_AGRADAR_HXX

src/Instrumentation/slip_skid_ball.hxx

@@ -30,9 +30,7 @@
  */
 class SlipSkidBall : public SGSubsystem
 {
-
 public:
-
     SlipSkidBall ( SGPropertyNode *node );
     virtual ~SlipSkidBall ();
 
@@ -49,7 +47,6 @@ private:
     SGPropertyNode_ptr _z_accel_node;
     SGPropertyNode_ptr _out_node;
     SGPropertyNode_ptr _override_node;
-   
 };
 
 #endif // __INSTRUMENTS_SLIP_SKID_BALL_HXX

src/Instrumentation/tacan.hxx

@@ -31,11 +31,10 @@
  * /instrumentation/"name"/indicated-ground-speed-kt
  * /instrumentation/"name"/indicated-time-kt
  */
-class TACAN : public SGSubsystem, public SGPropertyChangeListener
+class TACAN : public SGSubsystem,
+              public SGPropertyChangeListener
 {
-
 public:
-
     TACAN(SGPropertyNode *node);
     virtual ~TACAN();
 
@@ -44,7 +43,6 @@ class TACAN : public SGSubsystem, public SGPropertyChangeListener
     virtual void update (double delta_time_sec);
 
 private:
-
     void disabled(bool force = false);
 
     void search (double frequency, const SGGeod& pos);
@@ -89,5 +87,4 @@ class TACAN : public SGSubsystem, public SGPropertyChangeListener
     int _listener_active;
 };
 
-
 #endif // __INSTRUMENTS_TACAN_HXX

src/Instrumentation/tcas.hxx

@@ -50,7 +50,6 @@ class SGSampleGroup;
 
 class TCAS : public SGSubsystem
 {
-
     typedef enum
     {
         AdvisoryClear         = 0,                          /*< Clear of traffic */

src/Instrumentation/transponder.hxx

@@ -27,7 +27,8 @@
 #include <simgear/structure/subsystem_mgr.hxx>
 #include <simgear/props/tiedpropertylist.hxx>
 
-class Transponder : public AbstractInstrument, public SGPropertyChangeListener
+class Transponder : public AbstractInstrument,
+                    public SGPropertyChangeListener
 {
 public:
     Transponder(SGPropertyNode *node);
@@ -42,15 +43,13 @@ protected:
     bool isPowerSwitchOn() const override;
 
 private:
-    enum Mode
-    {
+    enum Mode {
         MODE_A = 0,
         MODE_C,
         MODE_S
     };
 
-    enum KnobPosition
-    {
+    enum KnobPosition {
         KNOB_OFF = 0,
         KNOB_STANDBY,
         KNOB_TEST,

src/Instrumentation/turn_indicator.hxx

@@ -37,9 +37,7 @@
  */
 class TurnIndicator : public SGSubsystem
 {
-
 public:
-
     TurnIndicator ( SGPropertyNode *node );
     virtual ~TurnIndicator ();
 
@@ -50,7 +48,6 @@ public:
     virtual void update (double dt);
 
 private:
-
     Gyro _gyro;
     double _last_rate;
 
@@ -61,7 +58,6 @@ private:
     SGPropertyNode_ptr _yaw_rate_node;
     SGPropertyNode_ptr _electric_current_node;
     SGPropertyNode_ptr _rate_out_node;
-    
 };
 
 #endif // __INSTRUMENTS_TURN_INDICATOR_HXX

src/Instrumentation/vertical_speed_indicator.hxx

@@ -33,9 +33,7 @@
  */
 class VerticalSpeedIndicator : public SGSubsystem
 {
-
 public:
-
     VerticalSpeedIndicator ( SGPropertyNode *node );
     virtual ~VerticalSpeedIndicator ();
 
@@ -44,7 +42,6 @@ public:
     virtual void update (double dt);
 
 private:
-
     double _casing_pressure_Pa = 0.0;
     double _casing_airmass_kg = 0.0;
     double _casing_density_kgpm3 = 0.0;
@@ -61,7 +58,6 @@ private:
     SGPropertyNode_ptr _speed_fpm_node;
     SGPropertyNode_ptr _speed_mps_node;
     SGPropertyNode_ptr _speed_kts_node;
-    
 };
 
 #endif // __INSTRUMENTS_VERTICAL_SPEED_INDICATOR_HXX

src/Main/FGInterpolator.hxx

@@ -21,13 +21,11 @@
 
 #include <simgear/props/PropertyInterpolationMgr.hxx>
 
-class FGInterpolator:
-  public simgear::PropertyInterpolationMgr
+class FGInterpolator : public simgear::PropertyInterpolationMgr
 {
 public:
     FGInterpolator();
     ~FGInterpolator();
 };
 
-
 #endif /* FG_INTERPOLATOR_HXX_ */

src/Main/fg_io.hxx

@@ -55,12 +55,10 @@ public:
      */
     static bool isMultiplayerRequested();
 private:
-
     void add_channel(const std::string& config);
     FGProtocol* parse_port_config( const std::string& cfgstr );
 
 private:
-
     // define the global I/O channel list
     //io_container global_io_list;
 
@@ -70,5 +68,4 @@ private:
     SGPropertyNode_ptr _realDeltaTime;
 };
 
-
 #endif // _FG_IO_HXX

src/Main/logger.hxx

@@ -28,7 +28,6 @@ public:
     virtual void update (double dt);
 
 private:
-
     /**
      * A single instance of a log file (the logger can contain many).
      */
@@ -43,7 +42,6 @@ private:
     };
 
     std::vector< std::unique_ptr<Log> > _logs;
-
 };
 
 #endif // __LOGGER_HXX

src/Model/acmodel.hxx

@@ -21,7 +21,6 @@ class FGFX;
 class FGAircraftModel : public SGSubsystem
 {
 public:
-
     FGAircraftModel ();
     virtual ~FGAircraftModel ();
 
@@ -35,6 +34,7 @@ public:
     virtual SGVec3d& getVelocity() { return _velocity; }
 
     static const char* subsystemName() { return "aircraft-model"; }
+
 private:
     void deinit ();
 

src/Model/modelmgr.hxx

@@ -23,7 +23,6 @@ class SGModelPlacement;
 class FGModelMgr : public SGSubsystem
 {
 public:
-
     /**
      * A dynamically-placed model using properties.
      *
@@ -85,6 +84,7 @@ public:
     virtual void remove_instance (Instance * instance);
 
     static const char* subsystemName() { return "model-manager"; }
+
 private:
     /**
      * Listener class that adds models at runtime.
@@ -104,7 +104,6 @@ private:
     std::unique_ptr<Listener> _listener;
 
     std::vector<Instance *> _instances;
-
 };
 
 #endif // __MODELMGR_HXX

src/Network/DNSClient.hxx

@@ -42,6 +42,7 @@ public:
     virtual void update(double);
 
     static const char* subsystemName() { return "dns"; }
+
 private:
     bool _inited;
     std::unique_ptr<simgear::DNS::Client> _dns;

src/Network/HTTPClient.hxx

@@ -49,6 +49,7 @@ public:
     std::string getDefaultCatalogFallbackUrl() const;
 
     static const char* subsystemName() { return "http"; }
+
 private:
     bool _inited;
     std::unique_ptr<simgear::HTTP::Client> _http;

src/Network/fgcom.hxx

@@ -23,7 +23,8 @@
 #include <simgear/props/props.hxx>
 #include <simgear/math/sg_geodesy.hxx>
 
-class FGCom : public SGSubsystem, public SGPropertyChangeListener
+class FGCom : public SGSubsystem,
+              public SGPropertyChangeListener
 {
 public:
     FGCom();
@@ -38,9 +39,7 @@ class FGCom : public SGSubsystem, public SGPropertyChangeListener
     virtual void shutdown();
     void iaxTextEvent(struct iaxc_ev_text text);
 
-
 private:
-
     SGPropertyNode_ptr _ptt_node;                             // PTT; nonzero int indicating channel number (instrumentation/comm/[channel-1])
     SGPropertyNode_ptr _selected_comm_node;                   // selected channel (fgcom); nonzero channel int indicating channel number (instrumentation/comm/[channel-1])
     SGPropertyNode_ptr _commFrequencyNode;                    // current comm node in use; e.g. /instrumentation/comm[0]
@@ -68,7 +67,6 @@ class FGCom : public SGSubsystem, public SGPropertyChangeListener
     SGPropertyNode_ptr _mpTransmitFrequencyNode;              // sim/multiplay/comm-transmit-frequency-mhz
     SGPropertyNode_ptr _mpTransmitPowerNode;                  // sim/multiplay/comm-transmit-power-norm
 
-
     double   _maxRange;
     double   _minRange;
     double   _currentCommFrequency;
@@ -98,7 +96,6 @@ class FGCom : public SGSubsystem, public SGPropertyChangeListener
     void updateCall();
     void connectToCommFrequency();
     void testMode(bool testMode);
-
 };
 
 #endif // of FG_FGCOM_HXX

src/Network/http/httpd.cxx

@@ -166,9 +166,9 @@ public:
  *
  * Mongoose API is documented here: http://cesanta.com/docs/API.shtml
  */
-class MongooseHttpd: public FGHttpd {
+class MongooseHttpd : public FGHttpd
+{
 public:
-
     /**
      * Construct a MongooseHttpd object from options in a PropertyNode
      */
@@ -210,8 +210,7 @@ public:
      *
      * @see URIHandlerMap::findHandler( const std::string & uri )
      */
-  SGSharedPtr<URIHandler> findHandler(const std::string & uri)
-  {
+    SGSharedPtr<URIHandler> findHandler(const std::string & uri) {
         return _uriHandler.findHandler(uri);
     }
 

src/Network/http/httpd.hxx

@@ -26,6 +26,7 @@
 
 
 namespace flightgear {
+
 namespace http {
 
 extern const char * PROPERTY_ROOT;
@@ -36,7 +37,8 @@ public:
     static FGHttpd * createInstance( SGPropertyNode_ptr configNode );
 };
 
-}
+} // namespace http
+
 } // namespace flightgear
 
 #endif // FG_HTTPD_HXX

src/Scenery/scenery.hxx

@@ -52,7 +52,6 @@ class FGScenery : public SGSubsystem
     class ScenerySwitchListener;
     friend class ScenerySwitchListener;
 
-    
     // scene graph
     osg::ref_ptr<osg::Switch> scene_graph;
     osg::ref_ptr<osg::Group> terrain_branch;

src/Scripting/NasalSys.hxx

@@ -157,6 +157,7 @@ public:
     { return _log.get(); }
 
     static const char* subsystemName() { return "nasal"; }
+
 private:
     //friend class FGNasalScript;
     friend class FGNasalListener;
@@ -222,7 +223,8 @@ private:
 };
 
 #if 0
-class FGNasalScript {
+class FGNasalScript
+{
 public:
     ~FGNasalScript() { _nas->gcRelease(_gcKey); }
 
@@ -233,6 +235,7 @@ public:
     }
 
     FGNasalSys* sys() const { return _nas; }
+
 private:
     friend class FGNasalSys;
     naRef _code;

src/Sound/voice.hxx

@@ -50,7 +50,8 @@ using std::vector;
 
 
 
-class FGVoiceMgr : public SGSubsystem {
+class FGVoiceMgr : public SGSubsystem
+{
 public:
     FGVoiceMgr();
     ~FGVoiceMgr();
@@ -58,10 +59,11 @@ public:
     void shutdown();
     void update(double dt);
 
-
     class FGVoice;
+
 protected:
     friend class FGFestivalVoice;
+
 #if defined(ENABLE_THREADS)
     class FGVoiceThread;
     FGVoiceThread *_thread;
@@ -78,7 +80,8 @@ protected:
 
 
 #if defined(ENABLE_THREADS)
-class FGVoiceMgr::FGVoiceThread : public OpenThreads::Thread {
+class FGVoiceMgr::FGVoiceThread : public OpenThreads::Thread
+{
 public:
     FGVoiceThread(FGVoiceMgr *mgr) : _mgr(mgr) {}
     void run();
@@ -88,13 +91,15 @@ private:
     void wait_for_jobs() { OpenThreads::ScopedLock<OpenThreads::Mutex> g(_mutex); _jobs.wait(&_mutex); }
     OpenThreads::Condition _jobs;
     OpenThreads::Mutex _mutex;
+
 protected:
     FGVoiceMgr *_mgr;
 };
 #endif
 
 
-class FGVoiceMgr::FGVoice : public SGPropertyChangeListener {
+class FGVoiceMgr::FGVoice : public SGPropertyChangeListener
+{
 public:
   FGVoice(FGVoiceMgr * mgr ) : _mgr(mgr) {}
   virtual ~FGVoice() {}
@@ -113,8 +118,6 @@ protected:
 #else
   std::queue<std::string> _msg;
 #endif
-
-
 };
 
 #endif // _VOICE_HXX