Reformat and remove unused imports

gtk2_ardour/add_route_dialog.cc

@@ -23,7 +23,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <cstdio>
 #include <cmath>
 
 #include <sigc++/bind.h>
@@ -49,12 +48,10 @@
 
 #include "LuaBridge/LuaBridge.h"
 
-#include "ardour_message.h"
 #include "add_route_dialog.h"
 #include "ardour_ui.h"
 #include "route_group_dialog.h"
 #include "ui_config.h"
-#include "utils.h"
 
 #include "pbd/i18n.h"
 
@@ -100,8 +97,7 @@ AddRouteDialog::AddRouteDialog ()
 	refill_track_modes ();
 
 	if (builtin_types.empty()) {
-		builtin_types.push_back (
+		builtin_types.emplace_back(_("Audio Tracks"), std::string () +
-		   std::pair<string,string> (_("Audio Tracks"), std::string () +
 		     _("Use these settings to create one or more audio tracks.") + "\n\n" +
 		     _("You may select:") + "\n" +
 		     "* " + _("The number of tracks to add") + "\n" +
@@ -112,10 +108,9 @@ AddRouteDialog::AddRouteDialog ()
 		     "* " + _("The pin connections mode (see tooltip for details)") + "\n" +
 #endif
 		     "\n" + _("The track(s) will be added at the location specified by \"Position\"")
-		     ));
+		     );
 
-		builtin_types.push_back (
+		builtin_types.emplace_back(_("MIDI Tracks"), std::string () +
-		   std::pair<string,string> (_("MIDI Tracks"), std::string () +
 		     _("Use these settings to create one or more MIDI tracks.") + "\n\n" +
 		     _("You may select:") + "\n" +
 		     "* " + _("The number of tracks to add") + "\n" +
@@ -126,10 +121,9 @@ AddRouteDialog::AddRouteDialog ()
 		     "* " + _("The pin connections mode (see tooltip for details)") + "\n" +
 #endif
 		     "\n" + _("The track(s) will be added at the location specified by \"Position\"")
-		     ));
+		     );
 
-		builtin_types.push_back (
+		builtin_types.emplace_back(_("Audio Busses"), std::string () +
-		   std::pair<string,string> (_("Audio Busses"), std::string () +
 		     _("Use these settings to create one or more audio busses.") + "\n\n" +
 		     _("You may select:") + "\n" +
 		     "* " + _("The number of busses to add") + "\n" +
@@ -139,10 +133,9 @@ AddRouteDialog::AddRouteDialog ()
 		     "* " + _("The pin connections mode (see tooltip for details)") + "\n" +
 #endif
 		     "\n" + _("The buss(es) will be added at the location specified by \"Position\"")
-		     ));
+		     );
 
-		builtin_types.push_back (
+		builtin_types.emplace_back(_("MIDI Busses"), std::string () +
-		   std::pair<string,string> (_("MIDI Busses"), std::string () +
 		     _("Use these settings to create one or more MIDI busses.") + "\n\n" +
 		     _("MIDI busses can combine the output of multiple tracks. They are sometimes used\nto host a single \"heavy\" instrument plugin which is fed from multiple MIDI tracks.") + "\n\n" +
 		     _("You may select:") + "\n" +
@@ -154,24 +147,22 @@ AddRouteDialog::AddRouteDialog ()
 		     "* " + _("The pin connections mode (see tooltip for details)") + "\n" +
 #endif
 		     "\n" + _("The buss(es) will be added at the location specified by \"Position\"")
-		     ));
+		     );
 
-		builtin_types.push_back (
+		builtin_types.emplace_back(_("VCA Masters"), std::string () +
-		   std::pair<string,string> (_("VCA Masters"), std::string () +
 		     _("Use these settings to create one or more VCA masters.") + "\n\n" +
 		     _("You may select:") + "\n" +
 		     "* " + _("The number of VCAs to add") + "\n" +
 		     "* " + _("A name for the VCA(s). \"%n\" will be replaced by an index number for each VCA")
-		     ));
+		     );
 
-		builtin_types.push_back (
+		builtin_types.emplace_back(_("Foldback Busses"), std::string () +
-		   std::pair<string,string> (_("Foldback Busses"), std::string () +
 		     _("Use these settings to create one or more foldback busses.") + "\n\n" +
 		     _("Foldback busses are used as master outputs for monitor channels and are fed by\nhidden monitor sends.") + "\n\n" +
 		     _("You may select:") + "\n" +
 		     "* " + _("The number of busses to add") + "\n" +
 		     "* " + _("A name for the buss(es)")
-		     ));
+		     );
 	}
 
 	insert_at_combo.append (_("First"));
@@ -361,9 +352,7 @@ AddRouteDialog::AddRouteDialog ()
 	refill_channel_setups ();
 }
 
-AddRouteDialog::~AddRouteDialog ()
+AddRouteDialog::~AddRouteDialog () = default;
-{
-}
 
 void
 AddRouteDialog::on_response (int r)

gtk2_ardour/add_route_dialog.h

