forked from len0rd/rockbox
Simplify code (use + operator to concatenate strings instead of Printf()). Please revert if use of Printf was intentional.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13612 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
71eedc7a5b
commit
1bc4ce9a0a
8 changed files with 224 additions and 255 deletions
|
@ -127,13 +127,15 @@ bool rbutilFrmApp::ReadGlobalConfig(rbutilFrm* myFrame)
|
|||
// then in the user config dir (linux ~/) and
|
||||
// then config dir (linux /etc/ )
|
||||
|
||||
buf.Printf(wxT("%s" PATH_SEP "rbutil.ini"), gv->AppDir.c_str() );
|
||||
buf = gv->AppDir + wxT("" PATH_SEP "rbutil.ini");
|
||||
if (! wxFileExists(buf) )
|
||||
{
|
||||
buf.Printf(wxT("%s" PATH_SEP ".rbutil" PATH_SEP "rbutil.ini"), gv->stdpaths->GetUserConfigDir().c_str() );
|
||||
buf = gv->stdpaths->GetUserConfigDir()
|
||||
+ wxT("" PATH_SEP ".rbutil" PATH_SEP "rbutil.ini");
|
||||
if (! wxFileExists(buf) )
|
||||
{
|
||||
buf.Printf(wxT("%s" PATH_SEP "rbutil.ini"), gv->stdpaths->GetConfigDir().c_str() );
|
||||
buf = gv->stdpaths->GetConfigDir()
|
||||
+ wxT("" PATH_SEP "rbutil.ini");
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -232,8 +234,7 @@ void rbutilFrmApp::ReadUserConfig()
|
|||
{
|
||||
wxString buf, str, stack;
|
||||
|
||||
buf.Printf(wxT("%s" PATH_SEP "RockboxUtility.cfg"),
|
||||
gv->AppDir.c_str());
|
||||
buf = gv->AppDir + wxT("" PATH_SEP "RockboxUtility.cfg");
|
||||
|
||||
if (wxFileExists(buf) )
|
||||
{
|
||||
|
@ -242,8 +243,8 @@ void rbutilFrmApp::ReadUserConfig()
|
|||
else
|
||||
{
|
||||
gv->portable = false;
|
||||
buf.Printf(wxT("%s" PATH_SEP "%s"),
|
||||
gv->stdpaths->GetUserDataDir().c_str(), wxT("RockboxUtility.cfg"));
|
||||
buf = gv->stdpaths->GetUserDataDir()
|
||||
+ wxT("" PATH_SEP "RockboxUtility.cfg");
|
||||
}
|
||||
|
||||
gv->UserConfig = new wxFileConfig(wxEmptyString, wxEmptyString, buf);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue