Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 16:41:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #346 from daleglass/remove_qstring_null

Browse source 
Remove all uses of QString::null
This commit is contained in:
daleglass 2020-05-19 22:36:55 +02:00 committed by GitHub
commit cd3eec4192
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
launchers/qt/src/BuildsRequest.h
View file

@ -4,10 +4,10 @@
#include <QNetworkAccessManager> #include <QNetworkAccessManager>
struct Build { struct Build {
QString tag{ QString::null }; QString tag;
int latestVersion{ 0 }; int latestVersion{ 0 };
int buildNumber{ 0 }; int buildNumber{ 0 };
QString installerZipURL{ QString::null }; QString installerZipURL;
}; };
struct Builds { struct Builds {

2
launchers/qt/src/LauncherState.cpp
View file

@ -244,7 +244,7 @@ void LauncherState::getCurrentClientVersion() {
if (match.hasMatch()) { if (match.hasMatch()) {
_currentClientVersion = match.captured("version"); _currentClientVersion = match.captured("version");
} else { } else {
_currentClientVersion = QString::null; _currentClientVersion.clear();
} }
qDebug() << "Current client version is: " << _currentClientVersion; qDebug() << "Current client version is: " << _currentClientVersion;

2
launchers/qt/src/LauncherState.h
View file

@ -176,7 +176,7 @@ private:
QString _displayName; QString _displayName;
QString _applicationErrorMessage; QString _applicationErrorMessage;
QString _currentClientVersion; QString _currentClientVersion;
QString _buildTag { QString::null }; QString _buildTag;
QString _contentCacheURL; QString _contentCacheURL;
QString _loginTokenResponse; QString _loginTokenResponse;
QFile _clientZipFile; QFile _clientZipFile;

2
launchers/qt/src/UserSettingsRequest.h
View file

@ -6,7 +6,7 @@
#include "LoginRequest.h" #include "LoginRequest.h"
struct UserSettings { struct UserSettings {
QString homeLocation{ QString::null }; QString homeLocation;
}; };
class UserSettingsRequest : public QObject { class UserSettingsRequest : public QObject {

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

@ -58,7 +58,7 @@ public:
static QString generateTemporaryDir(); static QString generateTemporaryDir();
static bool deleteMyTemporaryDir(QString dirName); static bool deleteMyTemporaryDir(QString dirName);
static int removeTemporaryApplicationDirs(QString appName = QString::null); static int removeTemporaryApplicationDirs(QString appName = QString());
static Qt::CaseSensitivity getFSCaseSensitivity(); static Qt::CaseSensitivity getFSCaseSensitivity();
static QString stripFilename(const QUrl& url); static QString stripFilename(const QUrl& url);

2
tools/oven/src/BakerCLI.h
View file

@ -34,7 +34,7 @@ public:
BakerCLI(OvenCLIApplication* parent); BakerCLI(OvenCLIApplication* parent);
public slots: 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: private slots:
void handleFinishedBaker(); void handleFinishedBaker();

2
tools/oven/src/OvenCLIApplication.cpp
View file

@ -85,7 +85,7 @@ void OvenCLIApplication::parseCommandLine(int argc, char* argv[]) {
_inputUrlParameter = QDir::fromNativeSeparators(parser.value(CLI_INPUT_PARAMETER)); _inputUrlParameter = QDir::fromNativeSeparators(parser.value(CLI_INPUT_PARAMETER));
_outputUrlParameter = QDir::fromNativeSeparators(parser.value(CLI_OUTPUT_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)) { if (parser.isSet(CLI_DISABLE_TEXTURE_COMPRESSION_PARAMETER)) {
qDebug() << "Disabling texture compression"; qDebug() << "Disabling texture compression";