Remove use of i18n macros in headers. Prevents our gettext.h being included before libintl.h, which causes failures when ENABLE_NLS is not defined (bug #3111)

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

16 files changed, 58 insertions, 28 deletions

diff --git a/gtk2_ardour/bundle_manager.cc b/gtk2_ardour/bundle_manager.cc
index 559bc7ed6c..ba00cce9d0 100644
--- a/gtk2_ardour/bundle_manager.cc
+++ b/gtk2_ardour/bundle_manager.cc
@@ -174,6 +174,12 @@ BundleEditorMatrix::list_is_global (int dim) const
 	return (dim == OTHER);
 }
 
+string
+BundleEditorMatrix::disassociation_verb () const
+{
+	return _("Disassociate");
+}
+
 BundleEditor::BundleEditor (Session* session, boost::shared_ptr<UserBundle> bundle)
 	: ArdourDialog (_("Edit Bundle")), _matrix (this, session, bundle), _bundle (bundle)
 {
diff --git a/gtk2_ardour/bundle_manager.h b/gtk2_ardour/bundle_manager.h
index 4172330cf1..c2c30d47bb 100644
--- a/gtk2_ardour/bundle_manager.h
+++ b/gtk2_ardour/bundle_manager.h
@@ -25,7 +25,6 @@
 #include <gtkmm/entry.h>
 #include "ardour_dialog.h"
 #include "port_matrix.h"
-#include "i18n.h"
 
 namespace ARDOUR {
 	class Session;
@@ -50,9 +49,7 @@ class BundleEditorMatrix : public PortMatrix
 	void setup_ports (int);
 	bool list_is_global (int) const;
 
-	std::string disassociation_verb () const {
-		return _("Disassociate");
-	}
+	std::string disassociation_verb () const;
 
   private:
 	enum {
diff --git a/gtk2_ardour/editor_export_audio.cc b/gtk2_ardour/editor_export_audio.cc
index 51c2ef072a..6aa43c8bcf 100644
--- a/gtk2_ardour/editor_export_audio.cc
+++ b/gtk2_ardour/editor_export_audio.cc
@@ -58,7 +58,7 @@ using namespace Gtk;
 void
 Editor::export_audio ()
 {
-	ExportDialog dialog (*this);
+	ExportDialog dialog (*this, _("Export"));
 	dialog.set_session (_session);
 	dialog.run();
 }
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 8e17999d83..e5513159b0 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -4976,7 +4976,7 @@ Editor::set_fade_length (bool in)
 
 	nframes64_t pos = get_preferred_edit_position();
 	nframes64_t len;
-	char* cmd;
+	char const * cmd;
 
 	if (pos > rv->region()->last_frame() || pos < rv->region()->first_frame()) {
 		/* edit point is outside the relevant region */
@@ -6192,7 +6192,8 @@ Editor::do_insert_time ()
 		return;
 	}
 
-	InsertTimeOption opt;
+	/* only setting this to keep GCC quiet */
+	InsertTimeOption opt = LeaveIntersected;
 
 	switch (intersected_combo.get_active_row_number ()) {
 	case 0:
diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc
index d60e5753c4..ae8e963d9a 100644
--- a/gtk2_ardour/export_dialog.cc
+++ b/gtk2_ardour/export_dialog.cc
@@ -29,6 +29,8 @@
 #include "export_dialog.h"
 #include "gui_thread.h"
 
+#include "i18n.h"
+
 using namespace ARDOUR;
 using namespace PBD;
 
diff --git a/gtk2_ardour/export_dialog.h b/gtk2_ardour/export_dialog.h
index 33a983062f..93d3b21654 100644
--- a/gtk2_ardour/export_dialog.h
+++ b/gtk2_ardour/export_dialog.h
@@ -34,8 +34,6 @@
 
 #include <gtkmm.h>
 
-#include "i18n.h"
-
 namespace ARDOUR {
 	class ExportStatus;
 	class ExportHandler;
@@ -48,7 +46,7 @@ class ExportDialog : public ArdourDialog {
 
   public:
 
-	explicit ExportDialog (PublicEditor & editor, Glib::ustring title = _("Export"));
+	explicit ExportDialog (PublicEditor & editor, Glib::ustring title);
 	~ExportDialog ();
 
 	void set_session (ARDOUR::Session* s);
diff --git a/gtk2_ardour/global_port_matrix.cc b/gtk2_ardour/global_port_matrix.cc
index ae51e7fb68..510d3b3ce3 100644
--- a/gtk2_ardour/global_port_matrix.cc
+++ b/gtk2_ardour/global_port_matrix.cc
@@ -165,3 +165,16 @@ GlobalPortMatrixWindow::on_show ()
 	pair<uint32_t, uint32_t> const pm_max = _port_matrix.max_size ();
 	resize_window_to_proportion_of_monitor (this, pm_max.first, pm_max.second);
 }
+
+string
+GlobalPortMatrix::disassociation_verb () const
+{
+	return _("Disconnect");
+}
+
+string
+GlobalPortMatrix::channel_noun () const
+{
+	return _("port");
+}
+		 
diff --git a/gtk2_ardour/global_port_matrix.h b/gtk2_ardour/global_port_matrix.h
index 8e13866f42..0ce77f74c3 100644
--- a/gtk2_ardour/global_port_matrix.h
+++ b/gtk2_ardour/global_port_matrix.h
@@ -24,7 +24,6 @@
 #include "port_matrix.h"
 #include "port_group.h"
 #include "ardour_dialog.h"
-#include "i18n.h"
 
 class GlobalPortMatrix : public PortMatrix
 {
@@ -36,13 +35,8 @@ public:
 	void set_state (ARDOUR::BundleChannel c[2], bool);
 	PortMatrixNode::State get_state (ARDOUR::BundleChannel c[2]) const;
 
-	std::string disassociation_verb () const {
-		return _("Disconnect");
-	}
-
-	std::string channel_noun () const {
-		return _("port");
-	}
+	std::string disassociation_verb () const;
+	std::string channel_noun () const;
 
 	bool list_is_global (int) const {
 		return true;
diff --git a/gtk2_ardour/io_selector.cc b/gtk2_ardour/io_selector.cc
index b4e1af132a..913fa6dafe 100644
--- a/gtk2_ardour/io_selector.cc
+++ b/gtk2_ardour/io_selector.cc
@@ -157,6 +157,18 @@ IOSelector::list_is_global (int dim) const
 	return (dim == _other);
 }
 
+string
+IOSelector::disassociation_verb () const
+{
+	return _("Disconnect");
+}
+
+string
+IOSelector::channel_noun () const
+{
+	return _("port");
+}
+
 IOSelectorWindow::IOSelectorWindow (ARDOUR::Session* session, boost::shared_ptr<ARDOUR::IO> io, bool /*can_cancel*/)
 	: _selector (this, session, io)
 {
diff --git a/gtk2_ardour/io_selector.h b/gtk2_ardour/io_selector.h
index 11454f8531..21bd6a2d3e 100644
--- a/gtk2_ardour/io_selector.h
+++ b/gtk2_ardour/io_selector.h
@@ -22,7 +22,6 @@
 
 #include "ardour_dialog.h"
 #include "port_matrix.h"
-#include "i18n.h"
 
 namespace ARDOUR {
 	class PortInsert;
@@ -36,13 +35,8 @@ class IOSelector : public PortMatrix
 	void set_state (ARDOUR::BundleChannel c[2], bool);
 	PortMatrixNode::State get_state (ARDOUR::BundleChannel c[2]) const;
 
-	std::string disassociation_verb () const {
-		return _("Disconnect");
-	}
-
-	std::string channel_noun () const {
-		return _("port");
-	}
+	std::string disassociation_verb () const;
+	std::string channel_noun () const;
 
 	uint32_t n_io_ports () const;
 	boost::shared_ptr<ARDOUR::IO> const io () { return _io; }
diff --git a/gtk2_ardour/port_matrix.cc b/gtk2_ardour/port_matrix.cc
index 88987f03ef..73e937e840 100644
--- a/gtk2_ardour/port_matrix.cc
+++ b/gtk2_ardour/port_matrix.cc
@@ -840,3 +840,9 @@ PortMatrix::port_connected_or_disconnected ()
 {
 	_body->rebuild_and_draw_grid ();
 }
+
+string
+PortMatrix::channel_noun () const
+{
+	return _("channel");
+}
diff --git a/gtk2_ardour/port_matrix.h b/gtk2_ardour/port_matrix.h
index 0c0a52a1a1..52e2f1663b 100644
--- a/gtk2_ardour/port_matrix.h
+++ b/gtk2_ardour/port_matrix.h
@@ -35,7 +35,6 @@
 
 #include "port_group.h"
 #include "port_matrix_types.h"
-#include "i18n.h"
 
 /** The `port matrix' UI.  This is a widget which lets the user alter
  *  associations between one set of ports and another.  e.g. to connect
@@ -146,7 +145,7 @@ public:
 	}
 	virtual void rename_channel (ARDOUR::BundleChannel) {}
 	virtual std::string disassociation_verb () const = 0;
-	virtual std::string channel_noun () const { return _("channel"); }
+	virtual std::string channel_noun () const;
 
 	enum Result {
 		Cancelled,
diff --git a/gtk2_ardour/port_matrix_body.cc b/gtk2_ardour/port_matrix_body.cc
index 063eaa8d8a..6da2ab87b5 100644
--- a/gtk2_ardour/port_matrix_body.cc
+++ b/gtk2_ardour/port_matrix_body.cc
@@ -28,6 +28,8 @@
 #include "port_matrix_row_labels.h"
 #include "port_matrix_grid.h"
 
+#include "i18n.h"
+
 using namespace std;
 
 PortMatrixBody::PortMatrixBody (PortMatrix* p)
diff --git a/gtk2_ardour/port_matrix_column_labels.cc b/gtk2_ardour/port_matrix_column_labels.cc
index 522015548f..c3b10e289b 100644
--- a/gtk2_ardour/port_matrix_column_labels.cc
+++ b/gtk2_ardour/port_matrix_column_labels.cc
@@ -25,6 +25,8 @@
 #include "port_matrix_body.h"
 #include "utils.h"
 
+#include "i18n.h"
+
 using namespace std;
 
 PortMatrixColumnLabels::PortMatrixColumnLabels (PortMatrix* m, PortMatrixBody* b)
diff --git a/gtk2_ardour/return_ui.cc b/gtk2_ardour/return_ui.cc
index 62762dee44..61fe2291a5 100644
--- a/gtk2_ardour/return_ui.cc
+++ b/gtk2_ardour/return_ui.cc
@@ -30,6 +30,8 @@
 #include "ardour_ui.h"
 #include "gui_thread.h"
 
+#include "i18n.h"
+
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
diff --git a/gtk2_ardour/send_ui.cc b/gtk2_ardour/send_ui.cc
index a0359a4856..3cc17faaea 100644
--- a/gtk2_ardour/send_ui.cc
+++ b/gtk2_ardour/send_ui.cc
@@ -30,6 +30,8 @@
 #include "ardour_ui.h"
 #include "gui_thread.h"
 
+#include "i18n.h"
+
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;