Skip to content

Commit e75d9ac

Browse files
usiemsjcfr
authored andcommitted
[Backport generator] Suppress some methods of QByteArray and others...
that have become visible again after the argument type has changed from int to qsizetype (these are the variants that take a const char pointer and a size argument - this is not supported in Python, instead we use the variants with QByteArrayView argument) (cherry picked from commit MeVisLab/pythonqt@af3d2ee)
1 parent ef51580 commit e75d9ac

File tree

1 file changed

+22
-2
lines changed

1 file changed

+22
-2
lines changed

generator/typesystem_core.xml

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -853,6 +853,7 @@
853853
<value-type name="QBasicTimer"/>
854854
<value-type name="QByteArrayMatcher">
855855
<modify-function signature="operator=(QByteArrayMatcher)" remove="all"/>
856+
<modify-function signature="indexIn(const char*,qsizetype,qsizetype)const" remove="all"/>
856857
</value-type>
857858

858859
<value-type name="QDate">
@@ -1127,8 +1128,9 @@ public:
11271128
return PyBytes_FromStringAndSize(b-&gt;data(), b-&gt;size());
11281129
}
11291130
</inject-code>
1130-
1131+
11311132
<modify-function signature="QByteArray(const char*,int)" remove="all"/>
1133+
<modify-function signature="QByteArray(const char*, qsizetype)" remove="all"/>
11321134
<modify-function signature="QByteArray(const char*)" remove="all"/>
11331135

11341136
<modify-function signature="append(const char *)" remove="all"/>
@@ -1151,32 +1153,46 @@ public:
11511153
<modify-function signature="fill(char,int)">
11521154
<modify-argument index="0" replace-value="this"/>
11531155
</modify-function>
1156+
<modify-function signature="fill(char,qsizetype)">
1157+
<modify-argument index="0" replace-value="this"/>
1158+
</modify-function>
11541159

11551160
<modify-function signature="indexOf(const char*,int)const" remove="all"/>
11561161

11571162
<modify-function signature="insert(int,QByteArray)">
11581163
<modify-argument index="0" replace-value="this"/>
11591164
</modify-function>
1165+
<modify-function signature="insert(qsizetype,QByteArray)">
1166+
<modify-argument index="0" replace-value="this"/>
1167+
</modify-function>
11601168
<modify-function signature="insert(int,QString)">
11611169
<modify-argument index="0" replace-value="this"/>
11621170
</modify-function>
11631171
<modify-function signature="insert(int,const char *)" remove="all"/>
1172+
<modify-function signature="insert(qsizetype,const char *)" remove="all"/>
1173+
<modify-function signature="insert(qsizetype,const char *,qsizetype)" remove="all"/>
11641174

11651175
<modify-function signature="lastIndexOf(const char*,int)const" remove="all"/>
11661176

11671177
<modify-function signature="prepend(QByteArray)">
11681178
<modify-argument index="0" replace-value="this"/>
11691179
</modify-function>
11701180
<modify-function signature="prepend(const char *)" remove="all"/>
1181+
<modify-function signature="prepend(const char *,qsizetype)" remove="all"/>
11711182

11721183
<modify-function signature="remove(int,int)">
11731184
<modify-argument index="0" replace-value="this"/>
11741185
</modify-function>
1186+
<modify-function signature="remove(qsizetype,qsizetype)">
1187+
<modify-argument index="0" replace-value="this"/>
1188+
</modify-function>
11751189

11761190
<modify-function signature="replace(int,int,QByteArray)">
11771191
<modify-argument index="0" replace-value="this"/>
11781192
</modify-function>
11791193
<modify-function signature="replace(int,int,const char *)" remove="all"/>
1194+
<modify-function signature="replace(qsizetype,qsizetype,const char *,qsizetype)" remove="all"/>
1195+
<modify-function signature="replace(const char *,qsizetype,const char*,qsizetype)" remove="all"/>
11801196
<modify-function signature="replace(QByteArray,QByteArray)">
11811197
<modify-argument index="0" replace-value="this"/>
11821198
</modify-function>
@@ -1201,6 +1217,7 @@ public:
12011217
<modify-function signature="startsWith(const char *)const" remove="all"/>
12021218

12031219
<modify-function signature="fromRawData(const char*,int)" remove="all"/>
1220+
<modify-function signature="fromRawData(const char*,qsizetype)" remove="all"/>
12041221
</value-type>
12051222
<rejection class="QByteArray" function-name="erase"/>
12061223

@@ -1323,6 +1340,7 @@ public:
13231340

13241341
<object-type name="QCryptographicHash">
13251342
<modify-function signature="addData(const char*,int)" remove="all"/>
1343+
<modify-function signature="addData(const char*,qsizetype)" remove="all"/>
13261344
</object-type>
13271345
<object-type name="QLibraryInfo"/>
13281346
<object-type name="QMutex"/>
@@ -1977,7 +1995,9 @@ public:
19771995
<object-type name="QFileSelector"/>
19781996
<object-type name="QMarginsF"/>
19791997
<object-type name="QLockFile"/>
1980-
<object-type name="QMessageAuthenticationCode"/>
1998+
<object-type name="QMessageAuthenticationCode">
1999+
<modify-function signature="addData(const char*,qsizetype)" remove="all"/>
2000+
</object-type>
19812001
<object-type name="QMessageLogContext"/>
19822002
<rejection class="QMessageLogContext" function-name="copy"/>
19832003

0 commit comments

Comments
 (0)