Add wxStandardPaths::ConfigFileConv enum for clarity and safety

Use an enum instead of type-unsafe "int" for the second parameter of the
recently added wxStandardPaths::MakeConfigFileName().

This also avoids unnatural dependency of wxStandardPaths on
wxCONFIG_USE_SUBDIR constant defined in a higher level wxFileConfig class.

No real changes, but just make things a bit more robust and hopefully more
clear.
This commit is contained in:
Vadim Zeitlin
2017-03-09 17:48:42 +01:00
parent 4bf6ae8d7c
commit 5cf9fcbb1a
9 changed files with 103 additions and 30 deletions

View File

@@ -67,6 +67,14 @@ public:
FileLayout_XDG // Recommended: use XDG specification.
};
// Naming convention for the config files under Unix.
enum ConfigFileConv
{
ConfigFileConv_Dot, // Classic Unix dot-file convention.
ConfigFileConv_Ext // Use .conf extension.
};
// return the global standard paths object
static wxStandardPaths& Get();
@@ -162,7 +170,9 @@ public:
virtual wxString GetUserDir(Dir userDir) const;
virtual wxString MakeConfigFileName(const wxString& basename, int style) const = 0;
virtual wxString
MakeConfigFileName(const wxString& basename,
ConfigFileConv conv = ConfigFileConv_Ext) const = 0;
// virtual dtor for the base class
virtual ~wxStandardPathsBase();