@@ -130,7 +130,8 @@ private:
 	void instrument_changed ();
 
 	struct TrackTemplateColumns : public Gtk::TreeModel::ColumnRecord {
-		TrackTemplateColumns () {
+		TrackTemplateColumns ()
+		{
 			add (name);
 			add (path);
 			add (description);
@@ -154,10 +155,9 @@ private:
 	Gtk::Frame    trk_template_outer_frame;
 	Gtk::Frame    trk_template_desc_frame;
 
-	void reset_template_option_visibility ();
 	void new_group_dialog_finished (int, RouteGroupDialog*);
-	void on_show ();
+	void on_show () override;
-	void on_response (int);
+	void on_response (int) override;
 
 	struct ChannelSetup {
 		std::string name;

gtk2_ardour/ardour_dialog.cc

@@ -30,7 +30,6 @@
 #include "keyboard.h"
 #include "splash.h"
 #include "ui_config.h"
-#include "utils.h"
 #include "window_manager.h"
 
 using namespace std;
@@ -38,20 +37,20 @@ using namespace Gtk;
 using namespace Gtkmm2ext;
 using namespace ARDOUR_UI_UTILS;
 
-ArdourDialog::ArdourDialog (string title, bool modal, bool use_seperator)
+ArdourDialog::ArdourDialog (const string& title, bool modal, bool use_seperator)
         : Dialog (title, modal, use_seperator)
         , _sensitive (true)
-	, proxy (0)
+        , proxy (nullptr)
         , _splash_pushed (false)
 {
 	init ();
 	set_position (Gtk::WIN_POS_MOUSE);
 }
 
-ArdourDialog::ArdourDialog (Gtk::Window& parent, string title, bool modal, bool use_seperator)
+ArdourDialog::ArdourDialog (Gtk::Window& parent, const string& title, bool modal, bool use_seperator)
         : Dialog (title, parent, modal, use_seperator)
         , _sensitive (true)
-	, proxy (0)
+        , proxy (nullptr)
         , _splash_pushed (false)
 {
 	init ();
@@ -61,7 +60,7 @@ ArdourDialog::ArdourDialog (Gtk::Window& parent, string title, bool modal, bool
 ArdourDialog::~ArdourDialog ()
 {
 	pop_splash ();
-	Keyboard::the_keyboard().focus_out_window (0, this);
+	Keyboard::the_keyboard ().focus_out_window (nullptr, this);
 	WM::Manager::instance ().remove (proxy);
 	proxy->explicit_delete ();
 }
@@ -90,7 +89,7 @@ void
 ArdourDialog::pop_splash ()
 {
 	if (_splash_pushed) {
-		Splash* spl = Splash::exists () ? Splash::instance() : NULL;
+		Splash* spl = Splash::exists () ? Splash::instance () : nullptr;
 
 		if (spl) {
 			spl->pop_front_for (*this);
@@ -118,7 +117,7 @@ ArdourDialog::on_focus_out_event (GdkEventFocus *ev)
 void
 ArdourDialog::on_unmap ()
 {
-	Keyboard::the_keyboard().leave_window (0, this);
+	Keyboard::the_keyboard ().leave_window (nullptr, this);
 	pop_splash ();
 	Dialog::on_unmap ();
 }

gtk2_ardour/ardour_dialog.h

@@ -40,8 +40,8 @@ namespace WM {
 class ArdourDialog : public Gtk::Dialog, public ARDOUR::SessionHandlePtr
 {
 public:
-	ArdourDialog (std::string title, bool modal = false, bool use_separator = false);
+	explicit ArdourDialog (const std::string& title, bool modal = false, bool use_separator = false);
-	ArdourDialog (Gtk::Window& parent, std::string title, bool modal = false, bool use_separator = false);
+	ArdourDialog (Gtk::Window& parent, const std::string& title, bool modal = false, bool use_separator = false);
 	~ArdourDialog();
 
 	bool on_focus_in_event (GdkEventFocus*);

gtk2_ardour/editor.h

@@ -147,7 +147,6 @@ class SelectionPropertiesBox;
 class SoundFileOmega;
 class StreamView;
 class GridLines;
-class TempoLines;
 class TimeAxisView;
 class TimeInfoBox;
 class TimeFXDialog;
@@ -452,9 +451,6 @@ public:
 	                                                 bool use_context_click = false,
 	                                                 bool from_outside_canvas = false);
 
-	bool update_mouse_speed ();
-	bool decelerate_mouse_speed ();
-
 	void toggle_meter_updating();
 
 	void show_rhythm_ferret();
@@ -462,16 +458,10 @@ public:
 	void goto_visual_state (uint32_t);
 	void save_visual_state (uint32_t);
 
-	void queue_draw_resize_line (int at);
-	void start_resize_line_ops ();
-	void end_resize_line_ops ();
-
 	TrackViewList const & get_track_views () const {
 		return track_views;
 	}
 
-	void do_ptimport(std::string path, ARDOUR::SrcQuality quality);
-
 	void do_import (std::vector<std::string>              paths,
 	                Editing::ImportDisposition            disposition,
 	                Editing::ImportMode                   mode,