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.

simgear/canvas/CanvasMgr.hxx

@@ -28,11 +28,9 @@ namespace simgear
 namespace canvas
 {
 
-  class CanvasMgr:
+class CanvasMgr : public PropertyBasedMgr
-    public PropertyBasedMgr
 {
 public:
-
     /**
      * @param node    Root node of branch used to control canvasses
      */
@@ -61,7 +59,6 @@ namespace canvas
     CanvasPtr getCanvas(const std::string& name) const;
 
 protected:
-
     void elementCreated(PropertyBasedElementPtr element) override;
 };
 

simgear/misc/interpolator.hxx

@@ -30,7 +30,8 @@
 // code can register another one immediately without worrying about
 // timer aliasing.
 
-class SGInterpolator : public SGSubsystem {
+class SGInterpolator : public SGSubsystem
+{
 public:
     SGInterpolator() { _list = 0; }
     virtual void init() {}

simgear/props/PropertyBasedMgr.hxx

@@ -29,8 +29,7 @@
 namespace simgear
 {
 
-  class PropertyBasedMgr:
+class PropertyBasedMgr : public SGSubsystem,
-    public SGSubsystem,
                          public SGPropertyChangeListener
 {
 public:
@@ -63,7 +62,6 @@ namespace simgear
     virtual const SGPropertyNode* getPropertyRoot() const;
 
 protected:
-
     typedef boost::function<PropertyBasedElementPtr(SGPropertyNode*)>
             ElementFactory;
 
@@ -95,7 +93,6 @@ namespace simgear
                        SGPropertyNode * child ) override;
 
     virtual void elementCreated(PropertyBasedElementPtr element) {}
-
 };
 
 } // namespace simgear

simgear/props/PropertyInterpolationMgr.hxx

@@ -28,8 +28,7 @@
 
 #include <list>
 
-namespace simgear
+namespace simgear {
-{
 
 /**
  * Subsystem that manages interpolation of properties.
@@ -45,8 +44,7 @@ namespace simgear
  * By default "linear" (constant animation speed) and "swing" (smooth
  * acceleration and deceleration) are available.
  */
-  class PropertyInterpolationMgr:
+class PropertyInterpolationMgr : public SGSubsystem
-    public SGSubsystem
 {
 public:
     typedef PropertyInterpolator* (*InterpolatorFactory)();
@@ -106,8 +104,7 @@ namespace simgear
     template <class T>
     void addInterpolatorFactory(const std::string& type)
     {
-        addInterpolatorFactory
+        addInterpolatorFactory(
-        (
             type,
             &simgear::make_new_derived<PropertyInterpolator, T>
         );
@@ -126,7 +123,6 @@ namespace simgear
     void setRealtimeProperty(SGPropertyNode* node);
 
 protected:
-
     typedef std::map<std::string, InterpolatorFactory> InterpolatorFactoryMap;
     typedef std::map<std::string, easing_func_t>       EasingFunctionMap;
     typedef std::pair<SGPropertyNode*,

simgear/scene/tsync/terrasync.hxx

@@ -39,7 +39,6 @@ class BufferedLogCallback;
 class SGTerraSync : public SGSubsystem
 {
 public:
-
     SGTerraSync();
     virtual ~SGTerraSync();
 
@@ -80,6 +79,7 @@ public:
     void scheduleDataDir(const std::string& dataDir);
 
     bool isDataDirPending(const std::string& dataDir) const;
+
 protected:
     void syncAirportsModels();
     string_list getSceneryPathSuffixes() const;

simgear/sound/soundmgr.hxx

@@ -49,7 +49,6 @@ class SGSoundSample;
 class SGSoundMgr : public SGSubsystem
 {
 public:
-
     SGSoundMgr();
     ~SGSoundMgr();
 
@@ -325,6 +324,7 @@ public:
     bool testForError(std::string s, std::string name = "sound manager");
 
     static const char* subsystemName() { return "sound"; };
+
 private:
     class SoundManagerPrivate;
     /// private implementation object

simgear/structure/SGPerfMon.hxx

@@ -34,7 +34,6 @@ class SampleStatistic;
 
 class SGPerformanceMonitor : public SGSubsystem
 {
-
 public:
     SGPerformanceMonitor(SGSubsystemMgr* subSysMgr, SGPropertyNode_ptr root);
 

simgear/structure/event_mgr.hxx

@@ -8,7 +8,8 @@
 
 class SGEventMgr;
 
-class SGTimer {
+class SGTimer
+{
 public:
     ~SGTimer();
     void run();
@@ -20,7 +21,8 @@ public:
     bool running;
 };
 
-class SGTimerQueue {
+class SGTimerQueue
+{
 public:
     SGTimerQueue(int preSize=1);
     ~SGTimerQueue();
@@ -39,6 +41,7 @@ public:
     SGTimer* findByName(const std::string& name) const;
 
     void dump();
+
 private:
     // The "priority" is stored as a negative time.  This allows the
     // implementation to treat the "top" of the heap as the largest
@@ -77,6 +80,7 @@ public:
     virtual void update(double delta_time_sec);
     virtual void unbind();
     virtual void shutdown();
+
     void setRealtimeProperty(SGPropertyNode* node) { _rtProp = node; }
 
     /**
@@ -121,6 +125,7 @@ public:
     void removeTask(const std::string& name);
 
     void dump();
+
 private:
     friend class SGTimer;
 

simgear/structure/subsystem_mgr.hxx

@@ -127,6 +127,7 @@ typedef void (*SGSubsystemTimingCb)(void* userData, const std::string& name, Sam
  * subsystems may also override the suspend() and resume() methods to
  * take different actions.</p>
  */
+
 class SGSubsystem : public SGReferenced
 {
 public:
@@ -431,6 +432,7 @@ public:
     { return true; }
     
     SGSubsystemMgr* get_manager() const override;
+
 private:
     void forEach(std::function<void(SGSubsystem*)> f);
     void reverseForEach(std::function<void(SGSubsystem*)> f);