diff options
author | Denis Shienkov <denis.shienkov@gmail.com> | 2017-11-18 19:07:25 +0300 |
---|---|---|
committer | Jake Petroules <jake.petroules@qt.io> | 2017-11-20 21:03:07 +0000 |
commit | 7494bf59c28570dcc6ed6019f979e5625956c8af (patch) | |
tree | 3fb1e7fab1d064ebda1e78ffb21b06bd83e5107f /src/app/qbs | |
parent | 95c1e81382246f5235322eeb6876f77f65b22c19 (diff) |
Use nullptr to initialize the pointers
Change-Id: I59d743f585410cb5c00d36a7b6f9a3e9d696d19e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/app/qbs')
-rw-r--r-- | src/app/qbs/application.cpp | 2 | ||||
-rw-r--r-- | src/app/qbs/commandlinefrontend.cpp | 2 | ||||
-rw-r--r-- | src/app/qbs/commandlinefrontend.h | 2 | ||||
-rw-r--r-- | src/app/qbs/parser/commandlineparser.cpp | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/app/qbs/application.cpp b/src/app/qbs/application.cpp index 33fab4390..e22a0e9cc 100644 --- a/src/app/qbs/application.cpp +++ b/src/app/qbs/application.cpp @@ -45,7 +45,7 @@ namespace qbs { Application::Application(int &argc, char **argv) - : QCoreApplication(argc, argv), m_clFrontend(0), m_canceled(false) + : QCoreApplication(argc, argv), m_clFrontend(nullptr), m_canceled(false) { setApplicationName(QLatin1String("qbs")); setOrganizationName(QLatin1String("QtProject")); diff --git a/src/app/qbs/commandlinefrontend.cpp b/src/app/qbs/commandlinefrontend.cpp index d5a8bbd55..8ed409c87 100644 --- a/src/app/qbs/commandlinefrontend.cpp +++ b/src/app/qbs/commandlinefrontend.cpp @@ -68,7 +68,7 @@ CommandLineFrontend::CommandLineFrontend(const CommandLineParser &parser, Settin : QObject(parent) , m_parser(parser) , m_settings(settings) - , m_observer(0) + , m_observer(nullptr) , m_cancelStatus(CancelStatusNone) , m_cancelTimer(new QTimer(this)) { diff --git a/src/app/qbs/commandlinefrontend.h b/src/app/qbs/commandlinefrontend.h index 9fc1f2c5b..8860324a6 100644 --- a/src/app/qbs/commandlinefrontend.h +++ b/src/app/qbs/commandlinefrontend.h @@ -66,7 +66,7 @@ class CommandLineFrontend : public QObject Q_OBJECT public: explicit CommandLineFrontend(const CommandLineParser &parser, Settings *settings, - QObject *parent = 0); + QObject *parent = nullptr); ~CommandLineFrontend(); void cancel(); diff --git a/src/app/qbs/parser/commandlineparser.cpp b/src/app/qbs/parser/commandlineparser.cpp index 2df1d8cce..4569bc277 100644 --- a/src/app/qbs/parser/commandlineparser.cpp +++ b/src/app/qbs/parser/commandlineparser.cpp @@ -110,7 +110,7 @@ public: bool logTime; }; -CommandLineParser::CommandLineParser() : d(0) +CommandLineParser::CommandLineParser() : d(nullptr) { } @@ -312,7 +312,7 @@ bool CommandLineParser::parseCommandLine(const QStringList &args) CommandLineParser::CommandLineParserPrivate::CommandLineParserPrivate() - : command(0), commandPool(optionPool), showProgress(false), logTime(false) + : command(nullptr), commandPool(optionPool), showProgress(false), logTime(false) { } @@ -357,7 +357,7 @@ Command *CommandLineParser::CommandLineParserPrivate::commandFromString(const QS if (command->representation() == commandString) return command; } - return 0; + return nullptr; } QList<Command *> CommandLineParser::CommandLineParserPrivate::allCommands() const |