diff options
author | Karsten Heimrich <karsten.heimrich@qt.io> | 2020-06-10 11:54:52 +0200 |
---|---|---|
committer | Karsten Heimrich <karsten.heimrich@qt.io> | 2020-06-10 14:03:59 +0200 |
commit | cbd857b53f0c525e398b33889325f256699977bc (patch) | |
tree | 168c12f9730a32291eb3362b7260dfb6d8f4083f /src | |
parent | 8d48dbbe02b152763afda62ba2ff1c90e0205897 (diff) |
Qt6: Port QtActiveQt from QStringRef to QStringView
Task-number: QTBUG-84319
Change-Id: I450272cf93e9b886c27176622c305af41ca7a035
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/activeqt/container/qaxselect.cpp | 2 | ||||
-rw-r--r-- | src/activeqt/control/qaxserverbase.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/activeqt/container/qaxselect.cpp b/src/activeqt/container/qaxselect.cpp index e2642aa..2831ce7 100644 --- a/src/activeqt/container/qaxselect.cpp +++ b/src/activeqt/container/qaxselect.cpp @@ -148,7 +148,7 @@ static QString replaceEnvironmentVariables(QString in) const int closingPercentPos = in.indexOf(QLatin1Char('%'), openInPercentPos + 1); if (closingPercentPos < 0) break; - const QStringRef varName = in.midRef(openInPercentPos + 1, closingPercentPos - openInPercentPos - 1); + const QStringView varName = QStringView{in}.mid(openInPercentPos + 1, closingPercentPos - openInPercentPos - 1); const QString contents = QString::fromLocal8Bit(qgetenv(varName.toLocal8Bit())); in.replace(openInPercentPos, closingPercentPos - openInPercentPos + 1, contents); } diff --git a/src/activeqt/control/qaxserverbase.cpp b/src/activeqt/control/qaxserverbase.cpp index 99a6bf0..a1f34c9 100644 --- a/src/activeqt/control/qaxserverbase.cpp +++ b/src/activeqt/control/qaxserverbase.cpp @@ -2405,7 +2405,7 @@ HRESULT WINAPI QAxServerBase::Invoke(DISPID dispidMember, REFIID riid, if (rmatch.hasMatch()) { name.chop(rmatch.capturedLength(0)); name += '('; - int overload = rmatch.capturedRef(1).toInt() + 1; + int overload = rmatch.capturedView(1).toInt() + 1; for (int s = 0; s < qt.object->metaObject()->methodCount(); ++s) { QMetaMethod slot = qt.object->metaObject()->method(s); |