diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2018-11-01 10:38:13 +0200 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2019-01-09 05:41:16 +0000 |
| commit | 9dacee18f9b7211699164bc70dd17f9934a15f50 (patch) | |
| tree | d16ee18d0f54a9c28f07aeebab77bb8b9168da55 /tools/binarycreator/rcc | |
| parent | 818c8ab9836c3e949e891e2266807dbd59c31906 (diff) | |
Replace 0 with nullptr
Prevents a lot of warnings seen in QtCreator
Change-Id: I63bf95aca68a04fc9fd0eecbe29c63e9b9c47efd
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Diffstat (limited to 'tools/binarycreator/rcc')
| -rw-r--r-- | tools/binarycreator/rcc/rcc.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/binarycreator/rcc/rcc.cpp b/tools/binarycreator/rcc/rcc.cpp index 2361e43e0..10b7cbc4f 100644 --- a/tools/binarycreator/rcc/rcc.cpp +++ b/tools/binarycreator/rcc/rcc.cpp @@ -126,7 +126,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; @@ -325,7 +325,7 @@ RCCResourceLibrary::Strings::Strings() : } RCCResourceLibrary::RCCResourceLibrary() - : m_root(0), + : m_root(nullptr), m_format(C_Code), m_verbose(false), m_compressLevel(CONSTANT_COMPRESSLEVEL_DEFAULT), @@ -334,7 +334,7 @@ RCCResourceLibrary::RCCResourceLibrary() m_namesOffset(0), m_dataOffset(0), m_useNameSpace(CONSTANT_USENAMESPACE), - m_errorDevice(0) + m_errorDevice(nullptr) { m_out.reserve(30 * 1000 * 1000); } @@ -550,7 +550,7 @@ bool RCCResourceLibrary::interpretResourceFile(QIODevice *inputDevice, return false; } - if (m_root == 0) { + if (m_root == nullptr) { const QString msg = QString::fromUtf8("RCC: Warning: No resources in '%1'.\n").arg(fname); m_errorDevice->write(msg.toUtf8()); if (!ignoreErrors && m_format == Binary) { @@ -606,9 +606,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(); } |