diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-11-26 09:30:15 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-11-26 18:19:07 +0000 |
| commit | fac5b084a90e96af96283c8d13aa053bce2b809f (patch) | |
| tree | 653d6db3fe04327f829b0f7699f059e7012a505d /src/tools/uic/customwidgetsinfo.cpp | |
| parent | 271ea6cd3ee8a3df281ce52e2160ad016ea2e86b (diff) | |
uic: Refactor CustomWidgetsInfo::extends() to use QAnyStringView
Task-number: PYSIDE-1720
Pick-to: 6.2
Change-Id: I2db4ee9586a87c70db08298e311d692e20a93af0
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Diffstat (limited to 'src/tools/uic/customwidgetsinfo.cpp')
| -rw-r--r-- | src/tools/uic/customwidgetsinfo.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/tools/uic/customwidgetsinfo.cpp b/src/tools/uic/customwidgetsinfo.cpp index c838feaf73..347c647acb 100644 --- a/src/tools/uic/customwidgetsinfo.cpp +++ b/src/tools/uic/customwidgetsinfo.cpp @@ -58,7 +58,7 @@ void CustomWidgetsInfo::acceptCustomWidget(DomCustomWidget *node) m_customWidgets.insert(node->elementClass(), node); } -bool CustomWidgetsInfo::extends(const QString &classNameIn, QLatin1String baseClassName) const +bool CustomWidgetsInfo::extends(const QString &classNameIn, QAnyStringView baseClassName) const { if (classNameIn == baseClassName) return true; @@ -119,19 +119,19 @@ QString CustomWidgetsInfo::customWidgetAddPageMethod(const QString &name) const // add page methods for simple containers taking only the widget parameter QString CustomWidgetsInfo::simpleContainerAddPageMethod(const QString &name) const { - using AddPageMethod = std::pair<const char *, const char *>; - - static AddPageMethod addPageMethods[] = { - {"QStackedWidget", "addWidget"}, - {"QToolBar", "addWidget"}, - {"QDockWidget", "setWidget"}, - {"QScrollArea", "setWidget"}, - {"QSplitter", "addWidget"}, - {"QMdiArea", "addSubWindow"} + using AddPageMethod = std::pair<QString, QString>; + + static const AddPageMethod addPageMethods[] = { + {u"QStackedWidget"_qs, u"addWidget"_qs}, + {u"QToolBar"_qs, u"addWidget"_qs}, + {u"QDockWidget"_qs, u"setWidget"_qs}, + {u"QScrollArea"_qs, u"setWidget"_qs}, + {u"QSplitter"_qs, u"addWidget"_qs}, + {u"QMdiArea"_qs, u"addSubWindow"_qs} }; for (const auto &m : addPageMethods) { - if (extends(name, QLatin1String(m.first))) - return QLatin1String(m.second); + if (extends(name, m.first)) + return m.second; } return QString(); } |