diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-02-25 17:22:09 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-02-28 15:37:11 +0100 |
| commit | 305ddbeb5ba21e1a976106a2b9fd59252d750c61 (patch) | |
| tree | f5f9bde08bf8b12cbf69a6350d807955d8b3a1e2 /src/dbus | |
| parent | 26b1cf2bbaa5a847f8b03137f666b7f32b16d843 (diff) | |
Use Qt::SplitBehavior in preference to QString::SplitBehavior
The Qt version was added in 5.14 "for use as eventual replacement for
QString::SplitBehavior." Move another step closer to that goal.
Change-Id: I399b5ea56e9255e775ca1746632f7421519a6616
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/dbus')
| -rw-r--r-- | src/dbus/qdbusmisc.cpp | 2 | ||||
| -rw-r--r-- | src/dbus/qdbusxmlgenerator.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/dbus/qdbusmisc.cpp b/src/dbus/qdbusmisc.cpp index c321b7524d..46cf857751 100644 --- a/src/dbus/qdbusmisc.cpp +++ b/src/dbus/qdbusmisc.cpp @@ -95,7 +95,7 @@ QString qDBusInterfaceFromMetaObject(const QMetaObject *mo) } else { interface.prepend(QLatin1Char('.')).prepend(QCoreApplication::instance()->applicationName()); const QString organizationDomain = QCoreApplication::instance()->organizationDomain(); - const auto domainName = organizationDomain.splitRef(QLatin1Char('.'), QString::SkipEmptyParts); + const auto domainName = organizationDomain.splitRef(QLatin1Char('.'), Qt::SkipEmptyParts); if (domainName.isEmpty()) { interface.prepend(QLatin1String("local.")); } else { diff --git a/src/dbus/qdbusxmlgenerator.cpp b/src/dbus/qdbusxmlgenerator.cpp index 7370ce0de3..f11b71dadf 100644 --- a/src/dbus/qdbusxmlgenerator.cpp +++ b/src/dbus/qdbusxmlgenerator.cpp @@ -285,7 +285,7 @@ QString qDBusGenerateMetaObjectXml(QString interface, const QMetaObject *mo, con interface.prepend(QLatin1Char('.')).prepend(QCoreApplication::instance()->applicationName()); QStringList domainName = QCoreApplication::instance()->organizationDomain().split(QLatin1Char('.'), - QString::SkipEmptyParts); + Qt::SkipEmptyParts); if (domainName.isEmpty()) interface.prepend(QLatin1String("local.")); else |