Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only.

Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red.  I don't know the emacs equivalent...


git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 57 insertions, 57 deletions

diff --git a/gtk2_ardour/export_timespan_selector.cc b/gtk2_ardour/export_timespan_selector.cc
index e716e47be1..b11169b214 100644
--- a/gtk2_ardour/export_timespan_selector.cc
+++ b/gtk2_ardour/export_timespan_selector.cc
@@ -48,45 +48,45 @@ ExportTimespanSelector::ExportTimespanSelector (ARDOUR::Session * session, Profi
 
 	option_hbox.pack_start (time_format_label, false, false, 0);
 	option_hbox.pack_start (time_format_combo, false, false, 6);
-	
+
 	range_scroller.add (range_view);
-	
+
 	pack_start (option_hbox, false, false, 0);
 	pack_start (range_scroller, true, true, 6);
-	
+
 	/*** Combo boxes ***/
-	
+
 	Gtk::TreeModel::iterator iter;
 	Gtk::TreeModel::Row row;
-	
+
 	/* Time format combo */
-	
+
 	time_format_list = Gtk::ListStore::create (time_format_cols);
 	time_format_combo.set_model (time_format_list);
 	time_format_combo.set_name ("PaddedButton");
-	
+
 	iter = time_format_list->append();
 	row = *iter;
 	row[time_format_cols.format] = ExportProfileManager::SMPTE;
 	row[time_format_cols.label] = X_("Timecode");
-	
+
 	iter = time_format_list->append();
 	row = *iter;
 	row[time_format_cols.format] = ExportProfileManager::MinSec;
 	row[time_format_cols.label] = _("Minutes:Seconds");
-	
+
 	iter = time_format_list->append();
 	row = *iter;
 	row[time_format_cols.format] = ExportProfileManager::BBT;
 	row[time_format_cols.label] = _("Bars:Beats");
-	
+
 	time_format_combo.pack_start (time_format_cols.label);
 	time_format_combo.set_active (0);
-	
+
 	time_format_combo.signal_changed().connect (sigc::mem_fun (*this, &ExportTimespanSelector::change_time_format));
-	
+
 	/* Range view */
-	
+
 	range_list = Gtk::ListStore::create (range_cols);
 	range_view.set_model (range_list);
 	range_view.set_headers_visible (false);
@@ -101,7 +101,7 @@ void
 ExportTimespanSelector::add_range_to_selection (ARDOUR::Location const * loc)
 {
 	TimespanPtr span = session->get_export_handler()->add_timespan();
-	
+
 	Glib::ustring id;
 	if (loc == state->session_range.get()) {
 		id = "session";
@@ -110,7 +110,7 @@ ExportTimespanSelector::add_range_to_selection (ARDOUR::Location const * loc)
 	} else {
 		id = loc->id().to_s();
 	}
-	
+
 	span->set_range (loc->start(), loc->end());
 	span->set_name (loc->name());
 	span->set_range_id (id);
@@ -153,47 +153,47 @@ ExportTimespanSelector::construct_label (ARDOUR::Location const * location) cons
 	Glib::ustring label;
 	Glib::ustring start;
 	Glib::ustring end;
-	
+
 	nframes_t start_frame = location->start();
 	nframes_t end_frame = location->end();
-	
+
 	switch (state->time_format) {
 	  case AudioClock::BBT:
 		start = bbt_str (start_frame);
 		end = bbt_str (end_frame);
 		break;
-	
+
 	  case AudioClock::SMPTE:
 		start = smpte_str (start_frame);
 		end = smpte_str (end_frame);
 		break;
-	
+
 	  case AudioClock::MinSec:
 		start = ms_str (start_frame);
 		end = ms_str (end_frame);
 		break;
-	
+
 	  case AudioClock::Frames:
 		start = to_string (start_frame, std::dec);
 		end = to_string (end_frame, std::dec);
 		break;
-	
+
 	  case AudioClock::Off:
 		break;
 	}
-	
+
 	// label += _("from ");
-	
+
 	// label += "<span color=\"#7fff7f\">";
 	label += start;
 // 	label += "</span>";
-	
+
 	label += _(" to ");
-	
+
 // 	label += "<span color=\"#7fff7f\">";
 	label += end;
 // 	label += "</span>";
-	
+
 	return label;
 }
 
@@ -204,12 +204,12 @@ ExportTimespanSelector::bbt_str (nframes_t frames) const
 	if (!session) {
 		return "Error!";
 	}
-	
+
 	std::ostringstream oss;
 	BBT_Time time;
-	
+
 	session->bbt_time (frames, time);
-	
+
 	oss << std::setfill('0') << std::right <<
 	  std::setw(3) <<
 	  time.bars << "|" <<
@@ -217,7 +217,7 @@ ExportTimespanSelector::bbt_str (nframes_t frames) const
 	  time.beats << "|" <<
 	  std::setw(4) <<
 	  time.ticks;
-	
+
 	return oss.str();
 }
 
