5 files changed, 10 insertions, 10 deletions
diff --git a/include/modules/cap.h b/include/modules/cap.h
index 77145acd6..77434642a 100644
--- a/include/modules/cap.h
+++ b/include/modules/cap.h
@@ -143,7 +143,7 @@ namespace Cap
 		void Unregister()
 		{
 			bit = 0;
-			extitem = NULL;
+			extitem = nullptr;
 		}
 
 		Ext AddToMask(Ext mask) const { return (mask | GetMask()); }
@@ -243,7 +243,7 @@ namespace Cap
 		 * The cap must be active and the manager must be available for a cap to be registered.
 		 * @return True if the cap is registered in the manager, false otherwise
 		 */
-		bool IsRegistered() const { return (extitem != NULL); }
+		bool IsRegistered() const { return (extitem != nullptr); }
 
 		/** Get the CAP negotiation protocol version of a user.
 		 * The cap must be registered for this to return anything other than CAP_LEGACY.
@@ -281,7 +281,7 @@ namespace Cap
 		 */
 		virtual const std::string* GetValue(LocalUser* user) const
 		{
-			return NULL;
+			return nullptr;
 		}
 	};
 
@@ -304,7 +304,7 @@ namespace Cap
 		/** Retrieves the underlying cap. */
 		operator const Cap::Capability*() const
 		{
-			return ref ? *ref : NULL;
+			return ref ? *ref : nullptr;
 		}
 
 		/** Check whether a user has the referenced capability turned on.
diff --git a/include/modules/dns.h b/include/modules/dns.h
index 0c41a67ff..c8669fff0 100644
--- a/include/modules/dns.h
+++ b/include/modules/dns.h
@@ -161,7 +161,7 @@ namespace DNS
 					return &rr;
 			}
 
-			return NULL;
+			return nullptr;
 		}
 	};
 
diff --git a/include/modules/invite.h b/include/modules/invite.h
index 466da4153..e5ff55a86 100644
--- a/include/modules/invite.h
+++ b/include/modules/invite.h
@@ -83,7 +83,7 @@ public:
 	 * @param chan Channel to check
 	 * @return True if the user is invited to the channel, false otherwise
 	 */
-	bool IsInvited(LocalUser* user, Channel* chan) { return (Find(user, chan) != NULL); }
+	bool IsInvited(LocalUser* user, Channel* chan) { return (Find(user, chan) != nullptr); }
 
 	/** Removes an Invite if it exists
 	 * @param user User whose invite to remove
@@ -122,7 +122,7 @@ public:
 	/** Check whether the invite will expire or not
 	 * @return True if the invite is timed, false if it doesn't expire
 	 */
-	bool IsTimed() const { return (expiretimer != NULL); }
+	bool IsTimed() const { return (expiretimer != nullptr); }
 
 	/** Serialize this object
 	 * @param human Whether to serialize for human consumption or not.
diff --git a/include/modules/ircv3_batch.h b/include/modules/ircv3_batch.h
index 3640a4dea..804127bb9 100644
--- a/include/modules/ircv3_batch.h
+++ b/include/modules/ircv3_batch.h
@@ -147,7 +147,7 @@ public:
 	 * Batches can be started with Manager::Start() and stopped with Manager::End().
 	 * @return True if the batch is running, false otherwise.
 	 */
-	bool IsRunning() const { return (manager != NULL); }
+	bool IsRunning() const { return (manager != nullptr); }
 
 	/** Get the batch start client protocol message.
 	 * The returned message object can be manipulated to add extra parameters or labels to the message. The first
diff --git a/include/modules/ssl.h b/include/modules/ssl.h
index 3e7ba18cc..b77294a58 100644
--- a/include/modules/ssl.h
+++ b/include/modules/ssl.h
@@ -206,7 +206,7 @@ public:
 		if (lasthook && (lasthook->prov->type == IOHookProvider::IOH_SSL))
 			return static_cast<SSLIOHook*>(lasthook);
 
-		return NULL;
+		return nullptr;
 	}
 
 	SSLIOHook(std::shared_ptr<IOHookProvider> hookprov)
@@ -267,7 +267,7 @@ public:
 	{
 		SSLIOHook* ssliohook = SSLIOHook::IsSSL(sock);
 		if (!ssliohook)
-			return NULL;
+			return nullptr;
 
 		return ssliohook->GetCertificate();
 	}