Misc code cleanup

This commit is contained in:
Timothy Warren 2019-06-04 14:57:38 -04:00
parent 7a7f6d68be
commit 5d67a4d1e8
4 changed files with 6 additions and 9 deletions

View File

@ -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;

View File

@ -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;

View File

@ -10,5 +10,5 @@ public:
void LoadJson(const char json[]);
private:
JsonValue default_root;
JsonReader reader;
Json::Reader reader;
};