GIT_REPOSITORIES/LPP/PythonQt Commit - r175:7bc6abba6c12

generate extra wrappers for virtual slots to allow correct deriving via Python and to avoid recursion...

florianlink -

r175:7bc6abba6c12

parent child

Context file:

r175:7bc6abba6c12

generator/abstractmetalang.h +1 -1

                  FunctionType functionType() const { return m_function_type; }
                  void setFunctionType(FunctionType type) { m_function_type = type; }
-                 bool isVirtual() { return !(isFinal() || isSignal() || isStatic()); }
+                 bool isVirtual() const { return !(isFinal() || isSignal() || isStatic()); }
                  QStringList introspectionCompatibleSignatures(const QStringList &resolvedArguments = QStringList()) const;
                  QString signature() const;

generator/shellheadergenerator.cpp +1 -1

                AbstractMetaFunctionList functions = getFunctionsToWrap(meta_class);
                foreach (const AbstractMetaFunction *function, functions) {
-                 if (!function->isSlot()) {
+                 if (!function->isSlot() || function->isVirtual()) {
                    s << "   ";
                    writeFunctionSignature(s, function, 0, QString(),
                      Option(ConvertReferenceToPtr | FirstArgIsWrappedObject| IncludeDefaultExpression | OriginalName | ShowStatic | UnderscoreSpaces));

generator/shellimplgenerator.cpp +4 -2

                // write member functions
                for (int i = 0; i < functions.size(); ++i) {
                  AbstractMetaFunction *fun = functions.at(i);
-                 if (fun->isSlot()) continue;
+                 bool needsWrapping = (!fun->isSlot() || fun->isVirtual());
+                 if (!needsWrapping) {
+                   continue;
+                 }
                  writeFunctionSignature(s, fun, meta_class, QString(),
                    Option(ConvertReferenceToPtr | FirstArgIsWrappedObject | OriginalName | ShowStatic | UnderscoreSpaces),
                    "PythonQtWrapper_");

generator/typesystem_core.xml +1 -2

                <enum-type name="QSharedMemory::AccessMode"/>
                <enum-type name="QSharedMemory::SharedMemoryError"/>
                <enum-type name="QElapsedTimer::ClockType"/>
-               <enum-type name="QMetaType::Type"/>
                <enum-type name="QtMsgType">
                  <reject-enum-value name="QtSystemMsg"/>
                </enum-type>

General Comments 0

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

No TODOs yet

	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