NO-OP whitespace & foratting of header files

gtk2_ardour/ardour_display.h

@@ -39,9 +39,7 @@ class ArdourDisplay : public ArdourDropdown
 	boost::shared_ptr<PBD::Controllable> get_controllable() { return binding_proxy.get_controllable(); }
 	void set_controllable (boost::shared_ptr<PBD::Controllable> c);
 
-//	bool on_button_release_event (GdkEventButton*);
 	bool on_scroll_event (GdkEventScroll* ev);
-//	bool on_motion_notify_event (GdkEventMotion *ev) ;
 
 	void add_controllable_preset (const char*, float);
 	void handle_controllable_preset (float p);

gtk2_ardour/au_pluginui.h

@@ -14,7 +14,6 @@
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
 */
 
 #ifndef __gtk2_ardour_auplugin_ui_h__

gtk2_ardour/audio_region_view.h

@@ -141,8 +141,8 @@ class AudioRegionView : public RegionView
 protected:
 
 	/* this constructor allows derived types
-	   to specify their visibility requirements
+	 * to specify their visibility requirements
-	   to the TimeAxisViewItem parent class
+	 * to the TimeAxisViewItem parent class
 	 */
 
 	enum Flags {

gtk2_ardour/automation_time_axis.h

@@ -54,7 +54,8 @@ class AutomationStreamView;
 class AutomationController;
 class ItemCounts;
 
-class AutomationTimeAxisView : public TimeAxisView {
+class AutomationTimeAxisView : public TimeAxisView
+{
 public:
 	AutomationTimeAxisView (ARDOUR::Session*,
 	                        boost::shared_ptr<ARDOUR::Stripable>,
@@ -129,8 +130,8 @@ class AutomationTimeAxisView : public TimeAxisView {
 
 protected:
 	/* Note that for MIDI controller "automation" (in regions), all of these
-	   may be set.  In this case, _automatable is likely _route so the
+	 * may be set.  In this case, _automatable is likely _route so the
-	   controller will send immediate events out the route's MIDI port. */
+	 * controller will send immediate events out the route's MIDI port. */
 
 	/** parent strip */
 	boost::shared_ptr<ARDOUR::Stripable> _stripable;

gtk2_ardour/button_joiner.h

@@ -27,7 +27,8 @@
 #include "gtkmm2ext/activatable.h"
 #include "gtkmm2ext/cairo_widget.h"
 
-class ButtonJoiner : public CairoWidget, public Gtkmm2ext::Activatable {
+class ButtonJoiner : public CairoWidget, public Gtkmm2ext::Activatable
+{
 public:
 	ButtonJoiner (const std::string&, Gtk::Widget&, Gtk::Widget&, bool central_link = false);
 	~ButtonJoiner ();

gtk2_ardour/clock_group.h

@@ -25,7 +25,8 @@
 
 #include "audio_clock.h"
 
-class ClockGroup : public sigc::trackable {
+class ClockGroup : public sigc::trackable
+{
 public:
 	ClockGroup ();
 	~ClockGroup ();

gtk2_ardour/color_theme_manager.h

@@ -67,7 +67,7 @@ class ColorThemeManager : public OptionEditorMiniPage
 	Gtk::Notebook notebook;
 
 	/* handls response from color dialog when it is used to
-	   edit a derived color.
+	 * edit a derived color.
 	 */
 	void palette_color_response (int, std::string);
 
@@ -76,16 +76,16 @@ class ColorThemeManager : public OptionEditorMiniPage
 	ArdourCanvas::Container* palette_group;
 
 	/* these methods create and manage a canvas for use in either the
-	   palette tab or in a separate dialog. Different behaviour is
+	 * palette tab or in a separate dialog. Different behaviour is
-	   accomplished by changing the event handler passed into the
+	 * accomplished by changing the event handler passed into the
-	   allocation handler. We do it there because we have to rebuild
+	 * allocation handler. We do it there because we have to rebuild
-	   the canvas on allocation events, and during the rebuild, connect
+	 * the canvas on allocation events, and during the rebuild, connect
-	   each rectangle to the event handler.
+	 * each rectangle to the event handler.
-
+	 *
-	   the alternative is one event handler for the canvas and a map
+	 * the alternative is one event handler for the canvas and a map
-	   of where each color rectangle is. nothing wrong with this
+	 * of where each color rectangle is. nothing wrong with this
-	   but the per-rect event setup is simpler and avoids building
+	 * but the per-rect event setup is simpler and avoids building
-	   and looking up the map information.
+	 * and looking up the map information.
 	 */
 	ArdourCanvas::Container* initialize_palette_canvas (ArdourCanvas::Canvas& canvas);
 	void build_palette_canvas (ArdourCanvas::Canvas&, ArdourCanvas::Container&, sigc::slot<bool,GdkEvent*,std::string> event_handler);
@@ -93,11 +93,11 @@ class ColorThemeManager : public OptionEditorMiniPage
 	void palette_size_request (Gtk::Requisition*);
 
 	/* handles events from a palette canvas inside the palette (derived
-	   colors) tab
+	 * colors) tab
 	 */
 	bool palette_event (GdkEvent*, std::string name);
 	/* allows user to edit a named color (e.g. "color 3") after clicking
-	   on it inside the palette tab.
+	 * on it inside the palette tab.
 	 */
 	void edit_palette_color (std::string);
 

gtk2_ardour/crossfade_edit.h

@@ -57,8 +57,7 @@ class CrossfadeEditor : public ArdourDialog
 
 	static const double canvas_border;
 
-	/* these are public so that a caller/subclass can make them do the right thing.
+	/* these are public so that a caller/subclass can make them do the right thing. */
-	 */
 
 	Gtk::Button* cancel_button;
 	Gtk::Button* ok_button;

gtk2_ardour/editor_cursors.h

@@ -29,7 +29,8 @@
 
 class Editor;
 
-class EditorCursor {
+class EditorCursor
+{
 public:
 	EditorCursor (Editor&, bool (Editor::*)(GdkEvent*,ArdourCanvas::Item*));
 	EditorCursor (Editor&);

gtk2_ardour/engine_dialog.h

@@ -38,7 +38,8 @@
 #include "ardour_dialog.h"
 #include "ardour_button.h"
 
-class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList {
+class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList
+{
 public:
 	EngineControl ();
 	~EngineControl ();
@@ -236,8 +237,8 @@ class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList {
 			, output_channels (0)
 			, active (false)
 			, use_buffered_io (false)
-		, lru (0) {}
+			, lru (0)
-
+		{}
 	};
 
 	typedef boost::shared_ptr<StateStruct> State;

gtk2_ardour/export_channel_selector.h

@@ -70,7 +70,6 @@ class ExportChannelSelector : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 
 class PortExportChannelSelector : public ExportChannelSelector
 {
-
 public:
 
 	PortExportChannelSelector (ARDOUR::Session * session, ProfileManagerPtr manager);
@@ -158,7 +157,8 @@ class PortExportChannelSelector : public ExportChannelSelector
 
 	/* Channels view */
 
-	class ChannelTreeView : public Gtk::TreeView {
+	class ChannelTreeView : public Gtk::TreeView
+	{
 	public:
 
 		ChannelTreeView (uint32_t max_channels);

gtk2_ardour/export_dialog.h

@@ -46,7 +46,6 @@ class ExportChannelSelector;
 
 class ExportDialog : public ArdourDialog, public PBD::ScopedConnectionList
 {
-
 public:
 
 	ExportDialog (PublicEditor & editor, std::string title, ARDOUR::ExportProfileManager::ExportType type);

gtk2_ardour/export_file_notebook.h

@@ -70,7 +70,8 @@ class ExportFileNotebook : public Gtk::Notebook, public ARDOUR::SessionHandlePtr
 	uint32_t     last_visible_page;
 	uint32_t     page_counter;
 
-	class FilePage : public Gtk::VBox {
+	class FilePage : public Gtk::VBox
+	{
 	public:
 		FilePage (ARDOUR::Session * s, ManagerPtr profile_manager, ExportFileNotebook * parent, uint32_t number,
 		          ARDOUR::ExportProfileManager::FormatStatePtr format_state,

gtk2_ardour/export_filename_selector.h

@@ -27,7 +27,6 @@
 #include "ardour/export_filename.h"
 #include "ardour/session_handle.h"
 
-///
 class ExportFilenameSelector : public Gtk::VBox, public ARDOUR::SessionHandlePtr
 {
 public:

gtk2_ardour/export_format_dialog.h

@@ -38,7 +38,8 @@
 
 #include <gtkmm.h>
 
-class ExportFormatDialog : public ArdourDialog, public PBD::ScopedConnectionList {
+class ExportFormatDialog : public ArdourDialog, public PBD::ScopedConnectionList
+{
 private:
 
 	typedef ARDOUR::WeakExportFormatCompatibilityPtr WeakCompatPtr;

gtk2_ardour/export_format_selector.h

@@ -34,10 +34,8 @@ namespace ARDOUR {
 	class ExportProfileManager;
 }
 
-///
 class ExportFormatSelector : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 {
-
 private:
 
 	typedef boost::shared_ptr<ARDOUR::ExportFormatSpecification> FormatPtr;

gtk2_ardour/export_preset_selector.h

@@ -28,7 +28,6 @@
 
 class ExportPresetSelector : public Gtk::HBox
 {
-
 public:
 
 	ExportPresetSelector ();

gtk2_ardour/gain_meter.h

@@ -127,7 +127,6 @@ class GainMeterBase : virtual public sigc::trackable, ARDOUR::SessionHandlePtr
 	Gtk::Adjustment              gain_adjustment;
 	Gtkmm2ext::FocusEntry        gain_display;
 	Gtkmm2ext::FocusEntry        peak_display;
-//	Gtk::Button                  peak_display;
 	Gtk::DrawingArea             meter_metric_area;
 	Gtk::DrawingArea             meter_ticks1_area;
 	Gtk::DrawingArea             meter_ticks2_area;

gtk2_ardour/ghostregion.h

@@ -81,7 +81,8 @@ public:
 
 class MidiGhostRegion : public GhostRegion {
 public:
-	class GhostEvent : public sigc::trackable {
+	class GhostEvent : public sigc::trackable
+	{
 	public:
 		GhostEvent(::NoteBase *, ArdourCanvas::Container *);
 		virtual ~GhostEvent ();

gtk2_ardour/keyboard.h

@@ -67,38 +67,31 @@ class ArdourKeyboard : public Gtkmm2ext::Keyboard
 	static bool indicates_constraint (guint state);
 
 	static void set_constraint_modifier (guint);
-	/** @return Modifier mask to constrain drags in a particular direction;
+	/** @return Modifier mask to constrain drags in a particular direction; */
-	 */
 	static ModifierMask constraint_modifier () { return ModifierMask (constraint_mod); }
 
 	static void set_trim_contents_modifier (guint);
-	/** @return Modifier mask to move contents rather than region bounds during trim;
+	/** @return Modifier mask to move contents rather than region bounds during trim; */
-	 */
 	static ModifierMask trim_contents_modifier () { return ModifierMask (trim_contents_mod); }
 
 	static void set_trim_overlap_modifier (guint);
-	/** @return Modifier mask to remove region overlaps during trim;
+	/** @return Modifier mask to remove region overlaps during trim; */
-	 */
 	static ModifierMask trim_overlap_modifier () { return ModifierMask (trim_overlap_mod); }
 
 	static void set_trim_anchored_modifier (guint);
-	/** @return Modifier mask to use anchored trim;
+	/** @return Modifier mask to use anchored trim; */
-	 */
 	static ModifierMask trim_anchored_modifier () { return ModifierMask (trim_anchored_mod); }
 
 	static void set_fine_adjust_modifier (guint);
-	/** @return Modifier mask to fine adjust (control points only atm);
+	/** @return Modifier mask to fine adjust (control points only atm); */
-	 */
 	static ModifierMask fine_adjust_modifier () { return ModifierMask (fine_adjust_mod); }
 
 	static void set_push_points_modifier (guint);
-	/** @return Modifier mask to push proceeding points;
+	/** @return Modifier mask to push proceeding points; */
-	 */
 	static ModifierMask push_points_modifier () { return ModifierMask (push_points_mod); }
 
 	static void set_note_size_relative_modifier (guint);
-	/** @return Modifier mask to resize notes relatively;
+	/** @return Modifier mask to resize notes relatively; */
-	 */
 	static ModifierMask note_size_relative_modifier () { return ModifierMask (note_size_relative_mod); }
 private:
 	static guint     constraint_mod;

gtk2_ardour/keyeditor.h

@@ -80,7 +80,7 @@ class KeyEditor : public ArdourWindow
 
 		Gtk::VBox vpacker;
 		/* give KeyEditor full access to these. This is just a helper
-		   class with no special semantics
+		 * class with no special semantics
 		 */
 
 		KeyEditor& owner;

gtk2_ardour/latency_gui.h

@@ -46,7 +46,8 @@ class LatencyBarController : public Gtkmm2ext::BarController
 public:
 	LatencyBarController (Gtk::Adjustment& adj, LatencyGUI* g)
 		: BarController (adj, boost::shared_ptr<PBD::IgnorableControllable> (new PBD::IgnorableControllable ())),
-		  _latency_gui (g) {}
+		                 _latency_gui (g)
+	{}
 
 private:
 	LatencyGUI* _latency_gui;

gtk2_ardour/luawindow.h

@@ -66,7 +66,8 @@ class LuaWindow :
 		Buffer_Scratch    = 0x10,
 	} BufferFlags;
 
-	class ScriptBuffer {
+	class ScriptBuffer
+	{
 	public:
 		ScriptBuffer (const std::string&);
 		ScriptBuffer (ARDOUR::LuaScriptInfoPtr);

gtk2_ardour/meterbridge.h

@@ -94,7 +94,8 @@ class Meterbridge :
 		}
 	};
 
-	struct MeterOrderRouteSorter {
+	struct MeterOrderRouteSorter
+	{
 		bool operator() (struct MeterBridgeStrip ma, struct MeterBridgeStrip mb) {
 			boost::shared_ptr<ARDOUR::Route> a = ma.s->route();
 			boost::shared_ptr<ARDOUR::Route> b = mb.s->route();

gtk2_ardour/midi_export_dialog.h

@@ -27,7 +27,8 @@
 #include "ardour_dialog.h"
 #include "public_editor.h"
 
-class MidiExportDialog : public ArdourDialog {
+class MidiExportDialog : public ArdourDialog
+{
 public:
 	MidiExportDialog (PublicEditor& editor, boost::shared_ptr<ARDOUR::MidiRegion>);
 	~MidiExportDialog ();

gtk2_ardour/midi_list_editor.h

@@ -51,7 +51,8 @@ class MidiListEditor : public ArdourWindow
 	~MidiListEditor();
 
 private:
-	struct MidiListModelColumns : public Gtk::TreeModel::ColumnRecord {
+	struct MidiListModelColumns : public Gtk::TreeModel::ColumnRecord
+	{
 		MidiListModelColumns() {
 			add (channel);
 			add (note);
@@ -70,7 +71,8 @@ class MidiListEditor : public ArdourWindow
 		Gtk::TreeModelColumn<boost::shared_ptr<NoteType> > _note;
 	};
 
-	struct NoteLengthColumns : public Gtk::TreeModel::ColumnRecord {
+	struct NoteLengthColumns : public Gtk::TreeModel::ColumnRecord
+	{
 		NoteLengthColumns() {
 			add (ticks);
 			add (name);

gtk2_ardour/midi_scroomer.h

@@ -23,7 +23,8 @@
 #include <gtkmm2ext/scroomer.h>
 #include <gdkmm/pixbuf.h>
 
-class MidiScroomer : public Gtkmm2ext::Scroomer {
+class MidiScroomer : public Gtkmm2ext::Scroomer
+{
 public:
 	MidiScroomer(Gtk::Adjustment&);
 	~MidiScroomer();

gtk2_ardour/midi_streamview.h

@@ -81,20 +81,23 @@ class MidiStreamView : public StreamView
 	//bool can_change_layer_display() const { return false; } // revert this change for now.  Although stacked view is weirdly implemented wrt the "scroomer", it is still necessary to be able to manage layered regions.
 	void redisplay_track ();
 
-	inline double contents_height() const
+	inline double contents_height() const {
-	{ return (child_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 2); }
+		return (child_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 2);
+	}
 
-	inline double note_to_y(uint8_t note) const
+	inline double note_to_y(uint8_t note) const {
-		{ return contents_height()
+		return contents_height() - (note + 1 - lowest_note()) * note_height() + 1;
-			- (note + 1 - lowest_note()) * note_height() + 1; }
+	}
 
 	uint8_t y_to_note(double y) const;
 
-	inline double note_height() const
+	inline double note_height() const {
-		{ return contents_height() / (double)contents_note_range(); }
+		return contents_height() / (double)contents_note_range();
+	}
 
-	inline uint8_t contents_note_range() const
+	inline uint8_t contents_note_range() const {
-		{ return highest_note() - lowest_note() + 1; }
+		return highest_note() - lowest_note() + 1;
+	}
 
 	sigc::signal<void> NoteRangeChanged;
 

gtk2_ardour/mixer_ui.h

@@ -343,7 +343,7 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p
 	static const int32_t default_height = 765;
 
 	/** true if we are rebuilding the route group list, or clearing
-	    it during a session teardown.
+	 * it during a session teardown.
 	 */
 	bool _in_group_rebuild_or_clear;
 	bool _route_deletion_in_progress;

gtk2_ardour/monitor_selector.h

@@ -56,7 +56,6 @@ class MonitorSelector : public PortMatrix
 	bool can_rename_channels (boost::shared_ptr<ARDOUR::Bundle>) const { return false; }
 
 private:
-
 	void io_changed ();
 	void io_changed_proxy ();
 

gtk2_ardour/note_base.h

@@ -106,11 +106,9 @@ class NoteBase : public sigc::trackable
 		if (selected) {
 			return _selected_mod_col;
 		} else if (vel < 64) {
-			return UINT_INTERPOLATE(_min_col, _mid_col,
+			return UINT_INTERPOLATE(_min_col, _mid_col, (vel / (double)63.0));
-				(vel / (double)63.0));
 		} else {
-			return UINT_INTERPOLATE(_mid_col, _max_col,
+			return UINT_INTERPOLATE(_mid_col, _max_col, ((vel - 64) / (double)63.0));
-				((vel-64) / (double)63.0));
 		}
 	}
 

gtk2_ardour/nsm.h

@@ -34,6 +34,7 @@ class NSM_Client:public NSM::Client
 	                  const char *display_name,
 	                  const char *client_id,
 	                  char **out_msg);
+
 	int command_save (char **out_msg);
 };
 

gtk2_ardour/nsmclient.h

@@ -23,10 +23,8 @@
 
 namespace NSM
 {
-
 class Client
 {
-
 private:
 
 	const char *nsm_url;

gtk2_ardour/playlist_selector.h

@@ -64,7 +64,8 @@ class PlaylistSelector : public ArdourDialog
 	void close_button_click ();
 	void selection_changed ();
 
-	struct ModelColumns : public Gtk::TreeModel::ColumnRecord {
+	struct ModelColumns : public Gtk::TreeModel::ColumnRecord
+	{
 		ModelColumns () {
 			add (text);
 			add (playlist);

gtk2_ardour/plugin_interest.h

@@ -25,7 +25,8 @@
 
 typedef std::vector<ARDOUR::PluginPtr> SelectedPlugins;
 
-class PluginInterestedObject {
+class PluginInterestedObject
+{
 public:
 	PluginInterestedObject() {}
 	virtual ~PluginInterestedObject() {}

gtk2_ardour/port_group.h

@@ -143,9 +143,7 @@ class PortGroupList : public sigc::trackable
 	void emit_changed ();
 	void emit_bundle_changed (ARDOUR::Bundle::Change);
 	boost::shared_ptr<ARDOUR::Bundle> make_bundle_from_ports (std::vector<std::string> const &, ARDOUR::DataType, bool, std::string const& bundle_name = std::string()) const;
-	void maybe_add_processor_to_list (
+	void maybe_add_processor_to_list (boost::weak_ptr<ARDOUR::Processor>, std::list<boost::shared_ptr<ARDOUR::IO> > *, bool, std::set<boost::shared_ptr<ARDOUR::IO> > &);
-		boost::weak_ptr<ARDOUR::Processor>, std::list<boost::shared_ptr<ARDOUR::IO> > *, bool, std::set<boost::shared_ptr<ARDOUR::IO> > &
-		);
 
 	mutable PortGroup::BundleList _bundles;
 	List _groups;

gtk2_ardour/processor_box.h

@@ -457,7 +457,8 @@ class ProcessorBox : public Gtk::HBox, public PluginInterestedObject, public ARD
 
 	typedef std::vector<boost::shared_ptr<ARDOUR::Processor> > ProcSelection;
 
-	static ProcSelection current_processor_selection () {
+	static ProcSelection current_processor_selection ()
+	{
 		ProcSelection ps;
 		if (_current_processor_box) {
 			_current_processor_box->get_selected_processors (ps);

gtk2_ardour/public_editor.h

@@ -108,7 +108,8 @@ using ARDOUR::framecnt_t;
  * of PublicEditor need not be recompiled if private methods or member variables
  * change.
  */
-class PublicEditor : public Gtkmm2ext::Tabbable,  public ARDOUR::SessionHandlePtr, public AxisViewProvider {
+class PublicEditor : public Gtkmm2ext::Tabbable,  public ARDOUR::SessionHandlePtr, public AxisViewProvider
+{
 public:
 	PublicEditor (Gtk::Widget& content);
 	virtual ~PublicEditor ();
@@ -181,8 +182,7 @@ class PublicEditor : public Gtkmm2ext::Tabbable,  public ARDOUR::SessionHandlePt
 	 */
 	virtual Editing::MouseMode current_mouse_mode () const = 0;
 
-	/** @return Whether the current mouse mode is an "internal" editing mode.
+	/** @return Whether the current mouse mode is an "internal" editing mode. */
-	 */
 	virtual bool internal_editing() const = 0;
 
 	/** Possibly start the audition of a region.  If @param r is 0, or not an AudioRegion

gtk2_ardour/region_gain_line.h

@@ -49,5 +49,4 @@ private:
 	AudioRegionView& rv;
 };
 
-
 #endif /* __ardour_gtk_region_gain_line_h__ */

gtk2_ardour/region_view.h

@@ -176,8 +176,8 @@ class RegionView : public TimeAxisViewItem
 	std::vector<GhostRegion*> ghosts;
 
 	/** a list of rectangles which are used in stacked display mode to colour
-	    different bits of regions according to whether or not they are the one
+	 * different bits of regions according to whether or not they are the one
-	    that will be played at any given time.
+	 * that will be played at any given time.
 	 */
 	std::list<ArdourCanvas::Rectangle*> _coverage_frames;
 
@@ -187,8 +187,7 @@ class RegionView : public TimeAxisViewItem
 	/** a list of rectangles used to show the current silence threshold
 	*/
 	std::list<ArdourCanvas::Rectangle*> _silent_threshold_frames;
-	/** a text item to display strip silence statistics
+	/** a text item to display strip silence statistics */
-	 */
 	ArdourCanvas::Text* _silence_text;
 };
 

gtk2_ardour/rhythm_ferret.h

@@ -40,10 +40,11 @@ namespace ARDOUR {
 class Editor;
 class RegionView;
 
-class RhythmFerret : public ArdourDialog {
+class RhythmFerret : public ArdourDialog
+{
 public:
 	/* order of these enums must match the _analyse_mode_strings
-	   in rhythm_ferret.cc
+	 * in rhythm_ferret.cc
 	 */
 	enum AnalysisMode {
 		PercussionOnset,

gtk2_ardour/route_ui.h

@@ -310,7 +310,8 @@ class RouteUI : public virtual Selectable, public virtual ARDOUR::SessionHandleP
 	struct SoloMuteRelease {
 		SoloMuteRelease (bool was_active)
 			: active (was_active)
-			, exclusive (false) {}
+			, exclusive (false)
+		{}
 
 		boost::shared_ptr<ARDOUR::RouteList> routes;
 		boost::shared_ptr<ARDOUR::RouteList> routes_on;

gtk2_ardour/search_path_option.h

@@ -47,7 +47,8 @@ class SearchPathOption : public Option
 	sigc::slot<std::string> _get; ///< slot to get the configuration variable's value
 	sigc::slot<bool, std::string> _set;  ///< slot to set the configuration variable's value
 
-	struct PathEntry {
+	struct PathEntry
+	{
 		PathEntry (const std::string& path, bool removable=true);
 
 		Gtk::Entry entry;

gtk2_ardour/session_dialog.h

@@ -45,7 +45,8 @@
 
 class EngineControl;
 
-class SessionDialog : public ArdourDialog {
+class SessionDialog : public ArdourDialog
+{
 public:
 	SessionDialog (bool require_new, const std::string& session_name, const std::string& session_path,
 	               const std::string& template_name, bool cancel_not_quit);
@@ -110,14 +111,16 @@ class SessionDialog : public ArdourDialog {
 
 	void setup_existing_session_page ();
 
-	struct RecentSessionsSorter {
+	struct RecentSessionsSorter
+	{
 		bool operator() (std::pair<std::string,std::string> a, std::pair<std::string,std::string> b) const {
 			return ARDOUR::cmp_nocase(a.first, b.first) == -1;
 		}
 	};
 
 	struct RecentSessionModelColumns : public Gtk::TreeModel::ColumnRecord {
-	    RecentSessionModelColumns() {
+		RecentSessionModelColumns()
+		{
 			add (visible_name);
 			add (tip);
 			add (fullpath);

gtk2_ardour/session_metadata_dialog.h

@@ -38,7 +38,8 @@ class MetadataField;
 typedef boost::shared_ptr<MetadataField> MetadataPtr;
 
 /// Wraps a metadata field to be used in a GUI
-class MetadataField {
+class MetadataField
+{
 public:
 	MetadataField (std::string const & field_name);
 	virtual ~MetadataField();
@@ -62,7 +63,8 @@ class MetadataField {
 };
 
 /// MetadataField that contains text
-class TextMetadataField : public MetadataField {
+class TextMetadataField : public MetadataField
+{
 private:
 	typedef std::string (ARDOUR::SessionMetadata::*Getter) () const;
 	typedef void (ARDOUR::SessionMetadata::*Setter) (std::string const &);
@@ -90,7 +92,8 @@ class TextMetadataField : public MetadataField {
 };
 
 /// MetadataField that accepts only numbers
-class NumberMetadataField : public MetadataField {
+class NumberMetadataField : public MetadataField
+{
 private:
 	typedef uint32_t (ARDOUR::SessionMetadata::*Getter) () const;
 	typedef void (ARDOUR::SessionMetadata::*Setter) (uint32_t);
@@ -121,7 +124,8 @@ class NumberMetadataField : public MetadataField {
 };
 
 /// MetadataField that accepts EAN-13 data only
-class EAN13MetadataField : public MetadataField {
+class EAN13MetadataField : public MetadataField
+{
 private:
 	typedef std::string (ARDOUR::SessionMetadata::*Getter) () const;
 	typedef void (ARDOUR::SessionMetadata::*Setter) (std::string const &);
@@ -153,7 +157,8 @@ class EAN13MetadataField : public MetadataField {
 };
 
 /// Interface for MetadataFields
-class SessionMetadataSet : public ARDOUR::SessionHandlePtr {
+class SessionMetadataSet : public ARDOUR::SessionHandlePtr
+{
 public:
 	SessionMetadataSet (std::string const & name);
 	virtual ~SessionMetadataSet () {};
@@ -175,7 +180,8 @@ class SessionMetadataSet : public ARDOUR::SessionHandlePtr {
 };
 
 /// Contains MetadataFields for editing
-class SessionMetadataSetEditable : public SessionMetadataSet {
+class SessionMetadataSetEditable : public SessionMetadataSet
+{
 public:
 	SessionMetadataSetEditable (std::string const & name);
 
@@ -194,7 +200,8 @@ class SessionMetadataSetEditable : public SessionMetadataSet {
 };
 
 /// Contains MetadataFields for importing
-class SessionMetadataSetImportable : public SessionMetadataSet {
+class SessionMetadataSetImportable : public SessionMetadataSet
+{
 public:
 	SessionMetadataSetImportable (std::string const & name);
 
@@ -282,7 +289,8 @@ class SessionMetadataDialog : public ArdourDialog
 	Gtk::Button *     cancel_button;
 };
 
-class SessionMetadataEditor : public SessionMetadataDialog<SessionMetadataSetEditable> {
+class SessionMetadataEditor : public SessionMetadataDialog<SessionMetadataSetEditable>
+{
 public:
 	SessionMetadataEditor ();
 	~SessionMetadataEditor ();

gtk2_ardour/sfdb_ui.h

@@ -174,6 +174,7 @@ class SoundFileBrowser : public ArdourWindow
 	Gtk::Button freesound_similar_btn;
 
 	void handle_freesound_results(std::string theString);
+
 public:
 	SoundFileBrowser (std::string title, ARDOUR::Session* _s, bool persistent);
 	virtual ~SoundFileBrowser ();
@@ -275,10 +276,11 @@ class SoundFileChooser : public SoundFileBrowser
 
 class SoundFileOmega : public SoundFileBrowser
 {
-
 public:
-	SoundFileOmega (std::string title, ARDOUR::Session* _s,
+	SoundFileOmega (std::string title,
-			uint32_t selected_audio_tracks, uint32_t selected_midi_tracks,
+	                ARDOUR::Session* _s,
+	                uint32_t selected_audio_tracks,
+	                uint32_t selected_midi_tracks,
 	                bool persistent,
 	                Editing::ImportMode mode_hint = Editing::ImportAsTrack);
 

gtk2_ardour/startup.h

@@ -44,7 +44,8 @@
 
 class EngineControl;
 
-class ArdourStartup : public Gtk::Assistant {
+class ArdourStartup : public Gtk::Assistant
+{
 public:
 	ArdourStartup ();
 	~ArdourStartup ();

gtk2_ardour/stripable_treemodel.h

@@ -69,8 +69,8 @@ class StripableTreeModel : public Gtk::TreeModel, public Glib::Object
 	typedef Gtk::TreeModelColumn<AxisView*> AVColumn;
 	typedef Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Stripable> > StripableColumn;
 
-	struct Columns : public Gtk::TreeModel::ColumnRecord {
+	struct Columns : public Gtk::TreeModel::ColumnRecord
-
+	{
 		Columns () {
 			add (text);
 			add (visible);
@@ -119,7 +119,8 @@ class StripableTreeModel : public Gtk::TreeModel, public Glib::Object
 
 	void text_value (boost::shared_ptr<ARDOUR::Stripable> stripable, Glib::ValueBase& value) const;
 
-	struct Glue {
+	struct Glue
+	{
 		Glue (boost::shared_ptr<ARDOUR::Stripable>);
 
 		boost::weak_ptr<ARDOUR::Stripable> stripable;

gtk2_ardour/time_axis_view_item.h

@@ -106,7 +106,7 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList
 	static const double GRAB_HANDLE_WIDTH;
 
 	/* these are not constant, but vary with the pixel size
-	   of the font used to display the item name.
+	 * of the font used to display the item name.
 	 */
 	static int    NAME_HEIGHT;
 	static double NAME_Y_OFFSET;

gtk2_ardour/ui_config.h

@@ -106,8 +106,7 @@ private:
 	 */
 	int pre_gui_init ();
 
-	/** called after the GUI toolkit has been initialized.
+	/** called after the GUI toolkit has been initialized. */
-	 */
 	UIConfiguration* post_gui_init ();
 
 #undef UI_CONFIG_VARIABLE