[gstreamermm] Rename the _CCONVERT* macros used for plug-in generation to _TRANSLATE*.



commit d15d568a2a133e1369b258cd6784e3be6e7c06fc
Author: José Alburquerque <jaalburqu svn gnome org>
Date:   Thu May 28 18:46:24 2009 -0400

    Rename the _CCONVERT* macros used for plug-in generation to _TRANSLATE*.
---
 ChangeLog                                          |    9 ++++
 .../extra_defs_gen/generate_plugin_gmmproc_file.cc |   32 +++++++-------
 tools/m4/ctocpp_base.m4                            |   44 ++++++++++----------
 tools/m4/ctocpp_gstreamermm.m4                     |   39 +++++++++--------
 4 files changed, 68 insertions(+), 56 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 116e73e..220d30d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-05-28  José Alburquerque  <jaalburqu svn gnome org>
+
+	* tools/m4/ctocpp_base.m4:
+	* tools/m4/ctocpp_gstreamermm.m4:
+	* tools/extra_defs_gen/generate_plugin_gmmproc_file.cc: Use
+	"translate" instead of "convert" in the C to C++ type translation
+	macros used for plug-in generation to avoid confusion between the C to
+	C++ translation macros and the standard glibmm conversion macros.
+
 0.10.2:
 
 2009-05-27  José Alburquerque  <jaalburqu svn gnome org>
diff --git a/tools/extra_defs_gen/generate_plugin_gmmproc_file.cc b/tools/extra_defs_gen/generate_plugin_gmmproc_file.cc
index 5ffd767..3b10fe2 100644
--- a/tools/extra_defs_gen/generate_plugin_gmmproc_file.cc
+++ b/tools/extra_defs_gen/generate_plugin_gmmproc_file.cc
@@ -246,7 +246,7 @@ void get_property_wrap_statements(Glib::ustring& wrapStatements,
 
           enumWrapStatements += "_WRAP_ENUM(" + propertyCType.substr(3) + ", " +
             propertyCType + ")\n";
-          enumWrapStatements += "_CCONVERSION(`" + propertyCType + "',`" +
+          enumWrapStatements += "_TRANSLATION(`" + propertyCType + "',`" +
             propertyCppType + "',`" + propertyCppType + "')dnl\n";
 
           Glib::ustring enumGetTypeFunctionName =
@@ -262,10 +262,10 @@ void get_property_wrap_statements(Glib::ustring& wrapStatements,
         }
 
         wrapStatements += "  _WRAP_PROPERTY(\"" + propertyName + "\", " +
-          "_CCONVERT(" + propertyCType + ", `return'))\n";
+          "_TRANSLATE(" + propertyCType + ", `return'))\n";
 
         if(!G_TYPE_IS_ENUM(propertyGType) || enumIsWrapped)
-          includeMacroCalls += "_CCONVERSION_INCLUDE(" + propertyCType + ")dnl\n";
+          includeMacroCalls += "_TRANSLATION_INCLUDE(" + propertyCType + ")dnl\n";
       }
     }
   }
