diff options
author | Antoine Cellerier <dionoea@videolan.org> | 2007-06-10 22:08:48 +0000 |
---|---|---|
committer | Antoine Cellerier <dionoea@videolan.org> | 2007-06-10 22:08:48 +0000 |
commit | 1bc4ce9a0a949c4b93451354d5d53ae838b3659c (patch) | |
tree | 19b4bbe16f24cf095b42826090220435b0bf60c9 /rbutil/rbutilCtrls.cpp | |
parent | 71eedc7a5be6b01fc910967e93ef7f3acf92eeaf (diff) | |
download | rockbox-1bc4ce9a0a949c4b93451354d5d53ae838b3659c.tar.gz rockbox-1bc4ce9a0a949c4b93451354d5d53ae838b3659c.zip |
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
Diffstat (limited to 'rbutil/rbutilCtrls.cpp')
-rw-r--r-- | rbutil/rbutilCtrls.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/rbutil/rbutilCtrls.cpp b/rbutil/rbutilCtrls.cpp index f30442c66d..6164c7dcdd 100644 --- a/rbutil/rbutilCtrls.cpp +++ b/rbutil/rbutilCtrls.cpp | |||
@@ -167,9 +167,9 @@ void ThemeCtrl::setDevice(wxString device) | |||
167 | //get correct Themes list | 167 | //get correct Themes list |
168 | wxString src,dest,err; | 168 | wxString src,dest,err; |
169 | 169 | ||
170 | src.Printf(wxT("%srbutil.php?res=%s"),gv->themes_url.c_str(),m_currentResolution.c_str()); | 170 | src = gv->themes_url + wxT("rbutil.php?res=") + m_currentResolution; |
171 | dest.Printf(wxT("%s" PATH_SEP "download" PATH_SEP "%s.list"), | 171 | dest = gv->stdpaths->GetUserDataDir() + wxT("" PATH_SEP "download" PATH_SEP) |
172 | gv->stdpaths->GetUserDataDir().c_str(),m_currentResolution.c_str()); | 172 | + m_currentResolution + wxT(".list"); |
173 | 173 | ||
174 | if(DownloadURL(src, dest)) | 174 | if(DownloadURL(src, dest)) |
175 | { | 175 | { |
@@ -249,16 +249,18 @@ void ThemeCtrl::ThemePreview() | |||
249 | int pos = m_Themes_image[index].Find('/',true); | 249 | int pos = m_Themes_image[index].Find('/',true); |
250 | wxString filename = m_Themes_image[index](pos+1,m_Themes_image[index].Length()); | 250 | wxString filename = m_Themes_image[index](pos+1,m_Themes_image[index].Length()); |
251 | 251 | ||
252 | dest.Printf(wxT("%s" PATH_SEP "download" PATH_SEP "%s"), | 252 | dest = gv->stdpaths->GetUserDataDir() |
253 | gv->stdpaths->GetUserDataDir().c_str(),m_currentResolution.c_str()); | 253 | + wxT("" PATH_SEP "download" PATH_SEP) |
254 | + m_currentResolution; | ||
254 | 255 | ||
255 | if(!wxDirExists(dest)) | 256 | if(!wxDirExists(dest)) |
256 | wxMkdir(dest); | 257 | wxMkdir(dest); |
257 | 258 | ||
258 | //this is a URL no PATH_SEP | 259 | //this is a URL no PATH_SEP |
259 | src.Printf(wxT("%s/data/%s/%s"),gv->themes_url.c_str(),m_currentResolution.c_str(),filename.c_str()); | 260 | src = gv->themes_url + wxT("/data/") + m_currentResolution + wxT("/") |
260 | dest.Printf(wxT("%s" PATH_SEP "download" PATH_SEP "%s" PATH_SEP "%s"), | 261 | + filename; |
261 | gv->stdpaths->GetUserDataDir().c_str(),m_currentResolution.c_str(),filename.c_str()); | 262 | dest = gv->stdpaths->GetUserDataDir() + wxT("" PATH_SEP "download" PATH_SEP) |
263 | + m_currentResolution + wxT("" PATH_SEP) + filename; | ||
262 | 264 | ||
263 | if(DownloadURL(src, dest)) | 265 | if(DownloadURL(src, dest)) |
264 | { | 266 | { |