Fix C++11 fallout.

6 files changed, 131 insertions, 0 deletions

diff --git a/audio/ardour/patches/patch-gtk2__ardour_editor.cc b/audio/ardour/patches/patch-gtk2__ardour_editor.cc
new file mode 100644
index 00000000000..d16ec52325b
--- /dev/null
+++ b/audio/ardour/patches/patch-gtk2__ardour_editor.cc
@@ -0,0 +1,27 @@
+$NetBSD: patch-gtk2__ardour_editor.cc,v 1.1 2016/12/15 23:45:07 joerg Exp $
+
+Use bool conversion, RefPtr doesn't compare to 0 in C++11 mode.
+
+--- gtk2_ardour/editor.cc.orig	2016-12-15 17:18:50.532467126 +0000
++++ gtk2_ardour/editor.cc
+@@ -714,16 +714,16 @@ Editor::Editor ()
+ 	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()) {
diff --git a/audio/ardour/patches/patch-gtk2__ardour_fft__graph.cc b/audio/ardour/patches/patch-gtk2__ardour_fft__graph.cc
new file mode 100644
index 00000000000..14e0e8330ca
--- /dev/null
+++ b/audio/ardour/patches/patch-gtk2__ardour_fft__graph.cc
@@ -0,0 +1,24 @@
+$NetBSD: patch-gtk2__ardour_fft__graph.cc,v 1.1 2016/12/15 23:45:07 joerg Exp $
+
+Use bool conversion, RefPtr doesn't compare to 0 in C++11 mode.
+
+--- gtk2_ardour/fft_graph.cc.orig	2016-12-15 17:21:24.763867051 +0000
++++ gtk2_ardour/fft_graph.cc
+@@ -203,7 +203,7 @@ FFTGraph::draw_scales(Glib::RefPtr<Gdk::
+ 
+ 
+ 
+-	if (graph_gc == 0) {
++	if (!graph_gc) {
+ 		graph_gc = GC::create( get_window() );
+ 	}
+ 
+@@ -213,7 +213,7 @@ FFTGraph::draw_scales(Glib::RefPtr<Gdk::
+ 
+ 	graph_gc->set_rgb_fg_color( grey );
+ 
+-	if (layout == 0) {
++	if (!layout) {
+ 		layout = create_pango_layout ("");
+ 		layout->set_font_description (get_style()->get_font());
+ 	}
diff --git a/audio/ardour/patches/patch-gtk2__ardour_startup.cc b/audio/ardour/patches/patch-gtk2__ardour_startup.cc
new file mode 100644
index 00000000000..2176a2edf0d
--- /dev/null
+++ b/audio/ardour/patches/patch-gtk2__ardour_startup.cc
@@ -0,0 +1,35 @@
+$NetBSD: patch-gtk2__ardour_startup.cc,v 1.1 2016/12/15 23:45:07 joerg Exp $
+
+Use bool conversion, RefPtr doesn't compare to 0 in C++11 mode.
+
+--- gtk2_ardour/startup.cc.orig	2016-12-15 17:23:30.130893869 +0000
++++ gtk2_ardour/startup.cc
+@@ -79,23 +79,23 @@ ArdourStartup::ArdourStartup ()
+ 	set_position (WIN_POS_CENTER);
+ 	set_border_width (12);
+ 
+-	if ((icon_pixbuf = ::get_icon ("ardour_icon_48px")) == 0) {
++	if (!(icon_pixbuf = ::get_icon ("ardour_icon_48px"))) {
+ 		throw failed_constructor();
+ 	}
+ 
+ 	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 ()) {
diff --git a/audio/ardour/patches/patch-libs_canvas_stateful__image.cc b/audio/ardour/patches/patch-libs_canvas_stateful__image.cc
new file mode 100644
index 00000000000..5ac834f6077
--- /dev/null
+++ b/audio/ardour/patches/patch-libs_canvas_stateful__image.cc
@@ -0,0 +1,15 @@
+$NetBSD: patch-libs_canvas_stateful__image.cc,v 1.1 2016/12/15 23:45:07 joerg Exp $
+
+Use bool conversion, RefPtr doesn't compare to 0 in C++11 mode.
+
+--- libs/canvas/stateful_image.cc.orig	2016-12-15 17:12:09.614013045 +0000
++++ libs/canvas/stateful_image.cc
+@@ -108,7 +108,7 @@ StatefulImage::load_states (const XMLNod
+ 			continue;
+ 		}
+ 
+-		if ((s.image = find_image (prop->value())) == 0) {
++		if (!(s.image = find_image (prop->value()))) {
+ 			error << string_compose (_("image %1 not found for state"), prop->value()) << endmsg;
+ 			continue;
+ 		}
diff --git a/audio/ardour/patches/patch-libs_gtkmm2ext_actions.cc b/audio/ardour/patches/patch-libs_gtkmm2ext_actions.cc
new file mode 100644
index 00000000000..5545259d329
--- /dev/null
+++ b/audio/ardour/patches/patch-libs_gtkmm2ext_actions.cc
@@ -0,0 +1,15 @@
+$NetBSD: patch-libs_gtkmm2ext_actions.cc,v 1.1 2016/12/15 23:45:07 joerg Exp $
+
+Use bool conversion, RefPtr doesn't compare to 0 in C++11 mode.
+
+--- libs/gtkmm2ext/actions.cc.orig	2016-12-15 17:09:46.201195818 +0000
++++ libs/gtkmm2ext/actions.cc
+@@ -401,7 +401,7 @@ ActionManager::get_action (const char* g
+ 	   gtkmm2.6, so we fall back to the C level.
+ 	*/
+ 
+-	if (ui_manager == 0) {
++	if (!ui_manager) {
+ 		return RefPtr<Action> ();
+ 	}
+ 
diff --git a/audio/ardour/patches/patch-libs_gtkmm2ext_fastmeter.cc b/audio/ardour/patches/patch-libs_gtkmm2ext_fastmeter.cc
new file mode 100644
index 00000000000..406566f12a9
--- /dev/null
+++ b/audio/ardour/patches/patch-libs_gtkmm2ext_fastmeter.cc
@@ -0,0 +1,15 @@
+$NetBSD: patch-libs_gtkmm2ext_fastmeter.cc,v 1.1 2016/12/15 23:45:07 joerg Exp $
+
+Use bool conversion, RefPtr doesn't compare to 0 in C++11 mode.
+
+--- libs/gtkmm2ext/fastmeter.cc.orig	2016-12-15 17:10:48.369372136 +0000
++++ libs/gtkmm2ext/fastmeter.cc
+@@ -731,7 +731,7 @@ FastMeter::set (float lvl, float peak)
+ 
+ 	Glib::RefPtr<Gdk::Window> win;
+ 
+-	if ((win = get_window()) == 0) {
++	if (!(win = get_window())) {
+ 		queue_draw ();
+ 		return;
+ 	}