@@ -339,7 +339,7 @@ void get_signal_wrap_statements(Glib::ustring& wrapStatements,
         // wrapper.
         {
           // Unwrapping conversion:
-          convertMacros += "#m4 _CONVERSION(_LQ()_CCONVERT(" + returnCType +
+          convertMacros += "#m4 _CONVERSION(_LQ()_TRANSLATE(" + returnCType +
             ",`type')_RQ(), ``" + returnCType + "'', ";
           convertMacros +=  "``($3).gobj_copy()'')\n";
 
@@ -351,14 +351,14 @@ void get_signal_wrap_statements(Glib::ustring& wrapStatements,
           // (GstTagList is infact a GstStructure).
           {
             convertMacros += "#m4 _CONVERSION(``" + returnCType +
-              "'', _LQ()_CCONVERT(" + returnCType + ",`return')_RQ(), ";
+              "'', _LQ()_TRANSLATE(" + returnCType + ",`return')_RQ(), ";
             convertMacros +=  "``Glib::wrap($3, 0)'')\n";
           }
           else
           // Dealing with a regular boxed type return.
           {
             convertMacros += "#m4 _CONVERSION(``" + returnCType +
-              "'', _LQ()_CCONVERT(" + returnCType + ",`return')_RQ(), ";
+              "'', _LQ()_TRANSLATE(" + returnCType + ",`return')_RQ(), ";
             convertMacros +=  "``Glib::wrap($3)'')\n";
           }
         }
@@ -369,15 +369,15 @@ void get_signal_wrap_statements(Glib::ustring& wrapStatements,
         // already probably be included in the global convert file).
         {
           convertMacros += "#m4 _CONVERSION(``" + returnCType +
-            "'', _LQ()_CCONVERT(" + returnCType + ",`return')_RQ(), ";
+            "'', _LQ()_TRANSLATE(" + returnCType + ",`return')_RQ(), ";
           convertMacros += g_type_is_a(returnGType, GST_TYPE_MINI_OBJECT) ?
             "``Gst::wrap($3)'')\n" : "``Glib::wrap($3)'')\n";
         }
       }
 
-      includeMacroCalls += "_CCONVERSION_INCLUDE(" + returnCType + ")dnl\n";
+      includeMacroCalls += "_TRANSLATION_INCLUDE(" + returnCType + ")dnl\n";
 
-      wrapStatement = "  _WRAP_SIGNAL(_CCONVERT("  + returnCType +
+      wrapStatement = "  _WRAP_SIGNAL(_TRANSLATE("  + returnCType +
         ", `return') " + signalMethodName + "(";
 
       cClassSignalDeclarations += "  " + returnCType + " (*" +
@@ -401,7 +401,7 @@ void get_signal_wrap_statements(Glib::ustring& wrapStatements,
           Glib::ustring  paramCType = g_type_name(paramGType) +
             (Glib::ustring) (gst_type_is_a_pointer(paramGType) ?  "*" : "");
 
-          includeMacroCalls += "_CCONVERSION_INCLUDE(" + paramCType + ")dnl\n";
+          includeMacroCalls += "_TRANSLATION_INCLUDE(" + paramCType + ")dnl\n";
 
           // Include wrapping conversions for signal parameters.  (Unwrapping
           // conversions will already probably be defined in the global convert
@@ -415,20 +415,20 @@ void get_signal_wrap_statements(Glib::ustring& wrapStatements,
             // (GstTagList is in fact a GstStructure).
             {
               convertMacros += "#m4 _CONVERSION(``" + paramCType +
-                "'', _LQ()_CCONVERT(" + paramCType + ",`param')_RQ(), ";
+                "'', _LQ()_TRANSLATE(" + paramCType + ",`param')_RQ(), ";
               convertMacros +=  "``Glib::wrap($3, 0, true)'')\n";
             }
             else
             // Dealing with reference counted parameter or a boxed type.
             {
               convertMacros += "#m4 _CONVERSION(``" + paramCType +
-                "'', _LQ()_CCONVERT(" + paramCType + ",`param')_RQ(), ";
+                "'', _LQ()_TRANSLATE(" + paramCType + ",`param')_RQ(), ";
               convertMacros += g_type_is_a(paramGType, GST_TYPE_MINI_OBJECT) ?
                 "``Gst::wrap($3, true)'')\n" : "``Glib::wrap($3, true)'')\n";
             }
           }
 
-          wrapStatement += "_CCONVERT(" + paramCType + ", `param') " +
+          wrapStatement += "_TRANSLATE(" + paramCType + ", `param') " +
             paramName;
 
           cClassSignalDeclarations += ", " + paramCType + " " + paramName;
@@ -469,15 +469,15 @@ void get_interface_macros(Glib::ustring& interfaceMacros,
       Glib::ustring  interfaceCType = g_type_name(interfaces[i]) +
         (Glib::ustring) "*";
 
-      cppExtends += "public _CCONVERT(`" + interfaceCType + "',`type')";
+      cppExtends += "public _TRANSLATE(`" + interfaceCType + "',`type')";
 
       if(i < n_interfaces - 1)
         cppExtends += ", ";
 
-      interfaceMacros += "  _IMPLEMENTS_INTERFACE(_CCONVERT(`" +
+      interfaceMacros += "  _IMPLEMENTS_INTERFACE(_TRANSLATE(`" +
         interfaceCType + "',`type'))\n";
 
-      includeMacroCalls += "_CCONVERSION_INCLUDE(" + interfaceCType + ")dnl\n";
+      includeMacroCalls += "_TRANSLATION_INCLUDE(" + interfaceCType + ")dnl\n";
     }
   }
 
diff --git a/tools/m4/ctocpp_base.m4 b/tools/m4/ctocpp_base.m4
index 061031c..d7c163e 100644
--- a/tools/m4/ctocpp_base.m4
+++ b/tools/m4/ctocpp_base.m4
@@ -1,6 +1,6 @@
 divert(-1)
 dnl
-dnl Macros to convert from C to C++ types
+dnl Macros to translate from C to C++ types.
 dnl
 
 dnl __HASH variable borrowed form glibmm's convert_base.m4 file
@@ -14,15 +14,15 @@ dnl Macro to insert right quote
 define(`_RQ',`changequote(<,>)dnl`
 'changequote`'')
 
-dnl _CCONVERSION(ctype, cpptype, param cpptype, return cpptype, cppinclude)
+dnl _TRANSLATION(ctype, cpptype, param cpptype, return cpptype, cppinclude)
 dnl
 dnl Records a translation from a C type to a C++ type.  If a return cpptype is
 dnl not given, it is assumed to be the same as the param cpptype.  A cpp
 dnl include need not be specified (the <> or "" are required though).  If an
 dnl include is specified, a C++ include directive may be generated with the
-dnl _CCONVERSION_INCLUDE macro.
+dnl _TRANSLATION_INCLUDE macro.
 dnl
-define(`_CCONVERSION',`dnl
+define(`_TRANSLATION',`dnl
 define(`TFT'__HASH(`$1'),`$2')dnl
 define(`TFP'__HASH(`$1'),`$3')dnl
 ifelse(`$4',,`dnl
@@ -32,14 +32,14 @@ define(`TFR'__HASH(`$1'),`$4')dnl
 ifelse(`$5',,,`define(`IF'__HASH(`$1'),`$5')')`'dnl
 ')dnl
 
-dnl _CCONVERSION_INCLUDE(ctype)
+dnl _TRANSLATION_INCLUDE(ctype)
 dnl
 dnl Produces a C++ include direcive of the C++ header for the ctype if a
 dnl translation has been defined and an include parameter was included.  Only
 dnl one directive will be generated for multiple calls (i.e. none but the first
 dnl call produces anything).
 dnl
-define(`_CCONVERSION_INCLUDE',`dnl
+define(`_TRANSLATION_INCLUDE',`dnl
 ifdef(`IFC'__HASH(`$1'),,`dnl
 ifdef(`IF'__HASH(`$1'),`dnl
 #include indir(`IF'__HASH(`$1'))
@@ -49,32 +49,32 @@ define(`IFC'__HASH(`$1'),`complete')dnl
 ')`'dnl
 ')dnl
 
-dnl _CCONVERT(ctype, conversion type)
+dnl _TRANSLATE(ctype, translation type)
 dnl
 dnl Translates from a specified C type to a C++ type, param or return type.
-dnl `conversion type' may be:
+dnl `translation type' may be:
 dnl `type' - For a C to C++ type translation.
 dnl `param' - For a C to C++ parameter translation.
 dnl `return' - For a C to C++ return translation.
 dnl
-define(`_CCONVERT',`dnl
+define(`_TRANSLATE',`dnl
 ifelse(dnl
 `$2',`type',`dnl
 ifdef(`TFT'__HASH(`$1'), `indir(`TFT'__HASH(`$1'))',`dnl
-errprint(`No C++ type conversion from $1 defined.
+errprint(`No C++ type translation from $1 is defined.
 ')`'dnl
 m4exit(1)`'dnl
 ')',dnl
 `$2',`param',`dnl
 ifdef(`TFP'__HASH(`$1'), `indir(`TFP'__HASH(`$1'))',`dnl
-errprint(`No C++ parameter conversion from $1 defined.
+errprint(`No C++ parameter translation from $1 is defined.
 ')`'dnl
 m4exit(1)`'dnl
 ')',dnl
 `$2',`return',`dnl
 ifdef(`TFR'__HASH(`$1'), `indir(`TFR'__HASH(`$1'))',`dnl
 ifdef(`TFP'__HASH(`$1'), `indir(`TFP'__HASH(`$1'))',`dnl
-errprint(`No C++ return conversion from $1 defined.
+errprint(`No C++ return translation from $1 is defined.
 ')`'dnl
 m4exit(1)`'dnl
 ')`'dnl
@@ -83,18 +83,18 @@ m4exit(1)`'dnl
 ')dnl
 
 #Basic C to C++ translations
-_CCONVERSION(`void',`void',`void')
-_CCONVERSION(`gboolean',`bool',`bool')
-_CCONVERSION(`gint',`int',`int')
-_CCONVERSION(`guint',`guint',`guint')
-_CCONVERSION(`gulong',`unsigned long',`unsigned long')
-_CCONVERSION(`gint64',`gint64',`gint64')
-_CCONVERSION(`guint64',`guint64',`guint64')
-_CCONVERSION(`gfloat',`float',`float')
-_CCONVERSION(`gdouble',`double',`double')
+_TRANSLATION(`void',`void',`void')
+_TRANSLATION(`gboolean',`bool',`bool')
+_TRANSLATION(`gint',`int',`int')
+_TRANSLATION(`guint',`guint',`guint')
+_TRANSLATION(`gulong',`unsigned long',`unsigned long')
+_TRANSLATION(`gint64',`gint64',`gint64')
+_TRANSLATION(`guint64',`guint64',`guint64')
+_TRANSLATION(`gfloat',`float',`float')
+_TRANSLATION(`gdouble',`double',`double')
 
 #String C to C++ translations
-_CCONVERSION(`gchararray',`Glib::ustring',`const Glib::ustring&',`Glib::ustring')
+_TRANSLATION(`gchararray',`Glib::ustring',`const Glib::ustring&',`Glib::ustring')
 
 include(ctocpp.m4)
 divert(0)dnl
diff --git a/tools/m4/ctocpp_gstreamermm.m4 b/tools/m4/ctocpp_gstreamermm.m4
index d0f090c..0dbd6c1 100644
--- a/tools/m4/ctocpp_gstreamermm.m4
+++ b/tools/m4/ctocpp_gstreamermm.m4
@@ -1,25 +1,28 @@
+# Translations from C to C++ types for plug-in generation.  See the
+# ctocpp_base.m4 file for documentation.
+
 #Enums
-_CCONVERSION(`GstFormat',`Gst::Format',`Gst::Format')
-_CCONVERSION(`GstTCPProtocol',`Gst::TCPProtocol',`Gst::TCPProtocol')
+_TRANSLATION(`GstFormat',`Gst::Format',`Gst::Format',,`<gstreamermm/format.h>')
+_TRANSLATION(`GstTCPProtocol',`Gst::TCPProtocol',`Gst::TCPProtocol',,`<gstreamermm/enums.h>')
 
 #giomm
-_CCONVERSION(`GFile*',`Gio::File',`const Glib::RefPtr<Gio::File>&',`Glib::RefPtr<Gio::File>',`<giomm/file.h>')
-_CCONVERSION(`GInputStream*',`Gio::InputStream',`const Glib::RefPtr<Gio::InputStream>&',`Glib::RefPtr<Gio::InputStream>',`<giomm/inputstream.h>')
-_CCONVERSION(`GOutputStream*',`Gio::OutputStream',`const Glib::RefPtr<Gio::OutputStream>&',`Glib::RefPtr<Gio::OutputStream>',`<giomm/outputstream.h>')
+_TRANSLATION(`GFile*',`Gio::File',`const Glib::RefPtr<Gio::File>&',`Glib::RefPtr<Gio::File>',`<giomm/file.h>')
+_TRANSLATION(`GInputStream*',`Gio::InputStream',`const Glib::RefPtr<Gio::InputStream>&',`Glib::RefPtr<Gio::InputStream>',`<giomm/inputstream.h>')
+_TRANSLATION(`GOutputStream*',`Gio::OutputStream',`const Glib::RefPtr<Gio::OutputStream>&',`Glib::RefPtr<Gio::OutputStream>',`<giomm/outputstream.h>')
 
 #gstreamermm
-_CCONVERSION(`GstBuffer*',`Gst::Buffer',`const Glib::RefPtr<Gst::Buffer>&',`Glib::RefPtr<Gst::Buffer>',`<gstreamermm/buffer.h>')
-_CCONVERSION(`GstCaps*',`Gst::Caps',`const Glib::RefPtr<Gst::Caps>&',`Glib::RefPtr<Gst::Caps>',`<gstreamermm/caps.h>')
-_CCONVERSION(`GstElement*',`Gst::Element',`const Glib::RefPtr<Gst::Element>&',`Glib::RefPtr<Gst::Element>',`<gstreamermm/element.h>')
-_CCONVERSION(`GstPad*',`Gst::Pad',`const Glib::RefPtr<Gst::Pad>&',`Glib::RefPtr<Gst::Pad>',`<gstreamermm/pad.h>')
-_CCONVERSION(`GstTagList*',`Gst::TagList',`Gst::TagList',,`<gstreamermm/taglist.h>')
+_TRANSLATION(`GstBuffer*',`Gst::Buffer',`const Glib::RefPtr<Gst::Buffer>&',`Glib::RefPtr<Gst::Buffer>',`<gstreamermm/buffer.h>')
+_TRANSLATION(`GstCaps*',`Gst::Caps',`const Glib::RefPtr<Gst::Caps>&',`Glib::RefPtr<Gst::Caps>',`<gstreamermm/caps.h>')
+_TRANSLATION(`GstElement*',`Gst::Element',`const Glib::RefPtr<Gst::Element>&',`Glib::RefPtr<Gst::Element>',`<gstreamermm/element.h>')
+_TRANSLATION(`GstPad*',`Gst::Pad',`const Glib::RefPtr<Gst::Pad>&',`Glib::RefPtr<Gst::Pad>',`<gstreamermm/pad.h>')
+_TRANSLATION(`GstTagList*',`Gst::TagList',`Gst::TagList',,`<gstreamermm/taglist.h>')
 
 #Interfaces
-_CCONVERSION(`GstColorBalance*',`Gst::ColorBalance',`const Glib::RefPtr<Gst::ColorBalance>&',`Glib::RefPtr<Gst::ColorBalance>',`<gstreamermm/colorbalance.h>')
-_CCONVERSION(`GstImplementsInterface*',`Gst::Interface',`const Glib::RefPtr<Gst::Interface>&',`Glib::RefPtr<Gst::Interface>',`<gstreamermm/interface.h>')
-_CCONVERSION(`GstMixer*',`Gst::Mixer',`const Glib::RefPtr<Gst::Mixer>&',`Glib::RefPtr<Gst::Mixer>',`<gstreamermm/mixer.h>')
-_CCONVERSION(`GstNavigation*',`Gst::Navigation',`const Glib::RefPtr<Gst::Navigation>&',`Glib::RefPtr<Gst::Navigation>',`<gstreamermm/navigation.h>')
-_CCONVERSION(`GstPropertyProbe*',`Gst::PropertyProbe',`const Glib::RefPtr<Gst::PropertyProbe>&',`Glib::RefPtr<Gst::PropertyProbe>',`<gstreamermm/propertyprobe.h>')
-_CCONVERSION(`GstTagSetter*',`Gst::TagSetter',`const Glib::RefPtr<Gst::TagSetter>&',`Glib::RefPtr<Gst::TagSetter>',`<gstreamermm/tagsetter.h>')
-_CCONVERSION(`GstURIHandler*',`Gst::URIHandler',`const Glib::RefPtr<Gst::URIHandler>&',`Glib::RefPtr<Gst::URIHandler>',`<gstreamermm/urihandler.h>')
-_CCONVERSION(`GstXOverlay*',`Gst::XOverlay',`const Glib::RefPtr<Gst::XOverlay>&',`Glib::RefPtr<Gst::XOverlay>',`<gstreamermm/xoverlay.h>')
+_TRANSLATION(`GstColorBalance*',`Gst::ColorBalance',`const Glib::RefPtr<Gst::ColorBalance>&',`Glib::RefPtr<Gst::ColorBalance>',`<gstreamermm/colorbalance.h>')
+_TRANSLATION(`GstImplementsInterface*',`Gst::Interface',`const Glib::RefPtr<Gst::Interface>&',`Glib::RefPtr<Gst::Interface>',`<gstreamermm/interface.h>')
+_TRANSLATION(`GstMixer*',`Gst::Mixer',`const Glib::RefPtr<Gst::Mixer>&',`Glib::RefPtr<Gst::Mixer>',`<gstreamermm/mixer.h>')
+_TRANSLATION(`GstNavigation*',`Gst::Navigation',`const Glib::RefPtr<Gst::Navigation>&',`Glib::RefPtr<Gst::Navigation>',`<gstreamermm/navigation.h>')
+_TRANSLATION(`GstPropertyProbe*',`Gst::PropertyProbe',`const Glib::RefPtr<Gst::PropertyProbe>&',`Glib::RefPtr<Gst::PropertyProbe>',`<gstreamermm/propertyprobe.h>')
+_TRANSLATION(`GstTagSetter*',`Gst::TagSetter',`const Glib::RefPtr<Gst::TagSetter>&',`Glib::RefPtr<Gst::TagSetter>',`<gstreamermm/tagsetter.h>')
+_TRANSLATION(`GstURIHandler*',`Gst::URIHandler',`const Glib::RefPtr<Gst::URIHandler>&',`Glib::RefPtr<Gst::URIHandler>',`<gstreamermm/urihandler.h>')
+_TRANSLATION(`GstXOverlay*',`Gst::XOverlay',`const Glib::RefPtr<Gst::XOverlay>&',`Glib::RefPtr<Gst::XOverlay>',`<gstreamermm/xoverlay.h>')



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]