diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-03 16:40:05 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-05 10:26:08 +0200 |
| commit | 13f0365a960538693ee4b52f9e02864d08845fae (patch) | |
| tree | cea2924f8113152ff10bdc126ebe5a0c8d3c4f95 /src/designer/src/lib/shared/rcc.cpp | |
| parent | fac0dcbeef6a0c23e780b9751c17883ec9918d6f (diff) | |
Qt Designer: Introduce nullptr
Apply Fixits by Qt Creator with some amendments.
Change-Id: Idc948b1132fbb61c3ae6706b71659e2e8790fbc6
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/designer/src/lib/shared/rcc.cpp')
| -rw-r--r-- | src/designer/src/lib/shared/rcc.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/designer/src/lib/shared/rcc.cpp b/src/designer/src/lib/shared/rcc.cpp index d2cdb4f25..b98f17e07 100644 --- a/src/designer/src/lib/shared/rcc.cpp +++ b/src/designer/src/lib/shared/rcc.cpp @@ -129,7 +129,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; @@ -328,7 +328,7 @@ RCCResourceLibrary::Strings::Strings() : } RCCResourceLibrary::RCCResourceLibrary() - : m_root(0), + : m_root(nullptr), m_format(C_Code), m_verbose(false), m_compressLevel(CONSTANT_COMPRESSLEVEL_DEFAULT), @@ -553,7 +553,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) { @@ -610,9 +610,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(); } |