Document the preference of nullptr over NULL or (void*)0

practicalswift · practicalswift · commit bea8e9e66ea9 · 2017-08-18T09:51:00.000+02:00
diff --git a/doc/developer-notes.md b/doc/developer-notes.md
@@ -37,6 +37,7 @@ code.
 
 - **Miscellaneous**
   - `++i` is preferred over `i++`.
+  - `nullptr` is preferred over `NULL` or `(void*)0`.
   - `static_assert` is preferred over `assert` where possible. Generally; compile-time checking is preferred over run-time checking.
 
 Block style example:
@@ -276,7 +277,7 @@ Wallet
 
   - *Rationale*: In RPC code that conditionally uses the wallet (such as
     `validateaddress`) it is easy to forget that global pointer `pwalletMain`
-    can be NULL. See `test/functional/disablewallet.py` for functional tests
+    can be nullptr. See `test/functional/disablewallet.py` for functional tests
     exercising the API with `-disablewallet`
 
 - Include `db_cxx.h` (BerkeleyDB header) only when `ENABLE_WALLET` is set
diff --git a/src/qt/macdockiconhandler.mm b/src/qt/macdockiconhandler.mm
@@ -18,7 +18,7 @@
 extern void qt_mac_set_dock_menu(QMenu *);
 #endif
 
-static MacDockIconHandler *s_instance = NULL;
+static MacDockIconHandler *s_instance = nullptr;
 
 bool dockClickHandler(id self,SEL _cmd,...) {
     Q_UNUSED(self)
@@ -34,7 +34,7 @@ void setupDockClickHandler() {
     Class cls = objc_getClass("NSApplication");
     id appInst = objc_msgSend((id)cls, sel_registerName("sharedApplication"));
     
-    if (appInst != NULL) {
+    if (appInst != nullptr) {
         id delegate = objc_msgSend(appInst, sel_registerName("delegate"));
         Class delClass = (Class)objc_msgSend(delegate,  sel_registerName("class"));
         SEL shouldHandle = sel_registerName("applicationShouldHandleReopen:hasVisibleWindows:");
@@ -53,7 +53,7 @@ void setupDockClickHandler() {
     setupDockClickHandler();
     this->m_dummyWidget = new QWidget();
     this->m_dockMenu = new QMenu(this->m_dummyWidget);
-    this->setMainWindow(NULL);
+    this->setMainWindow(nullptr);
 #if QT_VERSION < 0x050000
     qt_mac_set_dock_menu(this->m_dockMenu);
 #elif QT_VERSION >= 0x050200
@@ -69,7 +69,7 @@ void setupDockClickHandler() {
 MacDockIconHandler::~MacDockIconHandler()
 {
     delete this->m_dummyWidget;
-    this->setMainWindow(NULL);
+    this->setMainWindow(nullptr);
 }
 
 QMenu *MacDockIconHandler::dockMenu()
diff --git a/src/qt/macnotificationhandler.mm b/src/qt/macnotificationhandler.mm
@@ -75,7 +75,7 @@ - (NSString *)__bundleIdentifier
 
 MacNotificationHandler *MacNotificationHandler::instance()
 {
-    static MacNotificationHandler *s_instance = NULL;
+    static MacNotificationHandler *s_instance = nullptr;
     if (!s_instance) {
         s_instance = new MacNotificationHandler();
         
diff --git a/src/random.cpp b/src/random.cpp
@@ -242,7 +242,7 @@ void GetOSRand(unsigned char *ent32)
     }
 #elif defined(HAVE_GETENTROPY_RAND) && defined(MAC_OSX)
     // We need a fallback for OSX < 10.12
-    if (&getentropy != NULL) {
+    if (&getentropy != nullptr) {
         if (getentropy(ent32, NUM_OS_RANDOM_BYTES) != 0) {
             RandFailure();
         }

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ - (NSString *)__bundleIdentifier`
`75`	`75`
`76`	`76`	`MacNotificationHandler *MacNotificationHandler::instance()`
`77`	`77`	`{`
`78`		`- static MacNotificationHandler *s_instance = NULL;`
	`78`	`+ static MacNotificationHandler *s_instance = nullptr;`
`79`	`79`	`if (!s_instance) {`
`80`	`80`	`s_instance = new MacNotificationHandler();`
`81`	`81`
Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ void GetOSRand(unsigned char *ent32)`
`242`	`242`	`}`
`243`	`243`	`#elif defined(HAVE_GETENTROPY_RAND) && defined(MAC_OSX)`
`244`	`244`	`// We need a fallback for OSX < 10.12`
`245`		`- if (&getentropy != NULL) {`
	`245`	`+ if (&getentropy != nullptr) {`
`246`	`246`	`if (getentropy(ent32, NUM_OS_RANDOM_BYTES) != 0) {`
`247`	`247`	`RandFailure();`
`248`	`248`	`}`