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 typedef Json::Value JsonValue; -typedef Json::Reader JsonReader; -typedef Json::Writer JsonWriter; // Typedef some common templates typedef map StringConstMap; typedef map StringMap; -typedef vector 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; };