poppler/Link.h | 2 +- poppler/Object.h | 4 ++-- poppler/OutputDev.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit 4c9e1b66725051cd4726baf19d891c2d9c710868 Author: Albert Astals Cid <[email protected]> Date: Mon Jan 8 23:09:13 2018 +0100 A few more nullptr diff --git a/poppler/Link.h b/poppler/Link.h index f97ec024..05892cff 100644 --- a/poppler/Link.h +++ b/poppler/Link.h @@ -434,7 +434,7 @@ public: enum State { On, Off, Toggle}; struct StateList { - StateList() { list = NULL; } + StateList() { list = nullptr; } ~StateList(); StateList(const StateList &) = delete; StateList& operator=(const StateList &) = delete; diff --git a/poppler/Object.h b/poppler/Object.h index a333e7c8..0fa7c017 100644 --- a/poppler/Object.h +++ b/poppler/Object.h @@ -145,7 +145,7 @@ enum ObjType { class Object { public: // clear the anonymous union as best we can -- clear at least a pointer - void zeroUnion() { this->cString = NULL; } + void zeroUnion() { this->cString = nullptr; } // Default constructor. Object(): @@ -240,7 +240,7 @@ public: // After takeString() the only method that should be called for the object is free() // because the object it's not expected to have a NULL string. GooString *takeString() { - OBJECT_TYPE_CHECK(objString); GooString *s = string; string = NULL; return s; } + OBJECT_TYPE_CHECK(objString); GooString *s = string; string = nullptr; return s; } char *getName() const { OBJECT_TYPE_CHECK(objName); return cString; } Array *getArray() const { OBJECT_TYPE_CHECK(objArray); return array; } Dict *getDict() const { OBJECT_TYPE_CHECK(objDict); return dict; } diff --git a/poppler/OutputDev.h b/poppler/OutputDev.h index 107c94d2..aca84cda 100644 --- a/poppler/OutputDev.h +++ b/poppler/OutputDev.h @@ -79,7 +79,7 @@ public: : iccColorSpaceCache(5) #endif { - profileHash = NULL; + profileHash = nullptr; } // Destructor. _______________________________________________ poppler mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/poppler
