From 5d67a4d1e81ce7b3657fc0304cddbfdc8a3e0382 Mon Sep 17 00:00:00 2001
From: Timothy Warren <twarren@nabancard.com>
Date: Tue, 4 Jun 2019 14:57:38 -0400
Subject: [PATCH] Misc code cleanup

---
 src/TyroApp.cpp         | 8 ++++----
 src/common.h            | 3 ---
 src/settings/Config.cpp | 2 +-
 src/settings/Config.h   | 2 +-
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/TyroApp.cpp b/src/TyroApp.cpp
index 42062ae..7d9df86 100644
--- a/src/TyroApp.cpp
+++ b/src/TyroApp.cpp
@@ -33,7 +33,7 @@ public:
 	 * 
 	 * @return bool 
 	 */
-	bool OnInit()
+	bool OnInit() override
 	{
 		if ( ! wxApp::OnInit()) return false;
 
@@ -69,7 +69,7 @@ public:
 	 *
 	 * @return int 
 	 */
-	int OnExit()
+	int OnExit() override
 	{
 		// Deallocate config object
 		delete wxConfigBase::Set((wxConfigBase *) nullptr);
@@ -83,7 +83,7 @@ public:
 	 * @param wxCmdLineParser& parser
 	 * @return void
 	 */
-	void OnInitCmdLine(wxCmdLineParser &parser)
+	void OnInitCmdLine(wxCmdLineParser &parser) override
 	{
 		parser.SetDesc(Glob_cmdLineDesc);
 
@@ -97,7 +97,7 @@ public:
 	 * @param wxCmdLineParser& parser
 	 * @return bool
 	 */
-	bool OnCmdLineParsed(wxCmdLineParser &parser)
+	bool OnCmdLineParsed(wxCmdLineParser &parser) override
 	{
 		// Get un-named parameters
 		int i;
diff --git a/src/common.h b/src/common.h
index addd433..a00c3a6 100644
--- a/src/common.h
+++ b/src/common.h
@@ -18,10 +18,7 @@ using namespace std;
 #include <json/json.h>
 
 typedef Json::Value JsonValue;
-typedef Json::Reader JsonReader;
-typedef Json::Writer JsonWriter;
 
 // Typedef some common templates
 typedef map<string, int> StringConstMap;
 typedef map<string, string> StringMap;
-typedef vector<string> StringVector;
\ No newline at end of file
diff --git a/src/settings/Config.cpp b/src/settings/Config.cpp
index a9cde4f..e2441cf 100644
--- a/src/settings/Config.cpp
+++ b/src/settings/Config.cpp
@@ -20,4 +20,4 @@ void TyroConfig::LoadJson(const char json[])
 JsonValue TyroConfig::GetRoot()
 {
 	return default_root;
-}
\ No newline at end of file
+}
diff --git a/src/settings/Config.h b/src/settings/Config.h
index e0c0083..db17d1f 100644
--- a/src/settings/Config.h
+++ b/src/settings/Config.h
@@ -10,5 +10,5 @@ public:
 	void LoadJson(const char json[]);
 private:
     JsonValue default_root;
-    JsonReader reader;
+    Json::Reader reader;
 };