Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-21 18:29:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Qt warning: "QString::KeepEmptyParts" -> "Qt::KeepEmptyParts"

Browse source
This commit is contained in:
Kalila L 2021-09-09 18:57:43 -04:00
parent 10306807ef
commit 74b185f6c6
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assignment-client/src/avatars/AvatarMixer.cpp
View file

@ -1062,7 +1062,7 @@ void AvatarMixer::parseDomainServerSettings(const QJsonObject& domainSettings) {
static const QString AVATAR_WHITELIST_OPTION = "avatar_whitelist"; static const QString AVATAR_WHITELIST_OPTION = "avatar_whitelist";
_slaveSharedData.skeletonURLWhitelist = avatarMixerGroupObject[AVATAR_WHITELIST_OPTION] _slaveSharedData.skeletonURLWhitelist = avatarMixerGroupObject[AVATAR_WHITELIST_OPTION]
.toString().split(',', QString::KeepEmptyParts); .toString().split(',', Qt::KeepEmptyParts);
static const QString REPLACEMENT_AVATAR_OPTION = "replacement_avatar"; static const QString REPLACEMENT_AVATAR_OPTION = "replacement_avatar";
_slaveSharedData.skeletonReplacementURL = avatarMixerGroupObject[REPLACEMENT_AVATAR_OPTION] _slaveSharedData.skeletonReplacementURL = avatarMixerGroupObject[REPLACEMENT_AVATAR_OPTION]

2
libraries/shared/src/shared/FileUtils.cpp
View file

@ -67,7 +67,7 @@ QString FileUtils::readFile(const QString& filename) {
return result; 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); return readFile(filename).split(QRegularExpression("[\\r\\n]"), Qt::SkipEmptyParts);
} }

2
libraries/shared/src/shared/FileUtils.h
View file

@ -24,7 +24,7 @@ public:
static bool isRelative(const QString& fileName); static bool isRelative(const QString& fileName);
static QString standardPath(QString subfolder); static QString standardPath(QString subfolder);
static QString readFile(const QString& filename); 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 replaceDateTimeTokens(const QString& path);
static QString computeDocumentPath(const QString& path); static QString computeDocumentPath(const QString& path);
static bool canCreateFile(const QString& fullPath); static bool canCreateFile(const QString& fullPath);