GIT_REPOSITORIES/LPP/PythonQt Commit - r70:dadaf215f719

added return value conversion from reference to pointer to work around moc limitations, added toString method generation...

florianlink -

r70:dadaf215f719

parent child

Context file:

r70:dadaf215f719

Collapse all files

generator/abstractmetabuilder.cpp +1 0

                         traverseCompareOperator(item);
                     }
                 }
+                // TODO XXX search and add operator+ etc. to the classes here!
                 {
                     FunctionList stream_operators = m_dom->findFunctions("operator<<") + m_dom->findFunctions("operator>>");

generator/generator.h +1 0

                     NoBlockedSlot            = 0x00100000,
                     SuperCall                = 0x00200000,
                     FirstArgIsWrappedObject  = 0x00400000,
+                    ConvertReferenceToPtr    = 0x00800000,
                     GlobalRefJObject         = 0x00100000,

generator/shellgenerator.cpp +7 -2

                 s << QString(type->indirections(), '*');
-                if (type->isReference() && !(options & ExcludeReference))
+                if (type->isReference() && !(options & ExcludeReference) && !(options & ConvertReferenceToPtr))
                     s << "&";
+                if (type->isReference() && (options & ConvertReferenceToPtr)) {
+                  s << "*";
+                }
                 if (!(options & SkipName))
                     s << ' ';
             }
                 }
               }
-               writeFunctionArguments(s, meta_function->ownerClass(), meta_function->arguments(), option, numArguments);
+               writeFunctionArguments(s, meta_function->ownerClass(), meta_function->arguments(), Option(option & Option(~ConvertReferenceToPtr)), numArguments);
                 // The extra arguments...
                 for (int i=0; i<extra_arguments.size(); ++i) {

generator/shellheadergenerator.cpp +4 -1

                 if (!function->isSlot()) {
                   s << "   ";
                   writeFunctionSignature(s, function, 0, QString(),
-                    Option(FirstArgIsWrappedObject| IncludeDefaultExpression | OriginalName | ShowStatic | UnderscoreSpaces));
+                    Option(ConvertReferenceToPtr | FirstArgIsWrappedObject| IncludeDefaultExpression | OriginalName | ShowStatic | UnderscoreSpaces));
                   s << ";" << endl;
                 }
               }
+              if (!meta_class->hasDefaultToStringFunction() && meta_class->hasToStringCapability()) {
+                s << "    QString toString(" << meta_class->qualifiedCppName() << "*);" << endl;
+              }
               //    writeInjectedCode(s, meta_class);

generator/shellimplgenerator.cpp +22 -3

                     if (fun->type()) {
                       s << "return ";
                     }
-                    // call the C++ implementation
                     s << meta_class->qualifiedCppName() << "::";
                     s << fun->originalName() << "(";
                     for (int i = 0; i < args.size(); ++i) {
                 if (fun->isSlot()) continue;
                 writeFunctionSignature(s, fun, meta_class, QString(),
-                  Option(FirstArgIsWrappedObject | OriginalName | ShowStatic | UnderscoreSpaces),
+                  Option(ConvertReferenceToPtr | FirstArgIsWrappedObject | OriginalName | ShowStatic | UnderscoreSpaces),
                   "PythonQtWrapper_");
                 s << endl << "{" << endl;
                 s << "  ";
                   QString scriptFunctionName = fun->originalName();
                   AbstractMetaArgumentList args = fun->arguments();
                   // call the C++ implementation
-                  if (fun->type())
+                  if (fun->type()) {
                     s << "return ";
+                    // call the C++ implementation
+                    if (fun->type()->isReference()) {
+                      s << "&";
+                    }
+                  }
+                  s << "(";
                   if (scriptFunctionName.startsWith("operator>>")) {
                     s << wrappedObject << " >>" << args.at(0)->argumentName();
                   } else if (scriptFunctionName.startsWith("operator<<")) {
                     }
                     s << ")";
                   }
+                  s << ")";
                 }
                 s << ";" << endl;
                 s << "}" << endl << endl;
               }
+              if (!meta_class->hasDefaultToStringFunction() && 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 result;" << endl;
+                s << "  QDebug d(&result);" << endl;
+                s << "  d << " << deref  << "obj;" << endl;
+                s << "  return result;" << endl;
+                s << "}" << endl << endl;
+              }
             }
             void ShellImplGenerator::writeInjectedCode(QTextStream &s, const AbstractMetaClass *meta_class)

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