From cf52d6e4b40111eb04b244ec054055a4ec15dbe0 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 14 Jul 2016 14:44:52 -0400 Subject: enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h --- libs/gtkmm2ext/actions.cc | 2 +- libs/gtkmm2ext/barcontroller.cc | 2 +- libs/gtkmm2ext/bindable_button.cc | 2 +- libs/gtkmm2ext/binding_proxy.cc | 2 +- libs/gtkmm2ext/bindings.cc | 2 +- libs/gtkmm2ext/cairo_widget.cc | 2 +- libs/gtkmm2ext/cursors.cc | 2 +- libs/gtkmm2ext/emscale.cc | 2 +- libs/gtkmm2ext/gtk_ui.cc | 2 +- libs/gtkmm2ext/i18n.h | 16 ---------------- libs/gtkmm2ext/keyboard.cc | 2 +- libs/gtkmm2ext/pane.cc | 2 +- libs/gtkmm2ext/paths_dialog.cc | 2 +- libs/gtkmm2ext/persistent_tooltip.cc | 2 +- libs/gtkmm2ext/prompter.cc | 2 +- libs/gtkmm2ext/slider_controller.cc | 2 +- libs/gtkmm2ext/tabbable.cc | 2 +- libs/gtkmm2ext/tearoff.cc | 2 +- libs/gtkmm2ext/textviewer.cc | 2 +- libs/gtkmm2ext/utils.cc | 2 +- libs/gtkmm2ext/window_proxy.cc | 2 +- libs/gtkmm2ext/window_title.cc | 2 +- 22 files changed, 21 insertions(+), 37 deletions(-) delete mode 100644 libs/gtkmm2ext/i18n.h (limited to 'libs/gtkmm2ext') diff --git a/libs/gtkmm2ext/actions.cc b/libs/gtkmm2ext/actions.cc index e2abdae4f9..3aa36b98db 100644 --- a/libs/gtkmm2ext/actions.cc +++ b/libs/gtkmm2ext/actions.cc @@ -41,7 +41,7 @@ #include "gtkmm2ext/actions.h" #include "gtkmm2ext/utils.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Gtk; diff --git a/libs/gtkmm2ext/barcontroller.cc b/libs/gtkmm2ext/barcontroller.cc index 0c777ed999..d213f22d26 100644 --- a/libs/gtkmm2ext/barcontroller.cc +++ b/libs/gtkmm2ext/barcontroller.cc @@ -31,7 +31,7 @@ #include "gtkmm2ext/barcontroller.h" #include "gtkmm2ext/cairo_widget.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Gtk; diff --git a/libs/gtkmm2ext/bindable_button.cc b/libs/gtkmm2ext/bindable_button.cc index 5c0cc3c958..cc9695f981 100644 --- a/libs/gtkmm2ext/bindable_button.cc +++ b/libs/gtkmm2ext/bindable_button.cc @@ -26,7 +26,7 @@ #include "gtkmm2ext/bindable_button.h" #include "gtkmm2ext/gui_thread.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace Gtkmm2ext; using namespace std; diff --git a/libs/gtkmm2ext/binding_proxy.cc b/libs/gtkmm2ext/binding_proxy.cc index dfa2b4ac7c..5ba5f7eba4 100644 --- a/libs/gtkmm2ext/binding_proxy.cc +++ b/libs/gtkmm2ext/binding_proxy.cc @@ -25,7 +25,7 @@ #include -#include "i18n.h" +#include "pbd/i18n.h" using namespace Gtkmm2ext; using namespace std; diff --git a/libs/gtkmm2ext/bindings.cc b/libs/gtkmm2ext/bindings.cc index 617fc3a100..ff44da4b32 100644 --- a/libs/gtkmm2ext/bindings.cc +++ b/libs/gtkmm2ext/bindings.cc @@ -35,7 +35,7 @@ #include "gtkmm2ext/keyboard.h" #include "gtkmm2ext/utils.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Glib; diff --git a/libs/gtkmm2ext/cairo_widget.cc b/libs/gtkmm2ext/cairo_widget.cc index fe93f1eb7c..8349a685fa 100644 --- a/libs/gtkmm2ext/cairo_widget.cc +++ b/libs/gtkmm2ext/cairo_widget.cc @@ -23,7 +23,7 @@ #include "gtkmm2ext/cairo_widget.h" #include "gtkmm2ext/gui_thread.h" -#include "i18n.h" +#include "pbd/i18n.h" static const char* has_cairo_widget_background_info = "has_cairo_widget_background_info"; diff --git a/libs/gtkmm2ext/cursors.cc b/libs/gtkmm2ext/cursors.cc index f8862835f6..2ac0dba627 100644 --- a/libs/gtkmm2ext/cursors.cc +++ b/libs/gtkmm2ext/cursors.cc @@ -25,7 +25,7 @@ #include "gtkmm2ext/cursors.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace Gtkmm2ext; diff --git a/libs/gtkmm2ext/emscale.cc b/libs/gtkmm2ext/emscale.cc index 5d28218bb5..6d4697fe04 100644 --- a/libs/gtkmm2ext/emscale.cc +++ b/libs/gtkmm2ext/emscale.cc @@ -22,7 +22,7 @@ #include "gtkmm2ext/emscale.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace Gtkmm2ext; diff --git a/libs/gtkmm2ext/gtk_ui.cc b/libs/gtkmm2ext/gtk_ui.cc index e220a37a28..c3e94c922e 100644 --- a/libs/gtkmm2ext/gtk_ui.cc +++ b/libs/gtkmm2ext/gtk_ui.cc @@ -46,7 +46,7 @@ #include "gtkmm2ext/actions.h" #include "gtkmm2ext/gui_thread.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace Gtkmm2ext; using namespace Gtk; diff --git a/libs/gtkmm2ext/i18n.h b/libs/gtkmm2ext/i18n.h deleted file mode 100644 index 2f1c52a907..0000000000 --- a/libs/gtkmm2ext/i18n.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef __i18n_h__ -#define __i18n_h__ - -#include -#include -#include "gettext.h" - -#define _(Text) dgettext (PACKAGE, Text) -#define N_(Text) gettext_noop (Text) -#define X_(Text) (Text) -/** Use this to translate strings that have different meanings in different places. - * Text should be of the form Context|Message. - */ -#define S_(Text) PBD::sgettext (PACKAGE, Text) - -#endif // __i18n_h__ diff --git a/libs/gtkmm2ext/keyboard.cc b/libs/gtkmm2ext/keyboard.cc index 1abe69f9f0..569db5e1a8 100644 --- a/libs/gtkmm2ext/keyboard.cc +++ b/libs/gtkmm2ext/keyboard.cc @@ -43,7 +43,7 @@ #include "gtkmm2ext/keyboard.h" #include "gtkmm2ext/debug.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace PBD; using namespace Gtk; diff --git a/libs/gtkmm2ext/pane.cc b/libs/gtkmm2ext/pane.cc index 02a4745f8b..5926809a55 100644 --- a/libs/gtkmm2ext/pane.cc +++ b/libs/gtkmm2ext/pane.cc @@ -20,7 +20,7 @@ #include #include "gtkmm2ext/pane.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace PBD; using namespace Gtk; diff --git a/libs/gtkmm2ext/paths_dialog.cc b/libs/gtkmm2ext/paths_dialog.cc index f169a5a29d..2f2ff0c5d8 100644 --- a/libs/gtkmm2ext/paths_dialog.cc +++ b/libs/gtkmm2ext/paths_dialog.cc @@ -18,7 +18,7 @@ */ #include -#include "i18n.h" +#include "pbd/i18n.h" #include "pbd/pathexpand.h" #include "gtkmm2ext/paths_dialog.h" diff --git a/libs/gtkmm2ext/persistent_tooltip.cc b/libs/gtkmm2ext/persistent_tooltip.cc index 3040b0f9ac..d45ef01408 100644 --- a/libs/gtkmm2ext/persistent_tooltip.cc +++ b/libs/gtkmm2ext/persistent_tooltip.cc @@ -24,7 +24,7 @@ #include "pbd/stacktrace.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Gtk; diff --git a/libs/gtkmm2ext/prompter.cc b/libs/gtkmm2ext/prompter.cc index 1f5e13b923..51628ab13d 100644 --- a/libs/gtkmm2ext/prompter.cc +++ b/libs/gtkmm2ext/prompter.cc @@ -25,7 +25,7 @@ #include #include -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Gtkmm2ext; diff --git a/libs/gtkmm2ext/slider_controller.cc b/libs/gtkmm2ext/slider_controller.cc index f0ad19d055..9b55efbcd1 100644 --- a/libs/gtkmm2ext/slider_controller.cc +++ b/libs/gtkmm2ext/slider_controller.cc @@ -24,7 +24,7 @@ #include #include "pbd/controllable.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace Gtkmm2ext; using namespace PBD; diff --git a/libs/gtkmm2ext/tabbable.cc b/libs/gtkmm2ext/tabbable.cc index 9aa1c3fe5f..5e4752454e 100644 --- a/libs/gtkmm2ext/tabbable.cc +++ b/libs/gtkmm2ext/tabbable.cc @@ -29,7 +29,7 @@ #include "pbd/stacktrace.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace Gtkmm2ext; using namespace Gtk; diff --git a/libs/gtkmm2ext/tearoff.cc b/libs/gtkmm2ext/tearoff.cc index c107bd988a..bb30e5610f 100644 --- a/libs/gtkmm2ext/tearoff.cc +++ b/libs/gtkmm2ext/tearoff.cc @@ -26,7 +26,7 @@ #include "gtkmm2ext/tearoff.h" #include "gtkmm2ext/utils.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace Gtkmm2ext; using namespace Gtk; diff --git a/libs/gtkmm2ext/textviewer.cc b/libs/gtkmm2ext/textviewer.cc index 7de9b02683..22c26aa1b7 100644 --- a/libs/gtkmm2ext/textviewer.cc +++ b/libs/gtkmm2ext/textviewer.cc @@ -20,7 +20,7 @@ #include #include -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Gtkmm2ext; diff --git a/libs/gtkmm2ext/utils.cc b/libs/gtkmm2ext/utils.cc index 3210e0e63d..b1be7c9c92 100644 --- a/libs/gtkmm2ext/utils.cc +++ b/libs/gtkmm2ext/utils.cc @@ -35,7 +35,7 @@ #include "gtkmm2ext/utils.h" #include "gtkmm2ext/persistent_tooltip.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; diff --git a/libs/gtkmm2ext/window_proxy.cc b/libs/gtkmm2ext/window_proxy.cc index d0303c972b..1f2fa54112 100644 --- a/libs/gtkmm2ext/window_proxy.cc +++ b/libs/gtkmm2ext/window_proxy.cc @@ -27,7 +27,7 @@ #include "gtkmm2ext/window_proxy.h" #include "gtkmm2ext/visibility_tracker.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace Gtk; using namespace Gtkmm2ext; diff --git a/libs/gtkmm2ext/window_title.cc b/libs/gtkmm2ext/window_title.cc index eaf25a9f74..5cb9ed94b6 100644 --- a/libs/gtkmm2ext/window_title.cc +++ b/libs/gtkmm2ext/window_title.cc @@ -19,7 +19,7 @@ #include "gtkmm2ext/window_title.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; -- cgit v1.2.3