Fix another several issues that were upsetting new Clang, missed in r460224.

5 files changed, 65 insertions, 2 deletions

diff --git a/audio/ardour/files/patch-SConstruct b/audio/ardour/files/patch-SConstruct
index c105c8132768..756c22a289b5 100644
--- a/audio/ardour/files/patch-SConstruct
+++ b/audio/ardour/files/patch-SConstruct
@@ -32,7 +32,7 @@
  
  env.Append(CCFLAGS="-Wall")
 -env.Append(CXXFLAGS="-Woverloaded-virtual")
-+env.Append(CXXFLAGS="-Woverloaded-virtual -std=c++11")
++env.Append(CXXFLAGS="-Woverloaded-virtual -std=c++11 -Wno-c++11-narrowing")
  
  if env['EXTRA_WARN']:
      env.Append(CCFLAGS="-Wextra -pedantic -ansi")
diff --git a/audio/ardour/files/patch-gtk2__ardour_editor.cc b/audio/ardour/files/patch-gtk2__ardour_editor.cc
index 3e94c245b6e0..30199e4a91d5 100644
--- a/audio/ardour/files/patch-gtk2__ardour_editor.cc
+++ b/audio/ardour/files/patch-gtk2__ardour_editor.cc
@@ -21,3 +21,13 @@
  		window_icons.push_back (icon);
  	}
  	if (!window_icons.empty()) {
+@@ -1862,8 +1862,7 @@ Editor::add_region_context_items (AudioStreamView* sv,
+ 		   become selected.
+ 		*/
+ 
+-		region_menu->signal_map_event().connect (
+-			bind (
++		region_menu->signal_map_event().connect ( bind (
+ 				mem_fun(*this, &Editor::set_selected_regionview_from_map_event), 
+ 				sv, 
+ 				boost::weak_ptr<Region>(region)
diff --git a/audio/ardour/files/patch-gtk2__ardour_editor__keyboard.cc b/audio/ardour/files/patch-gtk2__ardour_editor__keyboard.cc
new file mode 100644
index 000000000000..6421cd34304c
--- /dev/null
+++ b/audio/ardour/files/patch-gtk2__ardour_editor__keyboard.cc
@@ -0,0 +1,14 @@
+--- gtk2_ardour/editor_keyboard.cc.orig	2009-03-02 21:07:08 UTC
++++ gtk2_ardour/editor_keyboard.cc
+@@ -42,9 +42,9 @@ Editor::kbd_driver (sigc::slot<void,GdkEvent*> theslot
+ 	Glib::RefPtr<Gdk::Window> evw = track_canvas->get_window()->get_pointer (x, y, mask);
+ 	bool doit = false;
+ 
+-	if (use_track_canvas && track_canvas_event_box.get_window()->get_pointer(x, y, mask) != 0) {
++	if (use_track_canvas && track_canvas_event_box.get_window()->get_pointer(x, y, mask)) {
+ 		doit = true;
+-	} else if (use_time_canvas && time_canvas_event_box.get_window()->get_pointer(x, y, mask)!= 0) {
++	} else if (use_time_canvas && time_canvas_event_box.get_window()->get_pointer(x, y, mask)) {
+ 		doit = true;
+ 	}
+ 
diff --git a/audio/ardour/files/patch-gtk2_ardour-ardour_ui.cc b/audio/ardour/files/patch-gtk2_ardour-ardour_ui.cc
index b43a8672ea34..92429db29fe2 100644
--- a/audio/ardour/files/patch-gtk2_ardour-ardour_ui.cc
+++ b/audio/ardour/files/patch-gtk2_ardour-ardour_ui.cc
@@ -31,3 +31,21 @@
  						   
  				VBox* vbox = msg.get_vbox();
  				HBox hbox;
+@@ -1964,7 +1969,7 @@ ARDOUR_UI::name_io_setup (AudioEngine& engine, 
+ 
+ 		const char **connections = io.input(0)->get_connections();
+ 		
+-		if (connections == 0 || connections[0] == '\0') {
++		if (connections == 0 || *connections[0] == '\0') {
+ 			buf = _("off");
+ 		} else {
+ 			buf = connections[0];
+@@ -1983,7 +1988,7 @@ ARDOUR_UI::name_io_setup (AudioEngine& engine, 
+ 
+ 		const char **connections = io.output(0)->get_connections();
+ 		
+-		if (connections == 0 || connections[0] == '\0') {
++		if (connections == 0 || *connections[0] == '\0') {
+ 			buf = _("off");
+ 		} else {
+ 			buf = connections[0];
diff --git a/audio/ardour/files/patch-gtk2_ardour-new_session_dialog.cc b/audio/ardour/files/patch-gtk2_ardour-new_session_dialog.cc
index f925ad1a8ee4..bde1ed1ed1b5 100644
--- a/audio/ardour/files/patch-gtk2_ardour-new_session_dialog.cc
+++ b/audio/ardour/files/patch-gtk2_ardour-new_session_dialog.cc
@@ -1,6 +1,27 @@
 --- gtk2_ardour/new_session_dialog.cc.orig	2008-01-14 10:04:17.000000000 +0100
 +++ gtk2_ardour/new_session_dialog.cc	2008-01-14 10:04:44.000000000 +0100
-@@ -556,7 +556,7 @@
+@@ -361,16 +361,16 @@ NewSessionDialog::NewSessionDialog()
+ 	list<Glib::RefPtr<Gdk::Pixbuf> > window_icons;
+ 	Glib::RefPtr<Gdk::Pixbuf> icon;
+ 
+-	if ((icon = ::get_icon ("ardour_icon_16px")) != 0) {
++	if ((icon = ::get_icon ("ardour_icon_16px"))) {
+ 		window_icons.push_back (icon);
+ 	}
+-	if ((icon = ::get_icon ("ardour_icon_22px")) != 0) {
++	if ((icon = ::get_icon ("ardour_icon_22px"))) {
+ 		window_icons.push_back (icon);
+ 	}
+-	if ((icon = ::get_icon ("ardour_icon_32px")) != 0) {
++	if ((icon = ::get_icon ("ardour_icon_32px"))) {
+ 		window_icons.push_back (icon);
+ 	}
+-	if ((icon = ::get_icon ("ardour_icon_48px")) != 0) {
++	if ((icon = ::get_icon ("ardour_icon_48px"))) {
+ 		window_icons.push_back (icon);
+ 	}
+ 	if (!window_icons.empty()) {
+@@ -589,7 +589,7 @@ NewSessionDialog::set_session_folder(const std::string
  	*/