aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside6
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2022-04-22 08:52:16 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-04-25 15:10:13 +0000
commitd0cd27bb86cad60cb2a489a0f0fe865a38ac4635 (patch)
tree15e00579d036a09dc9762d221da1ea38031e16b4 /sources/pyside6
parent1bf1d817a86cffc60bcb84024f382b2317c6c738 (diff)
Migrate from QLatin1Char to UTF-16 char literals
Preparing for the deprecation of QLatin1Char in 6.4. Task-number: QTBUG-98434 Change-Id: I8bc92aa9f4e6dbfcb12d2025c5a1e760ab4f0d7f Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit 42666b5bab09a80a65ae8f61961985f4923b7d65) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'sources/pyside6')
-rw-r--r--sources/pyside6/libpyside/feature_select.cpp2
-rw-r--r--sources/pyside6/libpyside/pysidesignal.cpp14
2 files changed, 8 insertions, 8 deletions
diff --git a/sources/pyside6/libpyside/feature_select.cpp b/sources/pyside6/libpyside/feature_select.cpp
index faa63df7c..1a0f00018 100644
--- a/sources/pyside6/libpyside/feature_select.cpp
+++ b/sources/pyside6/libpyside/feature_select.cpp
@@ -597,7 +597,7 @@ static QStringList parseFields(const char *propstr, bool *stdwrite)
if (stdwrite)
*stdwrite = true;
QString s = QString(QLatin1String(propstr));
- auto list = s.split(QLatin1Char(':'));
+ auto list = s.split(u':');
assert(list.size() == 2 || list.size() == 3);
auto name = list[0];
auto read = list[1];
diff --git a/sources/pyside6/libpyside/pysidesignal.cpp b/sources/pyside6/libpyside/pysidesignal.cpp
index f88a8990d..63ba78929 100644
--- a/sources/pyside6/libpyside/pysidesignal.cpp
+++ b/sources/pyside6/libpyside/pysidesignal.cpp
@@ -1069,15 +1069,15 @@ QStringList getArgsFromSignature(const char *signature, bool *isShortCircuit)
QStringList result;
if (isShortCircuit)
- *isShortCircuit = !qsignature.contains(QLatin1Char('('));
+ *isShortCircuit = !qsignature.contains(u'(');
if (qsignature.contains(QLatin1String("()")) || qsignature.contains(QLatin1String("(void)")))
return result;
- if (qsignature.endsWith(QLatin1Char(')'))) {
- const int paren = qsignature.indexOf(QLatin1Char('('));
+ if (qsignature.endsWith(u')')) {
+ const int paren = qsignature.indexOf(u'(');
if (paren >= 0) {
qsignature.chop(1);
qsignature.remove(0, paren + 1);
- result = qsignature.split(QLatin1Char(','));
+ result = qsignature.split(u',');
for (QString &type : result)
type = type.trimmed();
}
@@ -1160,13 +1160,13 @@ QString getCallbackSignature(const char *signal, QObject *receiver, PyObject *ca
QStringList args = getArgsFromSignature(signal, &isShortCircuit);
if (!isShortCircuit) {
- signature.append(QLatin1Char('('));
+ signature.append(u'(');
if (numArgs == -1)
numArgs = std::numeric_limits<qsizetype>::max();
while (!args.isEmpty() && (args.size() > (numArgs - useSelf)))
args.removeLast();
- signature.append(args.join(QLatin1Char(',')));
- signature.append(QLatin1Char(')'));
+ signature.append(args.join(u','));
+ signature.append(u')');
}
return signature;
}