From 407b2a4f2283d73590e113ca906ea0e5baa6b69a Mon Sep 17 00:00:00 2001
From: Dale Glass <dale@daleglass.net>
Date: Wed, 13 May 2020 21:05:22 +0200
Subject: [PATCH] Remove all uses of QString::null

It's deprecated and produces a warning on Qt 5.14
---
 launchers/qt/src/BuildsRequest.h       | 4 ++--
 launchers/qt/src/LauncherState.cpp     | 2 +-
 launchers/qt/src/LauncherState.h       | 2 +-
 launchers/qt/src/UserSettingsRequest.h | 2 +-
 libraries/shared/src/PathUtils.h       | 2 +-
 tools/oven/src/BakerCLI.h              | 2 +-
 tools/oven/src/OvenCLIApplication.cpp  | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/launchers/qt/src/BuildsRequest.h b/launchers/qt/src/BuildsRequest.h
index 865d375d2a..cb33182cdb 100644
--- a/launchers/qt/src/BuildsRequest.h
+++ b/launchers/qt/src/BuildsRequest.h
@@ -4,10 +4,10 @@
 #include <QNetworkAccessManager>
 
 struct Build {
-    QString tag{ QString::null };
+    QString tag;
     int latestVersion{ 0 };
     int buildNumber{ 0 };
-    QString installerZipURL{ QString::null };
+    QString installerZipURL;
 };
 
 struct Builds {
diff --git a/launchers/qt/src/LauncherState.cpp b/launchers/qt/src/LauncherState.cpp
index 300bd37ef8..03e91ae58f 100644
--- a/launchers/qt/src/LauncherState.cpp
+++ b/launchers/qt/src/LauncherState.cpp
@@ -244,7 +244,7 @@ void LauncherState::getCurrentClientVersion() {
     if (match.hasMatch()) {
         _currentClientVersion = match.captured("version");
     } else {
-        _currentClientVersion = QString::null;
+        _currentClientVersion.clear();
     }
     qDebug() << "Current client version is: " << _currentClientVersion;
 
diff --git a/launchers/qt/src/LauncherState.h b/launchers/qt/src/LauncherState.h
index 39c4141b81..c0eb44cb08 100644
--- a/launchers/qt/src/LauncherState.h
+++ b/launchers/qt/src/LauncherState.h
@@ -176,7 +176,7 @@ private:
     QString _displayName;
     QString _applicationErrorMessage;
     QString _currentClientVersion;
-    QString _buildTag { QString::null };
+    QString _buildTag;
     QString _contentCacheURL;
     QString _loginTokenResponse;
     QFile _clientZipFile;
diff --git a/launchers/qt/src/UserSettingsRequest.h b/launchers/qt/src/UserSettingsRequest.h
index 5827364377..a42a70df37 100644
--- a/launchers/qt/src/UserSettingsRequest.h
+++ b/launchers/qt/src/UserSettingsRequest.h
@@ -6,7 +6,7 @@
 #include "LoginRequest.h"
 
 struct UserSettings {
-    QString homeLocation{ QString::null };
+    QString homeLocation;
 };
 
 class UserSettingsRequest : public QObject {
diff --git a/libraries/shared/src/PathUtils.h b/libraries/shared/src/PathUtils.h
index 4ab6a79e22..142cd7bfbc 100644
--- a/libraries/shared/src/PathUtils.h
+++ b/libraries/shared/src/PathUtils.h
@@ -58,7 +58,7 @@ public:
     static QString generateTemporaryDir();
     static bool deleteMyTemporaryDir(QString dirName);
 
-    static int removeTemporaryApplicationDirs(QString appName = QString::null);
+    static int removeTemporaryApplicationDirs(QString appName = QString());
 
     static Qt::CaseSensitivity getFSCaseSensitivity();
     static QString stripFilename(const QUrl& url);
diff --git a/tools/oven/src/BakerCLI.h b/tools/oven/src/BakerCLI.h
index bf33b625dd..d9b29cf6bd 100644
--- a/tools/oven/src/BakerCLI.h
+++ b/tools/oven/src/BakerCLI.h
@@ -34,7 +34,7 @@ public:
     BakerCLI(OvenCLIApplication* parent);
 
 public slots:
-    void bakeFile(QUrl inputUrl, const QString& outputPath, const QString& type = QString::null);
+    void bakeFile(QUrl inputUrl, const QString& outputPath, const QString& type = QString());
 
 private slots:
     void handleFinishedBaker();  
diff --git a/tools/oven/src/OvenCLIApplication.cpp b/tools/oven/src/OvenCLIApplication.cpp
index 5b0de4d6fa..6d3a8912ab 100644
--- a/tools/oven/src/OvenCLIApplication.cpp
+++ b/tools/oven/src/OvenCLIApplication.cpp
@@ -85,7 +85,7 @@ void OvenCLIApplication::parseCommandLine(int argc, char* argv[]) {
     _inputUrlParameter = QDir::fromNativeSeparators(parser.value(CLI_INPUT_PARAMETER));
     _outputUrlParameter = QDir::fromNativeSeparators(parser.value(CLI_OUTPUT_PARAMETER));
 
-    _typeParameter = parser.isSet(CLI_TYPE_PARAMETER) ? parser.value(CLI_TYPE_PARAMETER) : QString::null;
+    _typeParameter = parser.isSet(CLI_TYPE_PARAMETER) ? parser.value(CLI_TYPE_PARAMETER) : QString();
 
     if (parser.isSet(CLI_DISABLE_TEXTURE_COMPRESSION_PARAMETER)) {
         qDebug() << "Disabling texture compression";