summaryrefslogtreecommitdiffstats
path: root/src/tools
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-07-29 16:30:13 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-07-31 12:56:50 +0200
commit5747f3139219abd6c8670953620cee1f5584caba (patch)
tree07dda7644e3628ead8459efa304e36d705e36521 /src/tools
parent4ed483b0e24b410b6bb240b48b4ad71e67877dc2 (diff)
Another round of 0->nullptr cleanup
Change-Id: Ic8db7dc252f8fea46eb5a4f334726d6c7f4645a6 Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/moc/main.cpp2
-rw-r--r--src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp2
-rw-r--r--src/tools/qlalr/compress.cpp8
-rw-r--r--src/tools/qlalr/cppgenerator.cpp4
-rw-r--r--src/tools/qlalr/grammar.cpp4
-rw-r--r--src/tools/qlalr/recognizer.cpp2
-rw-r--r--src/tools/rcc/rcc.cpp14
-rw-r--r--src/tools/uic/cpp/cppwriteinitialization.cpp4
8 files changed, 20 insertions, 20 deletions
diff --git a/src/tools/moc/main.cpp b/src/tools/moc/main.cpp
index 61f3666b16..1cb383c92f 100644
--- a/src/tools/moc/main.cpp
+++ b/src/tools/moc/main.cpp
@@ -242,7 +242,7 @@ int runMoc(int argc, char **argv)
QString filename;
QString output;
QFile in;
- FILE *out = 0;
+ FILE *out = nullptr;
// Note that moc isn't translated.
// If you use this code as an example for a translated app, make sure to translate the strings.
diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp b/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
index e48ac6a75e..a99ac6a7c2 100644
--- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
+++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
@@ -196,7 +196,7 @@ static QString generateInterfaceXml(const ClassDef *mo)
// start with properties:
if (flags & (QDBusConnection::ExportScriptableProperties |
QDBusConnection::ExportNonScriptableProperties)) {
- static const char *accessvalues[] = {0, "read", "write", "readwrite"};
+ static const char *accessvalues[] = {nullptr, "read", "write", "readwrite"};
for (const PropertyDef &mp : mo->propertyList) {
if (!((!mp.scriptable.isEmpty() && (flags & QDBusConnection::ExportScriptableProperties)) ||
(!mp.scriptable.isEmpty() && (flags & QDBusConnection::ExportNonScriptableProperties))))
diff --git a/src/tools/qlalr/compress.cpp b/src/tools/qlalr/compress.cpp
index ae0fbaca9d..18f9fb4b58 100644
--- a/src/tools/qlalr/compress.cpp
+++ b/src/tools/qlalr/compress.cpp
@@ -74,10 +74,10 @@ public:
public:
inline UncompressedRow ():
_M_index (0),
- _M_begin (0),
- _M_end (0),
- _M_beginNonZeros (0),
- _M_endNonZeros (0) {}
+ _M_begin (nullptr),
+ _M_end (nullptr),
+ _M_beginNonZeros (nullptr),
+ _M_endNonZeros (nullptr) {}
inline UncompressedRow (int index, const_iterator begin, const_iterator end)
{ assign (index, begin, end); }
diff --git a/src/tools/qlalr/cppgenerator.cpp b/src/tools/qlalr/cppgenerator.cpp
index cff97b132a..7efe94a5c2 100644
--- a/src/tools/qlalr/cppgenerator.cpp
+++ b/src/tools/qlalr/cppgenerator.cpp
@@ -325,10 +325,10 @@ void CppGenerator::operator () ()
compressed_goto (pgoto, state_count, non_terminal_count);
delete[] table;
- table = 0;
+ table = nullptr;
delete[] pgoto;
- pgoto = 0;
+ pgoto = nullptr;
#undef ACTION
#undef GOTO
diff --git a/src/tools/qlalr/grammar.cpp b/src/tools/qlalr/grammar.cpp
index f633962815..2ab6504bf8 100644
--- a/src/tools/qlalr/grammar.cpp
+++ b/src/tools/qlalr/grammar.cpp
@@ -33,8 +33,8 @@ QT_BEGIN_NAMESPACE
const char *const grammar::spell [] = {
"end of file", "identifier", "string literal", "%decl", "%expect", "%expect-lr", "%impl", "%left", "%merged_output", "%nonassoc",
- "%parser", "%prec", "%right", "%start", "%token", "%token_prefix", ":", "|", ";", 0,
- 0, 0
+ "%parser", "%prec", "%right", "%start", "%token", "%token_prefix", ":", "|", ";", nullptr,
+ nullptr, nullptr
};
const short grammar::lhs [] = {
diff --git a/src/tools/qlalr/recognizer.cpp b/src/tools/qlalr/recognizer.cpp
index 3da54c0c6a..760a094460 100644
--- a/src/tools/qlalr/recognizer.cpp
+++ b/src/tools/qlalr/recognizer.cpp
@@ -37,7 +37,7 @@
Recognizer::Recognizer (Grammar *grammar, bool no_lines):
tos(0),
stack_size(0),
- state_stack(0),
+ state_stack(nullptr),
_M_line(1),
_M_action_line(0),
_M_grammar(grammar),
diff --git a/src/tools/rcc/rcc.cpp b/src/tools/rcc/rcc.cpp
index 8b1ebad14c..924f2904f0 100644
--- a/src/tools/rcc/rcc.cpp
+++ b/src/tools/rcc/rcc.cpp
@@ -150,7 +150,7 @@ RCCFileInfo::RCCFileInfo(const QString &name, const QFileInfo &fileInfo,
m_language = language;
m_country = country;
m_flags = flags;
- m_parent = 0;
+ m_parent = nullptr;
m_nameOffset = 0;
m_dataOffset = 0;
m_childOffset = 0;
@@ -461,7 +461,7 @@ RCCResourceLibrary::Strings::Strings() :
}
RCCResourceLibrary::RCCResourceLibrary(quint8 formatVersion)
- : m_root(0),
+ : m_root(nullptr),
m_format(C_Code),
m_verbose(false),
m_compressionAlgo(CONSTANT_COMPRESSALGO_DEFAULT),
@@ -472,8 +472,8 @@ RCCResourceLibrary::RCCResourceLibrary(quint8 formatVersion)
m_dataOffset(0),
m_overallFlags(0),
m_useNameSpace(CONSTANT_USENAMESPACE),
- m_errorDevice(0),
- m_outDevice(0),
+ m_errorDevice(nullptr),
+ m_outDevice(nullptr),
m_formatVersion(formatVersion),
m_noZstd(false)
{
@@ -707,7 +707,7 @@ bool RCCResourceLibrary::interpretResourceFile(QIODevice *inputDevice,
return false;
}
- if (m_root == 0) {
+ if (m_root == nullptr) {
const QString msg = QString::fromLatin1("RCC: Warning: No resources in '%1'.\n").arg(fname);
m_errorDevice->write(msg.toUtf8());
if (!listMode && m_format == Binary) {
@@ -770,9 +770,9 @@ void RCCResourceLibrary::reset()
{
if (m_root) {
delete m_root;
- m_root = 0;
+ m_root = nullptr;
}
- m_errorDevice = 0;
+ m_errorDevice = nullptr;
m_failedResources.clear();
}
diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp
index 6d68dc0d78..29c054bc22 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.cpp
+++ b/src/tools/uic/cpp/cppwriteinitialization.cpp
@@ -649,7 +649,7 @@ void WriteInitialization::acceptWidget(DomWidget *node)
}
if (node->elementLayout().isEmpty())
- m_layoutChain.push(0);
+ m_layoutChain.push(nullptr);
m_layoutWidget = false;
if (className == QLatin1String("QWidget") && !node->hasAttributeNative()) {
@@ -662,7 +662,7 @@ void WriteInitialization::acceptWidget(DomWidget *node)
}
}
m_widgetChain.push(node);
- m_layoutChain.push(0);
+ m_layoutChain.push(nullptr);
TreeWalker::acceptWidget(node);
m_layoutChain.pop();
m_widgetChain.pop();