Misc code cleanup
This commit is contained in:
parent
7a7f6d68be
commit
5d67a4d1e8
@ -33,7 +33,7 @@ public:
|
|||||||
*
|
*
|
||||||
* @return bool
|
* @return bool
|
||||||
*/
|
*/
|
||||||
bool OnInit()
|
bool OnInit() override
|
||||||
{
|
{
|
||||||
if ( ! wxApp::OnInit()) return false;
|
if ( ! wxApp::OnInit()) return false;
|
||||||
|
|
||||||
@ -69,7 +69,7 @@ public:
|
|||||||
*
|
*
|
||||||
* @return int
|
* @return int
|
||||||
*/
|
*/
|
||||||
int OnExit()
|
int OnExit() override
|
||||||
{
|
{
|
||||||
// Deallocate config object
|
// Deallocate config object
|
||||||
delete wxConfigBase::Set((wxConfigBase *) nullptr);
|
delete wxConfigBase::Set((wxConfigBase *) nullptr);
|
||||||
@ -83,7 +83,7 @@ public:
|
|||||||
* @param wxCmdLineParser& parser
|
* @param wxCmdLineParser& parser
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
void OnInitCmdLine(wxCmdLineParser &parser)
|
void OnInitCmdLine(wxCmdLineParser &parser) override
|
||||||
{
|
{
|
||||||
parser.SetDesc(Glob_cmdLineDesc);
|
parser.SetDesc(Glob_cmdLineDesc);
|
||||||
|
|
||||||
@ -97,7 +97,7 @@ public:
|
|||||||
* @param wxCmdLineParser& parser
|
* @param wxCmdLineParser& parser
|
||||||
* @return bool
|
* @return bool
|
||||||
*/
|
*/
|
||||||
bool OnCmdLineParsed(wxCmdLineParser &parser)
|
bool OnCmdLineParsed(wxCmdLineParser &parser) override
|
||||||
{
|
{
|
||||||
// Get un-named parameters
|
// Get un-named parameters
|
||||||
int i;
|
int i;
|
||||||
|
@ -18,10 +18,7 @@ using namespace std;
|
|||||||
#include <json/json.h>
|
#include <json/json.h>
|
||||||
|
|
||||||
typedef Json::Value JsonValue;
|
typedef Json::Value JsonValue;
|
||||||
typedef Json::Reader JsonReader;
|
|
||||||
typedef Json::Writer JsonWriter;
|
|
||||||
|
|
||||||
// Typedef some common templates
|
// Typedef some common templates
|
||||||
typedef map<string, int> StringConstMap;
|
typedef map<string, int> StringConstMap;
|
||||||
typedef map<string, string> StringMap;
|
typedef map<string, string> StringMap;
|
||||||
typedef vector<string> StringVector;
|
|
@ -10,5 +10,5 @@ public:
|
|||||||
void LoadJson(const char json[]);
|
void LoadJson(const char json[]);
|
||||||
private:
|
private:
|
||||||
JsonValue default_root;
|
JsonValue default_root;
|
||||||
JsonReader reader;
|
Json::Reader reader;
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user