GIT_REPOSITORIES/LPP/PythonQt Commit - r115:5366b65bcedb

changed special generated method prefix to py_, added py_toString() generation...

florianlink -

r115:5366b65bcedb

parent child

Context file:

r115:5366b65bcedb

Collapse all files

generator/abstractmetabuilder.cpp +1 -1

                     if (arguments.at(0)->type().toString() == "QDebug"){
                         ArgumentModelItem arg = arguments.at(1);
                         if (AbstractMetaClass *cls = argumentToClass(arg)) {
-                            if (arg->type().indirections() < 2) {
+                            if (arg->type().indirections() < 2 && cls->name()!="QObject") {
                                 cls->setToStringCapability(function_item);
                             }
                         }

generator/metaqtscript.cpp +1 -1

             bool MetaQtScriptClass::hasDefaultToStringFunction() const
             {
-                return 0 < queryFunctionsByName("toString").size();
+              return AbstractMetaClass::hasDefaultToStringFunction();
             }

generator/shellgenerator.cpp +2 -2

                 }
               if (meta_function->attributes() & AbstractMetaAttributes::SetterFunction)
-                s << "setter_";
+                s << "py_set_";
               else if (meta_function->attributes() & AbstractMetaAttributes::GetterFunction)
-                s << "getter_";
+                s << "py_get_";
               s << name_prefix << function_name;

generator/shellheadergenerator.cpp +7 -4

               const AbstractMetaFunction *setter = field->setter();
               const AbstractMetaFunction *getter = field->getter();
+              // Uuid data4 did not work
+              if (field->enclosingClass()->name()=="QUuid" &&  setter->name()=="data4") return;
               if (!field->type()->isConstant()) {
                 writeFunctionSignature(s, setter, 0, QString(),
                                        Option(ConvertReferenceToPtr | FirstArgIsWrappedObject| IncludeDefaultExpression | ShowStatic | UnderscoreSpaces));
                 s << endl;
               }
               if (meta_class->name()=="QTreeWidgetItem") {
-                s << "bool hasOwner(QTreeWidgetItem* theWrappedObject) { return theWrappedObject->treeWidget()!=NULL || theWrappedObject->parent()!=NULL; }" << endl;
+                s << "bool py_hasOwner(QTreeWidgetItem* theWrappedObject) { return theWrappedObject->treeWidget()!=NULL || theWrappedObject->parent()!=NULL; }" << endl;
               } else if (meta_class->name()=="QGraphicsItem") {
-                s << "bool hasOwner(QGraphicsItem* theWrappedObject) { return theWrappedObject->scene()!=NULL || theWrappedObject->parentItem()!=NULL; }" << endl;
+                s << "bool py_hasOwner(QGraphicsItem* theWrappedObject) { return theWrappedObject->scene()!=NULL || theWrappedObject->parentItem()!=NULL; }" << endl;
               }
               AbstractMetaFunctionList functions = getFunctionsToWrap(meta_class);
                   s << ";" << endl;
                 }
               }
-              if (!meta_class->hasDefaultToStringFunction() && meta_class->hasToStringCapability()) {
+              if (meta_class->hasDefaultToStringFunction() || meta_class->hasToStringCapability()) {
-                s << "    QString toString(" << meta_class->qualifiedCppName() << "*);" << endl;
+                s << "    QString py_toString(" << meta_class->qualifiedCppName() << "*);" << endl;
               }
               // Field accessors

generator/shellimplgenerator.cpp +4 -2

                 s << "}" << endl << endl;
               }
-              if (!meta_class->hasDefaultToStringFunction() && meta_class->hasToStringCapability()) {
+              if (meta_class->hasDefaultToStringFunction()) {
+                s << "QString PythonQtWrapper_" << meta_class->name() << "::py_toString(" << meta_class->qualifiedCppName() << "* obj) { return obj->toString(); }" << endl;
+              } else if (meta_class->hasToStringCapability()) {
                 FunctionModelItem fun = meta_class->hasToStringCapability();
                 int indirections = fun->arguments().at(1)->type().indirections();
                 QString deref = QLatin1String(indirections == 0 ? "*" : "");
-                s << "QString PythonQtWrapper_" << meta_class->name() << "::toString(" << meta_class->qualifiedCppName() << "* obj) {" << endl;
+                s << "QString PythonQtWrapper_" << meta_class->name() << "::py_toString(" << meta_class->qualifiedCppName() << "* obj) {" << endl;
                 s << "  QString result;" << endl;
                 s << "  QDebug d(&result);" << endl;
                 s << "  d << " << deref  << "obj;" << endl;

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages