Skip to content

Commit fe8bbe3

Browse files
usiemsusiems
committed
Remove use of 'OriginalName' option from code generator...
and instead remove these "rename" entries in the typesystem files, which were not used because of this option (but triggered the creation of unneeded wrapper methods in derived classes).
1 parent e2bdefa commit fe8bbe3

File tree

5 files changed

+14
-33
lines changed

5 files changed

+14
-33
lines changed

‎generator/shellgenerator.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ bool ShellGenerator::functionHasNonConstReferences(const AbstractMetaFunction* f
316316
QTextStream t(&s);
317317
t << function->implementingClass()->qualifiedCppName() << "::";
318318
writeFunctionSignature(t, function, 0, "",
319-
Option(ConvertReferenceToPtr | FirstArgIsWrappedObject | IncludeDefaultExpression | OriginalName | ShowStatic | UnderscoreSpaces | ProtectedEnumAsInts));
319+
Option(ConvertReferenceToPtr | FirstArgIsWrappedObject | IncludeDefaultExpression | ShowStatic | UnderscoreSpaces | ProtectedEnumAsInts));
320320
std::cout << s.toLatin1().constData() << std::endl;
321321
return true;
322322
}

‎generator/shellheadergenerator.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ void ShellHeaderGenerator::writeFieldAccessors(QTextStream& s, const AbstractMet
8080
addIndirection = true;
8181
}
8282
writeFunctionSignature(s, getter, 0, QString(),
83-
Option(ConvertReferenceToPtr | FirstArgIsWrappedObject | IncludeDefaultExpression | OriginalName | ShowStatic | UnderscoreSpaces));
83+
Option(ConvertReferenceToPtr | FirstArgIsWrappedObject | IncludeDefaultExpression | ShowStatic | UnderscoreSpaces));
8484
s << "{ return ";
8585
if (addIndirection) {
8686
s << "&";
@@ -145,7 +145,7 @@ void ShellHeaderGenerator::write(QTextStream& s, const AbstractMetaClass* meta_c
145145
for (AbstractMetaFunction * fun : ctors) {
146146
s << " ";
147147
writeFunctionSignature(s, fun, 0, "PythonQtShell_",
148-
Option(IncludeDefaultExpression | OriginalName | ShowStatic | UnderscoreSpaces));
148+
Option(IncludeDefaultExpression | ShowStatic | UnderscoreSpaces));
149149
s << ":" << meta_class->qualifiedCppName() << "(";
150150
QString scriptFunctionName = fun->originalName();
151151
AbstractMetaArgumentList args = fun->arguments();
@@ -164,7 +164,7 @@ void ShellHeaderGenerator::write(QTextStream& s, const AbstractMetaClass* meta_c
164164

165165
for (AbstractMetaFunction * fun : virtualsForShell) {
166166
writeFunctionSignature(s, fun, 0, QString(),
167-
Option(IncludeDefaultExpression | OriginalName | ShowStatic | UnderscoreSpaces));
167+
Option(IncludeDefaultExpression | ShowStatic | UnderscoreSpaces));
168168
s << " override;" << endl;
169169
}
170170
s << endl;
@@ -212,7 +212,7 @@ void ShellHeaderGenerator::write(QTextStream& s, const AbstractMetaClass* meta_c
212212
}
213213
s << "inline ";
214214
writeFunctionSignature(s, fun, 0, "promoted_",
215-
Option(IncludeDefaultExpression | OriginalName | UnderscoreSpaces | ProtectedEnumAsInts));
215+
Option(IncludeDefaultExpression | UnderscoreSpaces | ProtectedEnumAsInts));
216216
s << " { ";
217217
QString scriptFunctionName = fun->originalName();
218218
AbstractMetaArgumentList args = fun->arguments();
@@ -239,7 +239,7 @@ void ShellHeaderGenerator::write(QTextStream& s, const AbstractMetaClass* meta_c
239239
if (fun->isVirtual()) {
240240
s << "inline ";
241241
writeFunctionSignature(s, fun, 0, "py_q_",
242-
Option(IncludeDefaultExpression | OriginalName | UnderscoreSpaces | ProtectedEnumAsInts));
242+
Option(IncludeDefaultExpression | UnderscoreSpaces | ProtectedEnumAsInts));
243243
s << " { ";
244244
QString scriptFunctionName = fun->originalName();
245245
AbstractMetaArgumentList args = fun->arguments();
@@ -355,7 +355,7 @@ void ShellHeaderGenerator::write(QTextStream& s, const AbstractMetaClass* meta_c
355355

356356
s << meta_class->qualifiedCppName() << "* ";
357357
writeFunctionSignature(s, fun, 0, "new_",
358-
Option(IncludeDefaultExpression | OriginalName | ShowStatic | AddOwnershipTemplates));
358+
Option(IncludeDefaultExpression | ShowStatic | AddOwnershipTemplates));
359359
s << ";" << endl;
360360
if (fun->arguments().size() == 1 && meta_class->qualifiedCppName() == fun->arguments().at(0)->type()->typeEntry()->qualifiedCppName()) {
361361
copyConstructorSeen = true;
@@ -387,14 +387,14 @@ void ShellHeaderGenerator::write(QTextStream& s, const AbstractMetaClass* meta_c
387387
//functionHasNonConstReferences(function);
388388
s << " ";
389389
writeFunctionSignature(s, function, 0, QString(),
390-
Option(AddOwnershipTemplates | ConvertReferenceToPtr | FirstArgIsWrappedObject | IncludeDefaultExpression | OriginalName | ShowStatic | UnderscoreSpaces | ProtectedEnumAsInts));
390+
Option(AddOwnershipTemplates | ConvertReferenceToPtr | FirstArgIsWrappedObject | IncludeDefaultExpression | ShowStatic | UnderscoreSpaces | ProtectedEnumAsInts));
391391
s << ";" << endl;
392392
}
393393
if (function->isVirtual() && meta_class->typeEntry()->shouldCreatePromoter()) {
394394
// qualified version that calls the promoter/the qualified version
395395
s << " ";
396396
writeFunctionSignature(s, function, 0, "py_q_",
397-
Option(AddOwnershipTemplates | ConvertReferenceToPtr | FirstArgIsWrappedObject | IncludeDefaultExpression | OriginalName | ShowStatic | UnderscoreSpaces | ProtectedEnumAsInts));
397+
Option(AddOwnershipTemplates | ConvertReferenceToPtr | FirstArgIsWrappedObject | IncludeDefaultExpression | ShowStatic | UnderscoreSpaces | ProtectedEnumAsInts));
398398
s << "{ ";
399399

400400
QString scriptFunctionName = function->originalName();

‎generator/shellimplgenerator.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,11 @@ void ShellImplGenerator::write(QTextStream &s, const AbstractMetaClass *meta_cla
125125
foreach (const AbstractMetaFunction *fun, virtualsForShell) {
126126
bool hasReturnValue = !fun->type().isNull();
127127
writeFunctionSignature(s, fun, meta_class, QString(),
128-
Option(OriginalName | ShowStatic | UnderscoreSpaces | UseIndexedName),
128+
Option(ShowStatic | UnderscoreSpaces | UseIndexedName),
129129
"PythonQtShell_");
130130
s << endl << "{" << endl;
131131

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

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

240240
s << meta_class->qualifiedCppName() << "* ";
241241
s << "PythonQtWrapper_" << meta_class->name() << "::";
242-
writeFunctionSignature(s, ctor, 0, "new_", Option(AddOwnershipTemplates | OriginalName | ShowStatic));
242+
writeFunctionSignature(s, ctor, 0, "new_", Option(AddOwnershipTemplates | ShowStatic));
243243
s << endl;
244244
s << "{ " << endl;
245245
s << "return new " << (meta_class->generateShellClass()?shellClassName(meta_class):meta_class->qualifiedCppName()) << "(";
@@ -281,7 +281,7 @@ void ShellImplGenerator::write(QTextStream &s, const AbstractMetaClass *meta_cla
281281
continue;
282282
}
283283
writeFunctionSignature(s, fun, meta_class, QString(),
284-
Option(AddOwnershipTemplates | ConvertReferenceToPtr | FirstArgIsWrappedObject | OriginalName | ShowStatic | UnderscoreSpaces | ProtectedEnumAsInts),
284+
Option(AddOwnershipTemplates | ConvertReferenceToPtr | FirstArgIsWrappedObject | ShowStatic | UnderscoreSpaces | ProtectedEnumAsInts),
285285
"PythonQtWrapper_");
286286
s << endl << "{" << endl;
287287
s << " ";

‎generator/typesystem_core.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1507,9 +1507,7 @@ public:
15071507
<object-type name="QSemaphore"/>
15081508
<object-type name="QSocketNotifier"/>
15091509
<object-type name="QSystemLocale"/>
1510-
<object-type name="QTemporaryFile">
1511-
<modify-function signature="fileName()const" rename="uniqueFilename"/>
1512-
</object-type>
1510+
<object-type name="QTemporaryFile"/>
15131511
<object-type name="QMimeData">
15141512
<extra-includes>
15151513
<include file-name="QStringList" location="global"/>

‎generator/typesystem_gui.xml‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -797,9 +797,6 @@
797797
<value-type name="QTextFormat">
798798
<modify-function signature="operator=(QTextFormat)" remove="all"/>
799799
<modify-function signature="isValid()const" access="non-final"/>
800-
801-
<modify-function signature="setProperty(int,QVector&lt;QTextLength&gt;)" rename="setLengthVectorProperty" before-version="6"/>
802-
<modify-function signature="setProperty(int,const QList&lt;QTextLength&gt;&amp;)" rename="setLengthVectorProperty" since-version="6"/>
803800
</value-type>
804801

805802
<value-type name="QTextListFormat"/>
@@ -917,10 +914,6 @@
917914

918915
<modify-function signature="operator*(QMatrix)const" access="private"/>
919916
<modify-function signature="operator*=(QMatrix)" access="private"/>
920-
<modify-function signature="rotate(double)" access="private" rename="rotate_private"/>
921-
<modify-function signature="scale(double,double)" access="private" rename="scale_private"/>
922-
<modify-function signature="shear(double,double)" access="private" rename="shear_private"/>
923-
<modify-function signature="translate(double,double)" access="private" rename="translate_private"/>
924917
</value-type>
925918

926919
<value-type name="QConicalGradient" polymorphic-id-expression="%1-&gt;type() == QGradient::ConicalGradient">
@@ -1562,8 +1555,6 @@ PyObject* constScanLine(QImage* image, int line) {
15621555
<object-type name="QTextBlockUserData"/>
15631556
<object-type name="QTextItem"/>
15641557
<object-type name="QTextList">
1565-
<modify-function signature="format()const" rename="textListFormat"/>
1566-
15671558
<modify-function signature="isEmpty()const" remove="all"/> <!--### Obsolete in 4.3-->
15681559
</object-type>
15691560
<object-type name="QTextObject"/>
@@ -1775,8 +1766,6 @@ PyObject* constScanLine(QImage* image, int line) {
17751766
</modify-argument>
17761767
</modify-function>
17771768

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

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

19041893
<modify-function signature="isHeaderVisible()const" remove="all"/> <!--### Obsolete in 4.3-->
19051894
<modify-function signature="setHeaderVisible(bool)" remove="all"/> <!--### Obsolete in 4.3-->
1906-
1907-
<modify-function signature="sizeHint()const" rename="getSizeHint"/>
1908-
<modify-function signature="minimumSizeHint()const" rename="getMinimumSizeHint"/>
19091895
</object-type>
19101896

19111897
<object-type name="QTreeWidget">
@@ -2197,9 +2183,6 @@ PyObject* constScanLine(QImage* image, int line) {
21972183
<modify-function signature="setShown(bool)" remove="all"/> <!--### Obsolete in 4.3-->
21982184
<modify-function signature="topLevelWidget()const" remove="all"/> <!--### Obsolete in 4.3-->
21992185
<modify-function signature="windowActivationChange(bool)" remove="all"/> <!--### Obsolete in 4.3-->
2200-
2201-
<modify-function signature="sizeHint()const" rename="getSizeHint"/>
2202-
<modify-function signature="minimumSizeHint()const" rename="getMinimumSizeHint"/>
22032186
</object-type>
22042187

22052188
<object-type name="QMessageBox">

0 commit comments

Comments
 (0)