From 74b185f6c6b805caa0cc0671b43f42a8f778256b Mon Sep 17 00:00:00 2001 From: Kalila L Date: Thu, 9 Sep 2021 18:57:43 -0400 Subject: [PATCH] Fix Qt warning: "QString::KeepEmptyParts" -> "Qt::KeepEmptyParts" --- assignment-client/src/avatars/AvatarMixer.cpp | 2 +- libraries/shared/src/shared/FileUtils.cpp | 2 +- libraries/shared/src/shared/FileUtils.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assignment-client/src/avatars/AvatarMixer.cpp b/assignment-client/src/avatars/AvatarMixer.cpp index 55decb90fb..2d249ac876 100644 --- a/assignment-client/src/avatars/AvatarMixer.cpp +++ b/assignment-client/src/avatars/AvatarMixer.cpp @@ -1062,7 +1062,7 @@ void AvatarMixer::parseDomainServerSettings(const QJsonObject& domainSettings) { static const QString AVATAR_WHITELIST_OPTION = "avatar_whitelist"; _slaveSharedData.skeletonURLWhitelist = avatarMixerGroupObject[AVATAR_WHITELIST_OPTION] - .toString().split(',', QString::KeepEmptyParts); + .toString().split(',', Qt::KeepEmptyParts); static const QString REPLACEMENT_AVATAR_OPTION = "replacement_avatar"; _slaveSharedData.skeletonReplacementURL = avatarMixerGroupObject[REPLACEMENT_AVATAR_OPTION] diff --git a/libraries/shared/src/shared/FileUtils.cpp b/libraries/shared/src/shared/FileUtils.cpp index 52c0ee01f9..14ac78bfbd 100644 --- a/libraries/shared/src/shared/FileUtils.cpp +++ b/libraries/shared/src/shared/FileUtils.cpp @@ -67,7 +67,7 @@ QString FileUtils::readFile(const QString& filename) { return result; } -QStringList FileUtils::readLines(const QString& filename, QString::SplitBehavior splitBehavior) { +QStringList FileUtils::readLines(const QString& filename, Qt::SplitBehavior splitBehavior) { return readFile(filename).split(QRegularExpression("[\\r\\n]"), Qt::SkipEmptyParts); } diff --git a/libraries/shared/src/shared/FileUtils.h b/libraries/shared/src/shared/FileUtils.h index d4ff819e75..5b3b9377ac 100644 --- a/libraries/shared/src/shared/FileUtils.h +++ b/libraries/shared/src/shared/FileUtils.h @@ -24,7 +24,7 @@ public: static bool isRelative(const QString& fileName); static QString standardPath(QString subfolder); static QString readFile(const QString& filename); - static QStringList readLines(const QString& filename, QString::SplitBehavior splitBehavior = QString::KeepEmptyParts); + static QStringList readLines(const QString& filename, Qt::SplitBehavior splitBehavior = Qt::KeepEmptyParts); static QString replaceDateTimeTokens(const QString& path); static QString computeDocumentPath(const QString& path); static bool canCreateFile(const QString& fullPath);