@@ -227,12 +227,12 @@ ExportTimespanSelector::smpte_str (nframes_t frames) const
 	if (!session) {
 		return "Error!";
 	}
-	
+
 	std::ostringstream oss;
 	SMPTE::Time time;
-	
+
 	session->smpte_time (frames, time);
-	
+
 	oss << std::setfill('0') << std::right <<
 	  std::setw(2) <<
 	  time.hours << ":" <<
@@ -242,7 +242,7 @@ ExportTimespanSelector::smpte_str (nframes_t frames) const
 	  time.seconds << ":" <<
 	  std::setw(2) <<
 	  time.frames;
-	
+
 	return oss.str();
 }
 
@@ -252,14 +252,14 @@ ExportTimespanSelector::ms_str (nframes_t frames) const
 	if (!session) {
 		return "Error!";
 	}
-	
+
 	std::ostringstream oss;
 	nframes_t left;
 	int hrs;
 	int mins;
 	int secs;
 	int sec_promilles;
-	
+
 	left = frames;
 	hrs = (int) floor (left / (session->frame_rate() * 60.0f * 60.0f));
 	left -= (nframes_t) floor (hrs * session->frame_rate() * 60.0f * 60.0f);
@@ -268,7 +268,7 @@ ExportTimespanSelector::ms_str (nframes_t frames) const
 	secs = (int) floor (left / (float) session->frame_rate());
 	left -= (nframes_t) floor (secs * session->frame_rate());
 	sec_promilles = (int) (left * 1000 / (float) session->frame_rate() + 0.5);
-	
+
 	oss << std::setfill('0') << std::right <<
 	  std::setw(2) <<
 	  hrs << ":" <<
@@ -278,7 +278,7 @@ ExportTimespanSelector::ms_str (nframes_t frames) const
 	  secs << "." <<
 	  std::setw(3) <<
 	  sec_promilles;
-	
+
 	return oss.str();
 }
 
