[librptext] html_entities.cpp: Remove get_table() and get_count().

Since parseHtmlEntity() is now in html_entity.cpp, we don't need these
functions at all.

Move the html_entity_tbl_t definition from .hpp to .cpp.

[librpbase] TextOut_text.cpp: Remove `using LibRpText::HtmlEntities::html_entity_tbl_t;`.
[win32] RP_ShellPropSheetExt.cpp: Likewise.

Author: GerbilSoft

src/librpbase/TextOut_text.cpp

@@ -21,7 +21,6 @@
 #include "librptext/utf8_funcs.hpp"
 #include "librptexture/img/rp_image.hpp"
 using namespace LibRpText;
-using LibRpText::HtmlEntities::html_entity_tbl_t;
 using LibRpTexture::rp_image;
 
 // C includes (C++ namespace)

src/librptext/html_entities.cpp

@@ -9,6 +9,7 @@
 #include "html_entities.hpp"
 
 // C includes (C++ namespace)
+#include <cstddef>	// for size_t
 #include <cstdlib>
 #include <cstring>
 
@@ -18,14 +19,26 @@ using std::array;
 
 namespace LibRpText { namespace HtmlEntities {
 
+/**
+ * HTML entity entry, sorted by entity name.
+ * Can be used with e.g. bsearch() or std::lower_bound().
+ * References:
+ * - https://www.w3schools.com/HTML/html_entities.asp
+ * - https://www.toptal.com/designers/htmlarrows/symbols/
+ */
+struct html_entity_tbl_t {
+	char entity[8];	// HTML entity, minus '&' and ';'
+	char16_t chr;	// UTF-16 code point
+};
+
 /**
  * HTML entities, sorted by entity name.
  * Can be used with e.g. bsearch() or std::lower_bound().
  * References:
  * - https://www.w3schools.com/HTML/html_entities.asp
  * - https://www.toptal.com/designers/htmlarrows/symbols/
  */
-static const array<html_entity_tbl_t, 76+1> html_entity_tbl = {{
+static const array<html_entity_tbl_t, 76> html_entity_tbl = {{
 	{"Cfr",		0x212D},	// ℭ
 	{"Copf",	0x2102},	// ℂ
 	{"DD",		0x2145},	// ⅅ
@@ -103,33 +116,8 @@ static const array<html_entity_tbl_t, 76+1> html_entity_tbl = {{
 	//{"VerticalSeparator",	0x2758},	// ❘ (TODO: Special check for this one?)
 	{"weierp",	0x2118},	// ℘
 	{"yen",		0x00A5},	// ¥
-
-	// end of table
-	{"", 0}
 }};
 
-/**
- * Get the HTML entities table.
- * Table is terminated with an empty-string entry.
- *
- * @return HTML entities table
- */
-const html_entity_tbl_t *get_table(void)
-{
-	return html_entity_tbl.data();
-}
-
-/**
- * Get the number of entries in the HTML entities table.
- * NOTE: This does *not* include the empty-string terminator entry.
- *
- * @return Number of entries in the HTML entities table
- */
-size_t get_count(void)
-{
-	return html_entity_tbl.size() - 1;
-}
-
 /** Wrapper functions for T_parseHtmlEntity **/
 
 static inline const char *strchr_wrapper(const char *s, int c)
@@ -226,8 +214,8 @@ static char16_t T_parseHtmlEntity(const CharType *&entity)
 	key.entity[len] = '\0';
 	key.chr = 0;
 
-	void *ptr = bsearch(&key, HtmlEntities::get_table(),
-		HtmlEntities::get_count(), sizeof(html_entity_tbl_t),
+	void *ptr = bsearch(&key, html_entity_tbl.data(),
+		html_entity_tbl.size(), sizeof(html_entity_tbl_t),
 		[](const void *a, const void *b) -> int
 		{
 			const html_entity_tbl_t *const pa = static_cast<const html_entity_tbl_t*>(a);

src/librptext/html_entities.hpp

@@ -14,41 +14,8 @@
 // NOTE: gcc-5 on Ubuntu 16.04 is missing <cuchar>...
 #include <uchar.h>	// for char16_t
 
-// C includes (C++ namespace)
-#include <cstddef>	// for size_t
-
 namespace LibRpText { namespace HtmlEntities {
 
-/**
- * HTML entity entry, sorted by entity name.
- * Can be used with e.g. bsearch() or std::lower_bound().
- * References:
- * - https://www.w3schools.com/HTML/html_entities.asp
- * - https://www.toptal.com/designers/htmlarrows/symbols/
- */
-struct html_entity_tbl_t {
-	char entity[8];	// HTML entity, minus '&' and ';'
-	char16_t chr;	// UTF-16 code point
-};
-
-/**
- * Get the HTML entities table.
- * Table is terminated with an empty-string entry.
- *
- * @return HTML entities table
- */
-RP_LIBROMDATA_PUBLIC
-const html_entity_tbl_t *get_table(void);
-
-/**
- * Get the number of entries in the HTML entities table.
- * NOTE: This does *not* include the empty-string terminator entry.
- *
- * @return Number of entries in the HTML entities table
- */
-RP_LIBROMDATA_PUBLIC
-size_t get_count(void);
-
 /**
  * Parse an HTML entity.
  * @param entity Pointer to HTML tag (will be modified) (MUST be pointing to a NULL-terminated string!)

src/win32/RP_ShellPropSheetExt.cpp

@@ -31,7 +31,6 @@
 using namespace LibRpBase;
 using namespace LibRpFile;
 using namespace LibRpText;
-using LibRpText::HtmlEntities::html_entity_tbl_t;
 using namespace LibRpTexture;
 using namespace LibRomData;