mnemonics: misc cleanup

Pass relevant information to the base class instead of overwriting
default values later, use objects instead of pointers to objects
to avoid having to new objects unnecessarily.

1 files changed, 3 insertions, 8 deletions

diff --git a/src/mnemonics/japanese.h b/src/mnemonics/japanese.h
index b437ae2af..09d05d132 100644
--- a/src/mnemonics/japanese.h
+++ b/src/mnemonics/japanese.h
@@ -51,9 +51,7 @@ namespace Language
   class Japanese: public Base

   {

   public:

-    Japanese()

-    {

-      word_list = new std::vector<std::string>({

+    Japanese(): Base("Japanese", std::vector<std::string>({

         "あいこくしん",

         "あいさつ",

         "あいだ",

@@ -1680,11 +1678,8 @@ namespace Language
         "ひさん",

         "びじゅつかん",

         "ひしょ"

-      });

-      unique_prefix_length = 3;

-      word_map = new std::unordered_map<std::string, uint32_t>;

-      trimmed_word_map = new std::unordered_map<std::string, uint32_t>;

-      language_name = "Japanese";

+      }), 3)

+    {

       populate_maps();

     }

   };