replicate the remove-all-trailing whitespace commit(s) in master

1 files changed, 18 insertions, 18 deletions

diff --git a/libs/gtkmm2ext/gtkmm2ext/bindings.h b/libs/gtkmm2ext/gtkmm2ext/bindings.h
index cf9d0b8d13..b4543f4be7 100644
--- a/libs/gtkmm2ext/gtkmm2ext/bindings.h
+++ b/libs/gtkmm2ext/gtkmm2ext/bindings.h
@@ -46,7 +46,7 @@ class LIBGTKMM2EXT_API KeyboardKey
         static bool make_key (const std::string&, KeyboardKey&);
 
         std::string display_label() const;
-        
+
   private:
         uint64_t _val;
 };
@@ -84,7 +84,7 @@ class LIBGTKMM2EXT_API ActionMap {
 	~ActionMap();
 
 	std::string name() const { return _name; }
-	
+
         Glib::RefPtr<Gtk::ActionGroup> create_action_group (const std::string& group_name);
 
         Glib::RefPtr<Gtk::Action> register_action (Glib::RefPtr<Gtk::ActionGroup> group, const char* name, const char* label);
@@ -92,12 +92,12 @@ class LIBGTKMM2EXT_API ActionMap {
 						   const char* name, const char* label, sigc::slot<void> sl);
         Glib::RefPtr<Gtk::Action> register_radio_action (Glib::RefPtr<Gtk::ActionGroup> group,
 							 Gtk::RadioAction::Group&,
-							 const char* name, const char* label, 
+							 const char* name, const char* label,
                                                          sigc::slot<void,GtkAction*> sl,
                                                          int value);
         Glib::RefPtr<Gtk::Action> register_radio_action (Glib::RefPtr<Gtk::ActionGroup> group,
 							 Gtk::RadioAction::Group&,
-							 const char* name, const char* label, 
+							 const char* name, const char* label,
                                                          sigc::slot<void> sl);
 	Glib::RefPtr<Gtk::Action> register_toggle_action (Glib::RefPtr<Gtk::ActionGroup> group,
 							  const char* name, const char* label, sigc::slot<void> sl);
@@ -118,7 +118,7 @@ class LIBGTKMM2EXT_API ActionMap {
 	                             std::vector<std::string>& tooltips,
 	                             std::vector<std::string>& keys,
 	                             std::vector<Glib::RefPtr<Gtk::Action> >& actions);
-	
+
   private:
 	std::string _name;
 
@@ -130,10 +130,10 @@ class LIBGTKMM2EXT_API ActionMap {
         /* initialized to null; set after a Bindings object has ::associated()
          * itself with this action map.
          */
-         
+
         Bindings* _bindings;
-        
-};        
+
+};
 
 class LIBGTKMM2EXT_API Bindings {
   public:
@@ -148,7 +148,7 @@ class LIBGTKMM2EXT_API Bindings {
 	        std::string action_name;
 	        Glib::RefPtr<Gtk::Action> action;
         };
-        
+
         Bindings (std::string const& name);
         ~Bindings ();
 
@@ -156,11 +156,11 @@ class LIBGTKMM2EXT_API Bindings {
 
         void associate ();
         void dissociate ();
-        
+
         bool empty() const;
         bool empty_keys () const;
         bool empty_mouse () const;
-        
+
         void add (KeyboardKey, Operation, std::string const&, bool can_save = false);
         bool replace (KeyboardKey, Operation, std::string const& action_name, bool can_save = true);
         void remove (KeyboardKey, Operation, bool can_save = false);
@@ -173,11 +173,11 @@ class LIBGTKMM2EXT_API Bindings {
         bool activate (MouseButton, Operation);
 
         KeyboardKey get_binding_for_action (Glib::RefPtr<Gtk::Action>, Operation& op);
-        
+
         bool load (XMLNode const& node);
         void load_operation (XMLNode const& node);
         void save (XMLNode& root);
-        
+
         /* There are modifiers that we just don't care about
            when it comes to defining bindings. This sets the modifiers
            that will be ignored when comparing a key event with
@@ -189,7 +189,7 @@ class LIBGTKMM2EXT_API Bindings {
         static uint32_t ignored_state() { return _ignored_state; }
 
         /* GTK has the following position a Gtk::Action:
-         * 
+         *
          *  accel_path: <Actions>/GroupName/ActionName
          *  name: ActionName
          *
@@ -202,9 +202,9 @@ class LIBGTKMM2EXT_API Bindings {
          * This (static) method returns the "ardour" name for the action.
          */
         static std::string ardour_action_name (Glib::RefPtr<Gtk::Action>);
-        
+
         void set_action_map (ActionMap&);
-        
+
         /* used for editing bindings */
         void get_all_actions (std::vector<std::string>& paths,
                               std::vector<std::string>& labels,
@@ -218,7 +218,7 @@ class LIBGTKMM2EXT_API Bindings {
 	static void associate_all ();
 
 	static PBD::Signal1<void,Bindings*> BindingsChanged;
-	
+
   private:
         typedef std::map<KeyboardKey,ActionInfo> KeybindingMap;
 
@@ -226,7 +226,7 @@ class LIBGTKMM2EXT_API Bindings {
         ActionMap*   _action_map;
         KeybindingMap press_bindings;
         KeybindingMap release_bindings;
-        
+
         typedef std::map<MouseButton,ActionInfo> MouseButtonBindingMap;
         MouseButtonBindingMap button_press_bindings;
         MouseButtonBindingMap button_release_bindings;