ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

IniInterface: Support std::string entries

This commit is contained in:
Connor McLaughlin 2021-09-21 20:05:11 +10:00 committed by Kojin
parent f79f85480b
commit d13982ea0e
2 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
common/IniInterface.cpp
View File

@ -269,6 +269,20 @@ void IniLoader::_EnumEntry(const wxString& var, int& value, const wxChar* const*
value = i; value = i;
} }
void IniLoader::Entry(const wxString& var, std::string& value, const std::string& default_value)
{
if (m_Config)
{
wxString temp;
m_Config->Read(var, &temp, wxString(default_value));
value = temp.ToStdString();
}
else if (&value != &default_value)
{
value.assign(default_value);
}
}
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
// IniSaver (implementations) // IniSaver (implementations)
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
@ -424,3 +438,10 @@ void IniSaver::_EnumEntry(const wxString& var, int& value, const wxChar* const*
m_Config->Write(var, enumArray[value]); m_Config->Write(var, enumArray[value]);
} }
void IniSaver::Entry(const wxString& var, std::string& value, const std::string& default_value)
{
if (!m_Config)
return;
m_Config->Write(var, wxString(value));
}

30
common/IniInterface.h
View File

@ -18,6 +18,7 @@
#include "Path.h" #include "Path.h"
#include <wx/config.h> #include <wx/config.h>
#include <wx/gdicmn.h> #include <wx/gdicmn.h>
#include <string>
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------
// IniInterface (abstract base class) // IniInterface (abstract base class)
@ -52,18 +53,19 @@ public:
virtual bool IsLoading() const = 0; virtual bool IsLoading() const = 0;
bool IsSaving() const { return !IsLoading(); } bool IsSaving() const { return !IsLoading(); }
virtual void Entry(const wxString& var, wxString& value, const wxString defvalue = wxString()) = 0;
virtual void Entry(const wxString& var, wxDirName& value, const wxDirName defvalue = wxDirName(), bool isAllowRelative = false) = 0;
virtual void Entry(const wxString& var, wxFileName& value, const wxFileName defvalue = wxFileName(), bool isAllowRelative = false) = 0;
virtual void Entry(const wxString& var, int& value, const int defvalue = 0) = 0; virtual void Entry(const wxString& var, int& value, const int defvalue = 0) = 0;
virtual void Entry(const wxString& var, uint& value, const uint defvalue = 0) = 0; virtual void Entry(const wxString& var, uint& value, const uint defvalue = 0) = 0;
virtual void Entry(const wxString& var, bool& value, const bool defvalue = false) = 0; virtual void Entry(const wxString& var, bool& value, const bool defvalue = false) = 0;
virtual void Entry(const wxString& var, double& value, const double defvalue = 0.0) = 0;
virtual void Entry(const wxString& var, std::string& value, const std::string& default_value = std::string()) = 0;
// This special form of Entry is provided for bitfields, which cannot be passed by reference. // This special form of Entry is provided for bitfields, which cannot be passed by reference.
virtual bool EntryBitBool(const wxString& var, bool value, const bool defvalue = false) = 0; virtual bool EntryBitBool(const wxString& var, bool value, const bool defvalue = false) = 0;
virtual int EntryBitfield(const wxString& var, int value, const int defvalue = 0) = 0; virtual int EntryBitfield(const wxString& var, int value, const int defvalue = 0) = 0;
virtual void Entry(const wxString& var, double& value, const double defvalue = 0.0) = 0; virtual void Entry(const wxString& var, wxString& value, const wxString defvalue = wxString()) = 0;
virtual void Entry(const wxString& var, wxDirName& value, const wxDirName defvalue = wxDirName(), bool isAllowRelative = false) = 0;
virtual void Entry(const wxString& var, wxFileName& value, const wxFileName defvalue = wxFileName(), bool isAllowRelative = false) = 0;
virtual void Entry(const wxString& var, wxPoint& value, const wxPoint defvalue = wxDefaultPosition) = 0; virtual void Entry(const wxString& var, wxPoint& value, const wxPoint defvalue = wxDefaultPosition) = 0;
virtual void Entry(const wxString& var, wxSize& value, const wxSize defvalue = wxDefaultSize) = 0; virtual void Entry(const wxString& var, wxSize& value, const wxSize defvalue = wxDefaultSize) = 0;
@ -116,22 +118,24 @@ public:
bool IsLoading() const override { return true; } bool IsLoading() const override { return true; }
void Entry(const wxString& var, wxString& value, const wxString defvalue = wxEmptyString) override;
void Entry(const wxString& var, wxDirName& value, const wxDirName defvalue = wxDirName(), bool isAllowRelative = false) override;
void Entry(const wxString& var, wxFileName& value, const wxFileName defvalue = wxFileName(), bool isAllowRelative = false) override;
void Entry(const wxString& var, int& value, const int defvalue = 0) override; void Entry(const wxString& var, int& value, const int defvalue = 0) override;
void Entry(const wxString& var, uint& value, const uint defvalue = 0) override; void Entry(const wxString& var, uint& value, const uint defvalue = 0) override;
void Entry(const wxString& var, bool& value, const bool defvalue = false) override; void Entry(const wxString& var, bool& value, const bool defvalue = false) override;
void Entry(const wxString& var, double& value, const double defvalue = 0.0) override;
void Entry(const wxString& var, std::string& value, const std::string& default_value = std::string()) override;
bool EntryBitBool(const wxString& var, bool value, const bool defvalue = false) override; bool EntryBitBool(const wxString& var, bool value, const bool defvalue = false) override;
int EntryBitfield(const wxString& var, int value, const int defvalue = 0) override; int EntryBitfield(const wxString& var, int value, const int defvalue = 0) override;
void Entry(const wxString& var, double& value, const double defvalue = 0.0) override; void Entry(const wxString& var, wxString& value, const wxString defvalue = wxEmptyString) override;
void Entry(const wxString& var, wxDirName& value, const wxDirName defvalue = wxDirName(), bool isAllowRelative = false) override;
void Entry(const wxString& var, wxFileName& value, const wxFileName defvalue = wxFileName(), bool isAllowRelative = false) override;
void Entry(const wxString& var, wxPoint& value, const wxPoint defvalue = wxDefaultPosition) override; void Entry(const wxString& var, wxPoint& value, const wxPoint defvalue = wxDefaultPosition) override;
void Entry(const wxString& var, wxSize& value, const wxSize defvalue = wxDefaultSize) override; void Entry(const wxString& var, wxSize& value, const wxSize defvalue = wxDefaultSize) override;
void Entry(const wxString& var, wxRect& value, const wxRect defvalue = wxDefaultRect) override; void Entry(const wxString& var, wxRect& value, const wxRect defvalue = wxDefaultRect) override;
protected: protected:
void _EnumEntry(const wxString& var, int& value, const wxChar* const* enumArray, int defvalue) override; void _EnumEntry(const wxString& var, int& value, const wxChar* const* enumArray, int defvalue) override;
}; };
@ -154,22 +158,24 @@ public:
bool IsLoading() const override { return false; } bool IsLoading() const override { return false; }
void Entry(const wxString& var, wxString& value, const wxString defvalue = wxString()) override;
void Entry(const wxString& var, wxDirName& value, const wxDirName defvalue = wxDirName(), bool isAllowRelative = false) override;
void Entry(const wxString& var, wxFileName& value, const wxFileName defvalue = wxFileName(), bool isAllowRelative = false) override;
void Entry(const wxString& var, int& value, const int defvalue = 0) override; void Entry(const wxString& var, int& value, const int defvalue = 0) override;
void Entry(const wxString& var, uint& value, const uint defvalue = 0) override; void Entry(const wxString& var, uint& value, const uint defvalue = 0) override;
void Entry(const wxString& var, bool& value, const bool defvalue = false) override; void Entry(const wxString& var, bool& value, const bool defvalue = false) override;
void Entry(const wxString& var, double& value, const double defvalue = 0.0) override;
void Entry(const wxString& var, std::string& value, const std::string& default_value = std::string()) override;
bool EntryBitBool(const wxString& var, bool value, const bool defvalue = false) override; bool EntryBitBool(const wxString& var, bool value, const bool defvalue = false) override;
int EntryBitfield(const wxString& var, int value, const int defvalue = 0) override; int EntryBitfield(const wxString& var, int value, const int defvalue = 0) override;
void Entry(const wxString& var, double& value, const double defvalue = 0.0) override; void Entry(const wxString& var, wxString& value, const wxString defvalue = wxString()) override;
void Entry(const wxString& var, wxDirName& value, const wxDirName defvalue = wxDirName(), bool isAllowRelative = false) override;
void Entry(const wxString& var, wxFileName& value, const wxFileName defvalue = wxFileName(), bool isAllowRelative = false) override;
void Entry(const wxString& var, wxPoint& value, const wxPoint defvalue = wxDefaultPosition) override; void Entry(const wxString& var, wxPoint& value, const wxPoint defvalue = wxDefaultPosition) override;
void Entry(const wxString& var, wxSize& value, const wxSize defvalue = wxDefaultSize) override; void Entry(const wxString& var, wxSize& value, const wxSize defvalue = wxDefaultSize) override;
void Entry(const wxString& var, wxRect& value, const wxRect defvalue = wxDefaultRect) override; void Entry(const wxString& var, wxRect& value, const wxRect defvalue = wxDefaultRect) override;
protected: protected:
void _EnumEntry(const wxString& var, int& value, const wxChar* const* enumArray, int defvalue) override; void _EnumEntry(const wxString& var, int& value, const wxChar* const* enumArray, int defvalue) override;
}; };