Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing...

[ardour.git] / libs / ardour / ardour / control_protocol_manager.h

diff --git a/libs/ardour/ardour/control_protocol_manager.h b/libs/ardour/ardour/control_protocol_manager.h
index c61513e117becf2da996baa9007b0d0d90a317f1..bceece9adf47d8a99089ac30f958de9ae49f143a 100644 (file)
--- a/libs/ardour/ardour/control_protocol_manager.h
+++ b/libs/ardour/ardour/control_protocol_manager.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2007 Paul Davis 
+    Copyright (C) 2000-2007 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@
 
 #include <glibmm/thread.h>
 
-#include <pbd/stateful.h> 
+#include "pbd/stateful.h"
 
 namespace ARDOUR {
 
@@ -52,10 +52,9 @@ struct ControlProtocolInfo {
  class ControlProtocolManager : public sigc::trackable, public PBD::Stateful
 {
   public:
-       ControlProtocolManager ();
        ~ControlProtocolManager ();
 
-       static ControlProtocolManager& instance() { return *_instance; }
+       static ControlProtocolManager& instance();
 
        void set_session (Session&);
        void discover_control_protocols ();
@@ -75,6 +74,7 @@ struct ControlProtocolInfo {
        XMLNode& get_state (void);
 
   private:
+       ControlProtocolManager ();
        static ControlProtocolManager* _instance;
 
        Session* _session;