Various warning fixes and devirtualization

* Remove ArrayString
* devirtualize GetCount and SetCount, they're no longer needed
* set storage duration of fmt::placeholder to extern to be consistent
* make length unsigned and the return value of sprintf signed
* remove dead code "s.Close()" is never reached
* devirtualize WrteToLog()
* devirtualize Ini functions
This commit is contained in:
Peter Tissen 2014-04-08 19:29:17 +02:00
parent 1975b7e139
commit 4066950975
6 changed files with 21 additions and 113 deletions

View file

@ -622,8 +622,6 @@ bool CheckDebugSelf(const std::string& self, const std::string& elf)
s.Seek(0);
return false;
}
s.Close();
}
bool DecryptSelf(const std::string& elf, const std::string& self)

View file

@ -11,7 +11,7 @@ class LogWriter
//wxString m_prefix;
//wxString m_value;
virtual void WriteToLog(const std::string& prefix, const std::string& value, u8 lvl);
void WriteToLog(const std::string& prefix, const std::string& value, u8 lvl);
public:
LogWriter();

View file

@ -25,19 +25,19 @@ protected:
wxConfigBase* m_Config;
Ini();
virtual void Save(const wxString& key, int value);
virtual void Save(const wxString& key, bool value);
virtual void Save(const wxString& key, wxSize value);
virtual void Save(const wxString& key, wxPoint value);
virtual void Save(const wxString& key, const std::string& value);
virtual void Save(const wxString& key, WindowInfo value);
void Save(const wxString& key, int value);
void Save(const wxString& key, bool value);
void Save(const wxString& key, wxSize value);
void Save(const wxString& key, wxPoint value);
void Save(const wxString& key, const std::string& value);
void Save(const wxString& key, WindowInfo value);
virtual int Load(const wxString& key, const int def_value);
virtual bool Load(const wxString& key, const bool def_value);
virtual wxSize Load(const wxString& key, const wxSize def_value);
virtual wxPoint Load(const wxString& key, const wxPoint def_value);
virtual std::string Load(const wxString& key, const std::string& def_value);
virtual WindowInfo Load(const wxString& key, const WindowInfo& def_value);
int Load(const wxString& key, const int def_value);
bool Load(const wxString& key, const bool def_value);
wxSize Load(const wxString& key, const wxSize def_value);
wxPoint Load(const wxString& key, const wxPoint def_value);
std::string Load(const wxString& key, const std::string& def_value);
WindowInfo Load(const wxString& key, const WindowInfo& def_value);
};
template<typename T> struct IniEntry : public Ini
@ -95,7 +95,7 @@ public:
IniEntry<u8> CPUDecoderMode;
IniEntry<bool> CPUIgnoreRWErrors;
IniEntry<u8> GSRenderMode;
IniEntry<int> GSResolution;
IniEntry<u8> GSResolution;
IniEntry<u8> GSAspectRatio;
IniEntry<bool> GSVSyncEnable;
IniEntry<bool> GSLogPrograms;