Merge pull request #89 from OutpostUniverse/RefactorStringTable

Prefer initialization in c'tor vs calling a load() function after obj…
OutpostUniverse · Jun 28, 2023 · f94af52 · f94af52
2 parents 8043243 + b4ae5a3
commit f94af52
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/OP2-Landlord/StringTable.cpp b/OP2-Landlord/StringTable.cpp
@@ -42,7 +42,7 @@ namespace
 }
 
 
-void StringTable::load(const std::string& filepath)
+StringTable::StringTable(const std::string& filepath)
 {
 	loadStringTable(filepath);
 }

diff --git a/OP2-Landlord/StringTable.h b/OP2-Landlord/StringTable.h
@@ -16,9 +16,8 @@ class StringTable
 	};
 
 public:
-	StringTable() = default;
-
-	void load(const std::string& filepath);
+	StringTable() = delete;
+	StringTable(const std::string& filepath);
 
 	const std::string& operator[](const StringName name) const;
 };
diff --git a/OP2-Landlord/main.cpp b/OP2-Landlord/main.cpp
@@ -67,15 +67,14 @@ int main(int argc, char* argv[])
 {
     try
     {
-        StringTable MessageStrings;        
-        MessageStrings.load("data/en.json");
+        StringTable strings{ "data/en.json" };
 
         Graphics graphics({ 800, 600 });
         graphics.drawColor(ClearColor);
 
         EditorConfig config(getUserPrefPath("OP2-Landlord", "OutpostUniverse"));
 
-        Gui gui(MessageStrings, config, graphics, config["UserSavePath"] + "gui.ini");
+        Gui gui(strings, config, graphics, config["UserSavePath"] + "gui.ini");
 
         checkConfig(config);