Use more 'nullptr' instead of '0'

remotes/origin/busyindicator
Oliver Sander 6 years ago
parent dc7f2dffc1
commit 30e5a492ed
  1. 8
      generators/poppler/generator_pdf.cpp

@ -657,7 +657,7 @@ Okular::Document::OpenResult PDFGenerator::init(QVector<Okular::Page*> & pagesVe
if ( pdfdoc->isLocked() ) { if ( pdfdoc->isLocked() ) {
delete pdfdoc; delete pdfdoc;
pdfdoc = 0; pdfdoc = nullptr;
return Okular::Document::OpenNeedsPassword; return Okular::Document::OpenNeedsPassword;
} }
} }
@ -666,7 +666,7 @@ Okular::Document::OpenResult PDFGenerator::init(QVector<Okular::Page*> & pagesVe
int pageCount = pdfdoc->numPages(); int pageCount = pdfdoc->numPages();
if (pageCount < 0) { if (pageCount < 0) {
delete pdfdoc; delete pdfdoc;
pdfdoc = 0; pdfdoc = nullptr;
return Okular::Document::OpenError; return Okular::Document::OpenError;
} }
pagesVector.resize(pageCount); pagesVector.resize(pageCount);
@ -722,7 +722,7 @@ bool PDFGenerator::doCloseDocument()
delete annotProxy; delete annotProxy;
annotProxy = 0; annotProxy = 0;
delete pdfdoc; delete pdfdoc;
pdfdoc = 0; pdfdoc = nullptr;
userMutex()->unlock(); userMutex()->unlock();
docSynopsisDirty = true; docSynopsisDirty = true;
docSyn.clear(); docSyn.clear();
@ -1967,7 +1967,7 @@ void PDFGenerator::addFormFields( Poppler::Page * popplerPage, Okular::Page * pa
QLinkedList<Okular::FormField*> okularFormFields; QLinkedList<Okular::FormField*> okularFormFields;
foreach( Poppler::FormField *f, popplerFormFields ) foreach( Poppler::FormField *f, popplerFormFields )
{ {
Okular::FormField * of = 0; Okular::FormField * of = nullptr;
switch ( f->type() ) switch ( f->type() )
{ {
case Poppler::FormField::FormButton: case Poppler::FormField::FormButton:

Loading…
Cancel
Save