diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2016-12-15 19:36:54 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2019-11-25 12:01:39 +0100 |
| commit | b2b7503192cb6cb2f0c97a76a5320f710d2d6568 (patch) | |
| tree | a4c4669a0044175cb9aec4b0df67b283072f5f0a /src/pdf/qpdfdocument.cpp | |
| parent | b9f3310cf9f5d2a35c1c97c334931052cee6f932 (diff) | |
replace Q_NULLPTR and Q_DECL_OVERRIDE
Change-Id: Icf33776f70bdde71f320de0a129361ac28fd18c8
Reviewed-by: Tobias Koenig <tobias.koenig@kdab.com>
Diffstat (limited to 'src/pdf/qpdfdocument.cpp')
| -rw-r--r-- | src/pdf/qpdfdocument.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/pdf/qpdfdocument.cpp b/src/pdf/qpdfdocument.cpp index 709c702bf..b6af97c81 100644 --- a/src/pdf/qpdfdocument.cpp +++ b/src/pdf/qpdfdocument.cpp @@ -39,8 +39,8 @@ QPdfMutexLocker::QPdfMutexLocker() } QPdfDocumentPrivate::QPdfDocumentPrivate() - : avail(Q_NULLPTR) - , doc(Q_NULLPTR) + : avail(nullptr) + , doc(nullptr) , loadComplete(false) , status(QPdfDocument::Null) , lastError(QPdfDocument::NoError) @@ -83,11 +83,11 @@ void QPdfDocumentPrivate::clear() if (doc) FPDF_CloseDocument(doc); - doc = Q_NULLPTR; + doc = nullptr; if (avail) FPDFAvail_Destroy(avail); - avail = Q_NULLPTR; + avail = nullptr; lock.unlock(); loadComplete = false; @@ -229,7 +229,7 @@ void QPdfDocumentPrivate::tryLoadDocument() if (lastError == QPdfDocument::IncorrectPasswordError) { FPDF_CloseDocument(doc); - doc = Q_NULLPTR; + doc = nullptr; setStatus(QPdfDocument::Error); emit q->passwordRequired(); @@ -432,7 +432,7 @@ QVariant QPdfDocument::metaData(MetaDataField field) const } QPdfMutexLocker lock; - const unsigned long len = FPDF_GetMetaText(d->doc, fieldName.constData(), Q_NULLPTR, 0); + const unsigned long len = FPDF_GetMetaText(d->doc, fieldName.constData(), nullptr, 0); QVector<ushort> buf(len); FPDF_GetMetaText(d->doc, fieldName.constData(), buf.data(), buf.length()); |