[gstreamermm] Plugin Generator: Remove the C struct class definition for signals.

[José Alburquerque <jaalburqu src gnome org>]

commit 9678d4173cc17677bcc70891861d0f4cd46e48f9
Author: José Alburquerque <jaalburqu svn gnome org>
Date:   Mon Apr 18 23:12:36 2011 -0400

    Plugin Generator: Remove the C struct class definition for signals.
    
    	* tools/extra_defs_gen/generate_plugin_gmmproc_file.cc: Remove code
    	related to the class declaration of plugins for wrapping the signals
    	since no default handlers are generated anymore which was done to
    	avoid accidentally including a C++ keyword for a signal name in the
    	class definition.

 ChangeLog                                          |   10 ++++++++
 .../extra_defs_gen/generate_plugin_gmmproc_file.cc |   25 +------------------
 2 files changed, 12 insertions(+), 23 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 18e3e68..6ebb403 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2011-04-18  José Alburquerque  <jaalburqu svn gnome org>
 
+	Plugin Generator: Remove the C struct class definition for signals.
+
+	* tools/extra_defs_gen/generate_plugin_gmmproc_file.cc: Remove code
+	related to the class declaration of plugins for wrapping the signals
+	since no default handlers are generated anymore which was done to
+	avoid accidentally including a C++ keyword for a signal name in the
+	class definition.
+
+2011-04-18  José Alburquerque  <jaalburqu svn gnome org>
+
 	configure.ac: Restore accidentally deleted comment text.
 
 	* configure.ac:
diff --git a/tools/extra_defs_gen/generate_plugin_gmmproc_file.cc b/tools/extra_defs_gen/generate_plugin_gmmproc_file.cc
index 6c551c0..98b31a7 100644
--- a/tools/extra_defs_gen/generate_plugin_gmmproc_file.cc
+++ b/tools/extra_defs_gen/generate_plugin_gmmproc_file.cc
@@ -259,7 +259,6 @@ static std::string get_signal_wrap_statements(std::string& includeMacroCalls,
                                               std::string& cEnumDefinitions,
                                               std::string& enumWrapStatements,
                                               std::string& actionSignalsMethodDeclarations,
-                                              std::string& cClassSignalDeclarations,
                                               std::string& enumGTypeFunctionDefinitions,
                                               std::string& actionSignalsMethodDefinitions)
 {
@@ -431,9 +430,6 @@ static std::string get_signal_wrap_statements(std::string& includeMacroCalls,
       wrapStatement += "  _WRAP_SIGNAL(" + returnCTypeTranslation + ' ' +
         signalMethodName + '(';
 
-      cClassSignalDeclarations += "  " + returnCType + " (*" +
-        signalMethodName + "_signal) (" + cTypeName + "* element";
-
       //Loop through the list of parameters:
       const GType* pParameters = signalQuery.param_types;
       if(pParameters)
@@ -524,8 +520,6 @@ static std::string get_signal_wrap_statements(std::string& includeMacroCalls,
 
           wrapStatement += paramCTypeTranslation + ' ' + paramName;
 
-          cClassSignalDeclarations += ", " + paramCType + ' ' + paramName;
-
           if(i < signalQuery.n_params - 1)
           {
             wrapStatement += ", ";
@@ -576,8 +570,6 @@ static std::string get_signal_wrap_statements(std::string& includeMacroCalls,
       actionSignalsMethodDeclarations += actionSignalMethodDeclaration;
       actionSignalsMethodDefinitions +=  pluginEnumsTranslationMacros +
         actionSignalMethodDefinition;
-
-      cClassSignalDeclarations += ");\n";
     }
   }
 
@@ -711,7 +703,6 @@ static void generate_hg_file(const std::string& includeMacroCalls,
 }
 
 static void generate_ccg_file(const std::string& enumGTypeFunctionDefinitions,
-  const std::string& cClassSignalDeclarations,
   const std::string& actionSignalsMethodDefinitions)
 {
   std::cout << "// Generated by generate_plugin_gmmproc_file. Don't edit this file." << std::endl << std::endl;
@@ -720,16 +711,6 @@ static void generate_ccg_file(const std::string& enumGTypeFunctionDefinitions,
   std::cout << "_PINCLUDE(" << parentInclude << "/private/" <<
     to_lowercase(cppParentTypeName) << "_p.h)" << std::endl << std::endl;
 
-  //Only output ObjectClass with signal declarations if there are signals:
-  if(!cClassSignalDeclarations.empty())
-  {
-    std::cout << "struct _" << cTypeName << "Class" << std::endl;
-    std::cout << '{' << std::endl;
-    std::cout << "  " << cParentTypeName << "Class parent_class;" << std::endl;
-    std::cout << cClassSignalDeclarations;
-    std::cout << "};" << std::endl << std::endl;
-  }
-
   std::string getTypeName = to_lowercase(castMacro) + "_get_type";
 
   std::cout << "extern \"C\"" << std::endl;
@@ -938,7 +919,6 @@ int main(int argc, char** argv)
       std::string actionSignalsMethodDeclarations;
       std::string propertyWrapStatements;
       std::string signalWrapStatements;
-      std::string cClassSignalDeclarations;
       std::string enumGTypeFunctionDefinitions;
       std::string actionSignalsMethodDefinitions;
 
@@ -947,8 +927,7 @@ int main(int argc, char** argv)
 
       signalWrapStatements = get_signal_wrap_statements(includeMacroCalls,
         cEnumDefinitions, enumWrapStatements, actionSignalsMethodDeclarations,
-        cClassSignalDeclarations, enumGTypeFunctionDefinitions,
-        actionSignalsMethodDefinitions);
+        enumGTypeFunctionDefinitions, actionSignalsMethodDefinitions);
 
       if(hgFile)
       {
@@ -965,7 +944,7 @@ int main(int argc, char** argv)
       else
       {
         generate_ccg_file(enumGTypeFunctionDefinitions,
-          cClassSignalDeclarations, actionSignalsMethodDefinitions);
+          actionSignalsMethodDefinitions);
       }
     }
   }