Merge branch 'master' into jgrpp

# Conflicts:
#	cmake/SourceList.cmake
#	src/build_vehicle_gui.cpp
#	src/company_gui.cpp
#	src/console_cmds.cpp
#	src/depot_base.h
#	src/elrail.cpp
#	src/network/core/udp.cpp
#	src/network/network_admin.cpp
#	src/network/network_chat_gui.cpp
#	src/network/network_gui.cpp
#	src/network/network_server.cpp
#	src/newgrf.cpp
#	src/newgrf_engine.cpp
#	src/newgrf_railtype.cpp
#	src/newgrf_railtype.h
#	src/newgrf_storage.h
#	src/os/unix/crashlog_unix.cpp
#	src/rail.h
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/road_cmd.cpp
#	src/road_map.h
#	src/saveload/labelmaps_sl.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/sl/oldloader_sl.cpp
#	src/station_cmd.cpp
#	src/station_gui.cpp
#	src/table/settings/world_settings.ini
#	src/tests/test_script_admin.cpp
#	src/textfile_gui.cpp
#	src/toolbar_gui.cpp
#	src/train_cmd.cpp
#	src/tunnelbridge_cmd.cpp
#	src/vehicle_gui.cpp
#	src/widget.cpp
#	src/window.cpp
#	src/window_gui.h
#	src/window_type.h

src/querystring_gui.h

@@ -49,37 +49,6 @@ public:
 	Point GetCaretPosition(const Window *w, int wid) const;
 	Rect GetBoundingRect(const Window *w, int wid, const char *from, const char *to) const;
 	ptrdiff_t GetCharAtPosition(const Window *w, int wid, const Point &pt) const;
-
-	/**
-	 * Get the current text.
-	 * @return Current text.
-	 */
-	const char *GetText() const
-	{
-		return this->text.buf;
-	}
-
-	/**
-	 * Get the position of the caret in the text buffer.
-	 * @return Pointer to the caret in the text buffer.
-	 */
-	const char *GetCaret() const
-	{
-		return this->text.buf + this->text.caretpos;
-	}
-
-	/**
-	 * Get the currently marked text.
-	 * @param[out] length Length of the marked text.
-	 * @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 nullptr;
-
-		*length = this->text.markend - this->text.markpos;
-		return this->text.buf + this->text.markpos;
-	}
 };
 
 void ShowOnScreenKeyboard(Window *parent, int button);