@@ -287,7 +287,7 @@ ExportTimespanSelector::update_range_name (Glib::ustring const & path, Glib::ust
 {
 	Gtk::TreeStore::iterator it = range_list->get_iter (path);
 	it->get_value (range_cols.location)->set_name (new_text);
-	
+
 	CriticalSelectionChanged();
 }
 
@@ -299,17 +299,17 @@ ExportTimespanSelectorSingle::ExportTimespanSelectorSingle (ARDOUR::Session * se
 {
 	range_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_NEVER);
 	range_view.append_column_editable ("", range_cols.name);
-	
+
 	// Adjust selector height
 	int x_offset, y_offset, width, height;
 	Gtk::CellRenderer * renderer = *range_view.get_column(0)->get_cell_renderers().begin();
 	renderer->get_size (range_view, x_offset, y_offset, width, height);
 	range_scroller.set_size_request (-1, height);
-	
+
 	if (Gtk::CellRendererText * renderer = dynamic_cast<Gtk::CellRendererText *> (range_view.get_column_cell_renderer (0))) {
 		renderer->signal_edited().connect (sigc::mem_fun (*this, &ExportTimespanSelectorSingle::update_range_name));
 	}
-	
+
 	Gtk::CellRendererText * label_render = Gtk::manage (new Gtk::CellRendererText());
 	Gtk::TreeView::Column * label_col = Gtk::manage (new Gtk::TreeView::Column ("", *label_render));
 	label_col->add_attribute (label_render->property_markup(), range_cols.label);
@@ -321,7 +321,7 @@ void
 ExportTimespanSelectorSingle::fill_range_list ()
 {
 	if (!state) { return; }
-	
+
 	Glib::ustring id;
 	if (!range_id.compare (X_("session"))) {
 		id = state->session_range->id().to_s();
@@ -337,22 +337,22 @@ ExportTimespanSelectorSingle::fill_range_list ()
 	Gtk::TreeModel::iterator iter;
 	Gtk::TreeModel::Row row;
 	for (LocationList::const_iterator it = state->ranges->begin(); it != state->ranges->end(); ++it) {
-	
+
 		if (!(*it)->id().to_s().compare (id)) {
 			iter = range_list->append();
 			row = *iter;
-			
+
 			row[range_cols.location] = *it;
 			row[range_cols.selected] = true;
 			row[range_cols.name] = (*it)->name();
 			row[range_cols.label] = construct_label (*it);
-			
+
 			add_range_to_selection (*it);
-			
+
 			break;
 		}
 	}
-	
+
 	set_time_format_from_state();
 }
 
@@ -364,14 +364,14 @@ ExportTimespanSelectorMultiple::ExportTimespanSelectorMultiple (ARDOUR::Session
 	range_scroller.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
 	range_view.append_column_editable ("", range_cols.selected);
 	range_view.append_column_editable ("", range_cols.name);
-	
+
 	if (Gtk::CellRendererToggle * renderer = dynamic_cast<Gtk::CellRendererToggle *> (range_view.get_column_cell_renderer (0))) {
 		renderer->signal_toggled().connect (sigc::hide (sigc::mem_fun (*this, &ExportTimespanSelectorMultiple::update_selection)));
 	}
 	if (Gtk::CellRendererText * renderer = dynamic_cast<Gtk::CellRendererText *> (range_view.get_column_cell_renderer (1))) {
 		renderer->signal_edited().connect (sigc::mem_fun (*this, &ExportTimespanSelectorMultiple::update_range_name));
 	}
-	
+
 	Gtk::CellRendererText * label_render = Gtk::manage (new Gtk::CellRendererText());
 	Gtk::TreeView::Column * label_col = Gtk::manage (new Gtk::TreeView::Column ("", *label_render));
 	label_col->add_attribute (label_render->property_markup(), range_cols.label);
@@ -389,16 +389,16 @@ ExportTimespanSelectorMultiple::fill_range_list ()
 	Gtk::TreeModel::iterator iter;
 	Gtk::TreeModel::Row row;
 	for (LocationList::const_iterator it = state->ranges->begin(); it != state->ranges->end(); ++it) {
-	
+
 		iter = range_list->append();
 		row = *iter;
-		
+
 		row[range_cols.location] = *it;
 		row[range_cols.selected] = false;
 		row[range_cols.name] = (*it)->name();
 		row[range_cols.label] = construct_label (*it);
 	}
-	
+
 	set_selection_from_state ();
 }
 
@@ -406,12 +406,12 @@ void
 ExportTimespanSelectorMultiple::set_selection_from_state ()
 {
 	Gtk::TreeModel::Children::iterator tree_it;
-	
+
 	for (TimespanList::iterator it = state->timespans->begin(); it != state->timespans->end(); ++it) {
 		ustring id = (*it)->range_id();
 		for (tree_it = range_list->children().begin(); tree_it != range_list->children().end(); ++tree_it) {
 			Location * loc = tree_it->get_value (range_cols.location);
-			
+
 			if ((!id.compare ("session") && loc == state->session_range.get()) ||
 			    (!id.compare ("selection") && loc == state->selection_range.get()) ||
 			    (!id.compare (loc->id().to_s()))) {
@@ -419,7 +419,7 @@ ExportTimespanSelectorMultiple::set_selection_from_state ()
 			}
 		}
 	}
-	
+
 	set_time_format_from_state();
 }
 
@@ -434,7 +434,7 @@ void
 ExportTimespanSelectorMultiple::update_timespans ()
 {
 	state->timespans->clear();
-	
+
 	for (Gtk::TreeStore::Children::iterator it = range_list->children().begin(); it != range_list->children().end(); ++it) {
 		if (it->get_value (range_cols.selected)) {
 			add_range_to_selection (it->get_value (range_cols.location));