added generation of setter_/getter_ slots for public member variables

git-svn-id: http://svn.code.sf.net/p/pythonqt/code/trunk@151 ea8d5007-eb21-0410-b261-ccb3ea6e24a9

Author: florianlink

generator/abstractmetalang.cpp

@@ -1264,7 +1264,7 @@ const AbstractMetaFunction *AbstractMetaField::setter() const
 {
     if (m_setter == 0) {
         m_setter = createXetter(this,
-                                "set" + upCaseFirst(name()),
+                                name(),
                                 AbstractMetaAttributes::SetterFunction);
         AbstractMetaArgumentList arguments;
         AbstractMetaArgument *argument = new AbstractMetaArgument;

generator/shellgenerator.cpp

@@ -222,12 +222,12 @@ void ShellGenerator::writeFunctionSignature(QTextStream &s,
       function_name = meta_function->name();
     }
 
-    s << name_prefix << function_name;
+  if (meta_function->attributes() & AbstractMetaAttributes::SetterFunction)
+    s << "setter_";
+  else if (meta_function->attributes() & AbstractMetaAttributes::GetterFunction)
+    s << "getter_";
 
-    if (meta_function->attributes() & AbstractMetaAttributes::SetterFunction)
-        s << "_setter";
-    else if (meta_function->attributes() & AbstractMetaAttributes::GetterFunction)
-        s << "_getter";
+  s << name_prefix << function_name;
 
     s << "(";
 

generator/shellheadergenerator.cpp

@@ -51,6 +51,23 @@ QString ShellHeaderGenerator::fileNameForClass(const AbstractMetaClass *meta_cla
   return QString("PythonQtWrapper_%1.h").arg(meta_class->name());
 }
 
+
+void ShellHeaderGenerator::writeFieldAccessors(QTextStream &s, const AbstractMetaField *field)
+{
+  const AbstractMetaFunction *setter = field->setter();
+  const AbstractMetaFunction *getter = field->getter();
+  
+  if (!field->type()->isConstant()) {
+    writeFunctionSignature(s, setter, 0, QString(),
+                           Option(ConvertReferenceToPtr | FirstArgIsWrappedObject| IncludeDefaultExpression | ShowStatic | UnderscoreSpaces));
+    s << "{ theWrappedObject->" << field->name() << " = " << setter->arguments()[0]->argumentName() << "; }\n";
+  }
+  
+  writeFunctionSignature(s, getter, 0, QString(),
+                         Option(ConvertReferenceToPtr | FirstArgIsWrappedObject| IncludeDefaultExpression | OriginalName | ShowStatic | UnderscoreSpaces));
+  s << "{ return theWrappedObject->" << field->name() << "; }\n";
+}
+
 void ShellHeaderGenerator::write(QTextStream &s, const AbstractMetaClass *meta_class)
 {
   QString builtIn = ShellGenerator::isBuiltIn(meta_class->name())?"_builtin":"";
@@ -259,6 +276,13 @@ void ShellHeaderGenerator::write(QTextStream &s, const AbstractMetaClass *meta_c
     s << "    QString toString(" << meta_class->qualifiedCppName() << "*);" << endl; 
   }
 
+  // Field accessors
+  foreach (const AbstractMetaField *field, meta_class->fields()) {
+    if (field->isPublic()) {
+      writeFieldAccessors(s, field);
+    }
+  }
+
   //    writeInjectedCode(s, meta_class);
 
   //  s  << endl << "    QScriptValue __qtscript_self;" << endl;

generator/shellheadergenerator.h

@@ -62,6 +62,8 @@ class ShellHeaderGenerator : public ShellGenerator
     void write(QTextStream &s, const AbstractMetaClass *meta_class);
     void writeInjectedCode(QTextStream &s, const AbstractMetaClass *meta_class);
 
+  void writeFieldAccessors(QTextStream &s, const AbstractMetaField *field);
+
   SetupGenerator* setupGenerator;
 };
 

generator/shellimplgenerator.cpp

@@ -69,10 +69,6 @@ void ShellImplGenerator::write(QTextStream &s, const AbstractMetaClass *meta_cla
   QString builtIn = ShellGenerator::isBuiltIn(meta_class->name())?"_builtin":"";
   QString pro_file_name = meta_class->package().replace(".", "_") + builtIn + "/" + meta_class->package().replace(".", "_") + builtIn + ".pri";
   priGenerator->addSource(pro_file_name, fileNameForClass(meta_class));
-
-  foreach (AbstractMetaField* field, meta_class->fields()) {
-    std::cout << "Not yet generated fields: " << meta_class->qualifiedCppName().toLatin1().data() << "::" << field->name().toLatin1().data() << std::endl;
-  }
 
   s << "#include \"PythonQtWrapper_" << meta_class->name() << ".h\"" << endl << endl;