add missing file, remove unnecessary qualifier

git-svn-id: svn://localhost/trunk/ardour2@472 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/pbd3/gettext.h b/libs/pbd3/gettext.h
new file mode 100644 (file)
index 0000000..339c74f
--- /dev/null
+++ b/libs/pbd3/gettext.h
@@ -0,0 +1,82 @@
+/* Convenience header for conditional use of GNU <libintl.h>.
+   Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
+
+#ifndef _LIBGETTEXT_H
+#define _LIBGETTEXT_H 1
+
+/* NLS can be disabled through the configure --disable-nls option.  */
+#if ENABLE_NLS
+
+/* Get declarations of GNU message catalog functions.  */
+# include <libintl.h>
+
+#else
+
+/* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which
+   chokes if dcgettext is defined as a macro.  So include it now, to make
+   later inclusions of <locale.h> a NOP.  We don't include <libintl.h>
+   as well because people using "gettext.h" will not include <libintl.h>,
+   and also including <libintl.h> would fail on SunOS 4, whereas <locale.h>
+   is OK.  */
+#if defined(__sun)
+# include <locale.h>
+#endif
+
+/* Disabled NLS.
+   The casts to 'const char *' serve the purpose of producing warnings
+   for invalid uses of the value returned from these functions.
+   On pre-ANSI systems without 'const', the config.h file is supposed to
+   contain "#define const".  */
+
+/* other headers may have included libintl.h */
+
+# undef gettext
+# undef dgettext
+# undef dcgettext
+# undef ngettext
+# undef dngettext
+# undef dcngettext
+# undef textdomain
+# undef bindtextdomain
+# undef bind_textdomain_codeset
+
+# define gettext(Msgid) ((const char *) (Msgid))
+# define dgettext(Domainname, Msgid) ((const char *) (Msgid))
+# define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid))
+# define ngettext(Msgid1, Msgid2, N) \
+    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
+# define dngettext(Domainname, Msgid1, Msgid2, N) \
+    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
+# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
+    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
+# define textdomain(Domainname) ((const char *) (Domainname))
+# define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname))
+# define bind_textdomain_codeset(Domainname, Codeset) ((const char *) (Codeset))
+
+#endif
+
+/* A pseudo function call that serves as a marker for the automated
+   extraction of messages, but does not call gettext().  The run-time
+   translation is done at a different place in the code.
+   The argument, String, should be a literal string.  Concatenated strings
+   and other string expressions won't work.
+   The macro's expansion is not parenthesized, so that it is suitable as
+   initializer for static 'char[]' or 'const char[]' variables.  */
+#define gettext_noop(String) String
+
+#endif /* _LIBGETTEXT_H */

diff --git a/libs/pbd3/pbd/abstract_ui.cc b/libs/pbd3/pbd/abstract_ui.cc
index 9c1d983ee124ad9b8d464ee8f96f2c32e3f8c61e..06cf1665a3a4e99fcee8fe21b7b5ad4f4891ea6b 100644 (file)
--- a/libs/pbd3/pbd/abstract_ui.cc
+++ b/libs/pbd3/pbd/abstract_ui.cc
@@ -5,7 +5,7 @@
 #include <pbd/failed_constructor.h>
 
 template <typename RequestObject>
-AbstractUI<RequestObject>::AbstractUI<RequestObject> (string name, bool with_signal_pipes)
+AbstractUI<RequestObject>::AbstractUI (string name, bool with_signal_pipes)
        : BaseUI (name, with_signal_pipes)
 {
        if (pthread_key_create (&thread_request_buffer_key, 0)) {

diff --git a/libs/pbd3/pbd/base_ui.h b/libs/pbd3/pbd/base_ui.h
index d9b546ff75103aa6e0de957ea975191665377328..b4570f87076bfec2d7686056ddcf13f7ba8cb3fd 100644 (file)
--- a/libs/pbd3/pbd/base_ui.h
+++ b/libs/pbd3/pbd/base_ui.h
@@ -28,7 +28,7 @@ class BaseUI : virtual public sigc::trackable {
        };
 
        static RequestType new_request_type();
-       static RequestType BaseUI::CallSlot;
+       static RequestType CallSlot;
 
   protected:
        int signal_pipe[2];