Skip to content

Fix Qt 6.7.3 #236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 2, 2024
Merged

Fix Qt 6.7.3 #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e77126
Remove use of 'OriginalName' option from code generator...
usiems Oct 2, 2024
385ae5f
Filter away static operators in namespaces
usiems Oct 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions generator/abstractmetabuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1137,10 +1137,15 @@ void AbstractMetaBuilder::traverseFunctions(ScopeModelItem scope_item, AbstractM
if (meta_function->isDestructor() && !meta_function->isFinal())
meta_class->setForceShellClass(true);

if (!meta_function->isDestructor()
&& !meta_function->isInvalid()
&& (!meta_function->isConstructor() || !meta_function->isPrivate())) {

if (meta_function->name().startsWith("__") && meta_function->isStatic()) {
// static operators are not supported by PythonQt
// (this only seems to happen for static operators in namespaces)
delete meta_function;
}
else if (!meta_function->isDestructor()
&& !meta_function->isInvalid()
&& (!meta_function->isConstructor() || !meta_function->isPrivate()))
{
if (meta_class->typeEntry()->designatedInterface() && !meta_function->isPublic()
&& !meta_function->isPrivate()) {
QString warn = QString("non-public function '%1' in interface '%2'")
Expand Down
2 changes: 1 addition & 1 deletion generator/shellgenerator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ bool ShellGenerator::functionHasNonConstReferences(const AbstractMetaFunction* f
QTextStream t(&s);
t << function->implementingClass()->qualifiedCppName() << "::";
writeFunctionSignature(t, function, 0, "",
Option(ConvertReferenceToPtr | FirstArgIsWrappedObject | IncludeDefaultExpression | OriginalName | ShowStatic | UnderscoreSpaces | ProtectedEnumAsInts));
Option(ConvertReferenceToPtr | FirstArgIsWrappedObject | IncludeDefaultExpression | ShowStatic | UnderscoreSpaces | ProtectedEnumAsInts));
std::cout << s.toLatin1().constData() << std::endl;
return true;
}
Expand Down
16 changes: 8 additions & 8 deletions generator/shellheadergenerator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ void ShellHeaderGenerator::writeFieldAccessors(QTextStream& s, const AbstractMet
addIndirection = true;
}
writeFunctionSignature(s, getter, 0, QString(),
Option(ConvertReferenceToPtr | FirstArgIsWrappedObject | IncludeDefaultExpression | OriginalName | ShowStatic | UnderscoreSpaces));
Option(ConvertReferenceToPtr | FirstArgIsWrappedObject | IncludeDefaultExpression | ShowStatic | UnderscoreSpaces));
s << "{ return ";
if (addIndirection) {
s << "&";
Expand Down Expand Up @@ -145,7 +145,7 @@ void ShellHeaderGenerator::write(QTextStream& s, const AbstractMetaClass* meta_c
for (AbstractMetaFunction * fun : ctors) {
s << " ";
writeFunctionSignature(s, fun, 0, "PythonQtShell_",
Option(IncludeDefaultExpression | OriginalName | ShowStatic | UnderscoreSpaces));
Option(IncludeDefaultExpression | ShowStatic | UnderscoreSpaces));
s << ":" << meta_class->qualifiedCppName() << "(";
QString scriptFunctionName = fun->originalName();
AbstractMetaArgumentList args = fun->arguments();
Expand All @@ -164,7 +164,7 @@ void ShellHeaderGenerator::write(QTextStream& s, const AbstractMetaClass* meta_c

for (AbstractMetaFunction * fun : virtualsForShell) {
writeFunctionSignature(s, fun, 0, QString(),
Option(IncludeDefaultExpression | OriginalName | ShowStatic | UnderscoreSpaces));
Option(IncludeDefaultExpression | ShowStatic | UnderscoreSpaces));
s << " override;" << endl;
}
s << endl;
Expand Down Expand Up @@ -212,7 +212,7 @@ void ShellHeaderGenerator::write(QTextStream& s, const AbstractMetaClass* meta_c
}
s << "inline ";
writeFunctionSignature(s, fun, 0, "promoted_",
Option(IncludeDefaultExpression | OriginalName | UnderscoreSpaces | ProtectedEnumAsInts));
Option(IncludeDefaultExpression | UnderscoreSpaces | ProtectedEnumAsInts));
s << " { ";
QString scriptFunctionName = fun->originalName();
AbstractMetaArgumentList args = fun->arguments();
Expand All @@ -239,7 +239,7 @@ void ShellHeaderGenerator::write(QTextStream& s, const AbstractMetaClass* meta_c
if (fun->isVirtual()) {
s << "inline ";
writeFunctionSignature(s, fun, 0, "py_q_",
Option(IncludeDefaultExpression | OriginalName | UnderscoreSpaces | ProtectedEnumAsInts));
Option(IncludeDefaultExpression | UnderscoreSpaces | ProtectedEnumAsInts));
s << " { ";
QString scriptFunctionName = fun->originalName();
AbstractMetaArgumentList args = fun->arguments();
Expand Down Expand Up @@ -355,7 +355,7 @@ void ShellHeaderGenerator::write(QTextStream& s, const AbstractMetaClass* meta_c

s << meta_class->qualifiedCppName() << "* ";
writeFunctionSignature(s, fun, 0, "new_",
Option(IncludeDefaultExpression | OriginalName | ShowStatic | AddOwnershipTemplates));
Option(IncludeDefaultExpression | ShowStatic | AddOwnershipTemplates));
s << ";" << endl;
if (fun->arguments().size() == 1 && meta_class->qualifiedCppName() == fun->arguments().at(0)->type()->typeEntry()->qualifiedCppName()) {
copyConstructorSeen = true;
Expand Down Expand Up @@ -387,14 +387,14 @@ void ShellHeaderGenerator::write(QTextStream& s, const AbstractMetaClass* meta_c
//functionHasNonConstReferences(function);
s << " ";
writeFunctionSignature(s, function, 0, QString(),
Option(AddOwnershipTemplates | ConvertReferenceToPtr | FirstArgIsWrappedObject | IncludeDefaultExpression | OriginalName | ShowStatic | UnderscoreSpaces | ProtectedEnumAsInts));
Option(AddOwnershipTemplates | ConvertReferenceToPtr | FirstArgIsWrappedObject | IncludeDefaultExpression | ShowStatic | UnderscoreSpaces | ProtectedEnumAsInts));
s << ";" << endl;
}
if (function->isVirtual() && meta_class->typeEntry()->shouldCreatePromoter()) {
// qualified version that calls the promoter/the qualified version
s << " ";
writeFunctionSignature(s, function, 0, "py_q_",
Option(AddOwnershipTemplates | ConvertReferenceToPtr | FirstArgIsWrappedObject | IncludeDefaultExpression | OriginalName | ShowStatic | UnderscoreSpaces | ProtectedEnumAsInts));
Option(AddOwnershipTemplates | ConvertReferenceToPtr | FirstArgIsWrappedObject | IncludeDefaultExpression | ShowStatic | UnderscoreSpaces | ProtectedEnumAsInts));
s << "{ ";

QString scriptFunctionName = function->originalName();
Expand Down
8 changes: 4 additions & 4 deletions generator/shellimplgenerator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,11 @@ void ShellImplGenerator::write(QTextStream &s, const AbstractMetaClass *meta_cla
foreach (const AbstractMetaFunction *fun, virtualsForShell) {
bool hasReturnValue = !fun->type().isNull();
writeFunctionSignature(s, fun, meta_class, QString(),
Option(OriginalName | ShowStatic | UnderscoreSpaces | UseIndexedName),
Option(ShowStatic | UnderscoreSpaces | UseIndexedName),
"PythonQtShell_");
s << endl << "{" << endl;

Option typeOptions = Option(OriginalName | UnderscoreSpaces | SkipName);
Option typeOptions = Option(UnderscoreSpaces | SkipName);
AbstractMetaArgumentList args = fun->arguments();

// we can't handle return values which are references right now, do not send those to Python...
Expand Down Expand Up @@ -239,7 +239,7 @@ void ShellImplGenerator::write(QTextStream &s, const AbstractMetaClass *meta_cla

s << meta_class->qualifiedCppName() << "* ";
s << "PythonQtWrapper_" << meta_class->name() << "::";
writeFunctionSignature(s, ctor, 0, "new_", Option(AddOwnershipTemplates | OriginalName | ShowStatic));
writeFunctionSignature(s, ctor, 0, "new_", Option(AddOwnershipTemplates | ShowStatic));
s << endl;
s << "{ " << endl;
s << "return new " << (meta_class->generateShellClass()?shellClassName(meta_class):meta_class->qualifiedCppName()) << "(";
Expand Down Expand Up @@ -281,7 +281,7 @@ void ShellImplGenerator::write(QTextStream &s, const AbstractMetaClass *meta_cla
continue;
}
writeFunctionSignature(s, fun, meta_class, QString(),
Option(AddOwnershipTemplates | ConvertReferenceToPtr | FirstArgIsWrappedObject | OriginalName | ShowStatic | UnderscoreSpaces | ProtectedEnumAsInts),
Option(AddOwnershipTemplates | ConvertReferenceToPtr | FirstArgIsWrappedObject | ShowStatic | UnderscoreSpaces | ProtectedEnumAsInts),
"PythonQtWrapper_");
s << endl << "{" << endl;
s << " ";
Expand Down
4 changes: 1 addition & 3 deletions generator/typesystem_core.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1507,9 +1507,7 @@ public:
<object-type name="QSemaphore"/>
<object-type name="QSocketNotifier"/>
<object-type name="QSystemLocale"/>
<object-type name="QTemporaryFile">
<modify-function signature="fileName()const" rename="uniqueFilename"/>
</object-type>
<object-type name="QTemporaryFile"/>
<object-type name="QMimeData">
<extra-includes>
<include file-name="QStringList" location="global"/>
Expand Down
17 changes: 0 additions & 17 deletions generator/typesystem_gui.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -797,9 +797,6 @@
<value-type name="QTextFormat">
<modify-function signature="operator=(QTextFormat)" remove="all"/>
<modify-function signature="isValid()const" access="non-final"/>

<modify-function signature="setProperty(int,QVector&lt;QTextLength&gt;)" rename="setLengthVectorProperty" before-version="6"/>
<modify-function signature="setProperty(int,const QList&lt;QTextLength&gt;&amp;)" rename="setLengthVectorProperty" since-version="6"/>
</value-type>

<value-type name="QTextListFormat"/>
Expand Down Expand Up @@ -917,10 +914,6 @@

<modify-function signature="operator*(QMatrix)const" access="private"/>
<modify-function signature="operator*=(QMatrix)" access="private"/>
<modify-function signature="rotate(double)" access="private" rename="rotate_private"/>
<modify-function signature="scale(double,double)" access="private" rename="scale_private"/>
<modify-function signature="shear(double,double)" access="private" rename="shear_private"/>
<modify-function signature="translate(double,double)" access="private" rename="translate_private"/>
</value-type>

<value-type name="QConicalGradient" polymorphic-id-expression="%1-&gt;type() == QGradient::ConicalGradient">
Expand Down Expand Up @@ -1562,8 +1555,6 @@ PyObject* constScanLine(QImage* image, int line) {
<object-type name="QTextBlockUserData"/>
<object-type name="QTextItem"/>
<object-type name="QTextList">
<modify-function signature="format()const" rename="textListFormat"/>

<modify-function signature="isEmpty()const" remove="all"/> <!--### Obsolete in 4.3-->
</object-type>
<object-type name="QTextObject"/>
Expand Down Expand Up @@ -1775,8 +1766,6 @@ PyObject* constScanLine(QImage* image, int line) {
</modify-argument>
</modify-function>

<modify-function signature="setSpacing(int)" rename="setWidgetSpacing"/>
<modify-function signature="spacing()const" rename="widgetSpacing"/>
<modify-function signature="getContentsMargins(int*,int*,int*,int*)const" remove="all"/>

<modify-function signature="margin()const" remove="all"/> <!--### Obsolete in 4.3-->
Expand Down Expand Up @@ -1903,9 +1892,6 @@ PyObject* constScanLine(QImage* image, int line) {

<modify-function signature="isHeaderVisible()const" remove="all"/> <!--### Obsolete in 4.3-->
<modify-function signature="setHeaderVisible(bool)" remove="all"/> <!--### Obsolete in 4.3-->

<modify-function signature="sizeHint()const" rename="getSizeHint"/>
<modify-function signature="minimumSizeHint()const" rename="getMinimumSizeHint"/>
</object-type>

<object-type name="QTreeWidget">
Expand Down Expand Up @@ -2197,9 +2183,6 @@ PyObject* constScanLine(QImage* image, int line) {
<modify-function signature="setShown(bool)" remove="all"/> <!--### Obsolete in 4.3-->
<modify-function signature="topLevelWidget()const" remove="all"/> <!--### Obsolete in 4.3-->
<modify-function signature="windowActivationChange(bool)" remove="all"/> <!--### Obsolete in 4.3-->

<modify-function signature="sizeHint()const" rename="getSizeHint"/>
<modify-function signature="minimumSizeHint()const" rename="getMinimumSizeHint"/>
</object-type>

<object-type name="QMessageBox">
Expand Down
Loading