Update to 1.10.0-beta1

src/querystring_gui.h

@@ -37,7 +37,7 @@ struct QueryString {
 	 * @param size Maximum size in bytes.
 	 * @param chars Maximum size in chars.
 	 */
-	QueryString(uint16 size, uint16 chars = UINT16_MAX) : ok_button(ACTION_NOTHING), cancel_button(ACTION_DESELECT), text(size, chars), orig(NULL)
+	QueryString(uint16 size, uint16 chars = UINT16_MAX) : ok_button(ACTION_NOTHING), cancel_button(ACTION_DESELECT), text(size, chars), orig(nullptr)
 	{
 	}
 
@@ -79,11 +79,11 @@ public:
 	/**
 	 * Get the currently marked text.
 	 * @param[out] length Length of the marked text.
-	 * @return Begining of the marked area or NULL if no text is marked.
+	 * @return Beginning of the marked area or nullptr if no text is marked.
 	 */
 	const char *GetMarkedText(size_t *length) const
 	{
-		if (this->text.markend == 0) return NULL;
+		if (this->text.markend == 0) return nullptr;
 
 		*length = this->text.markend - this->text.markpos;
 		return this->text.buf + this->text.markpos;