diff options
Diffstat (limited to 'rbutil/installlog.cpp')
-rw-r--r-- | rbutil/installlog.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/rbutil/installlog.cpp b/rbutil/installlog.cpp index e9dad794cb..4be4a97352 100644 --- a/rbutil/installlog.cpp +++ b/rbutil/installlog.cpp | |||
@@ -38,9 +38,9 @@ InstallLog::InstallLog(wxString logname, bool CreateLog) | |||
38 | return; | 38 | return; |
39 | } | 39 | } |
40 | 40 | ||
41 | logfile->SetPath("/InstallLog"); | 41 | logfile->SetPath(wxT("/InstallLog")); |
42 | if (logfile->Exists("Version") && | 42 | if (logfile->Exists(wxT("Version")) && |
43 | logfile->Read("Version", 0l) != LOGFILE_VERSION ) | 43 | logfile->Read(wxT("Version"), 0l) != LOGFILE_VERSION ) |
44 | { | 44 | { |
45 | buf.Printf(_("Logfile version mismatch: %s"), logname.c_str() ); | 45 | buf.Printf(_("Logfile version mismatch: %s"), logname.c_str() ); |
46 | wxLogWarning(buf); | 46 | wxLogWarning(buf); |
@@ -48,7 +48,7 @@ InstallLog::InstallLog(wxString logname, bool CreateLog) | |||
48 | return; | 48 | return; |
49 | } | 49 | } |
50 | 50 | ||
51 | logfile->Write("Version", LOGFILE_VERSION); | 51 | logfile->Write(wxT("Version"), LOGFILE_VERSION); |
52 | dirtyflag = false; | 52 | dirtyflag = false; |
53 | } | 53 | } |
54 | 54 | ||
@@ -105,12 +105,12 @@ unsigned int InstallLog::WriteFile(wxArrayString filepaths) | |||
105 | 105 | ||
106 | wxArrayString* InstallLog::GetInstalledFiles() | 106 | wxArrayString* InstallLog::GetInstalledFiles() |
107 | { | 107 | { |
108 | wxString curdir = ""; | 108 | wxString curdir = wxT(""); |
109 | 109 | ||
110 | if (dirtyflag) return NULL; | 110 | if (dirtyflag) return NULL; |
111 | workingAS.Clear(); | 111 | workingAS.Clear(); |
112 | 112 | ||
113 | EnumerateCurDir(""); | 113 | EnumerateCurDir(wxT("")); |
114 | 114 | ||
115 | wxArrayString* out = new wxArrayString(workingAS); | 115 | wxArrayString* out = new wxArrayString(workingAS); |
116 | return out; | 116 | return out; |
@@ -129,8 +129,8 @@ void InstallLog::EnumerateCurDir(wxString curdir) | |||
129 | contflag = logfile->GetFirstGroup(curname, dummy); | 129 | contflag = logfile->GetFirstGroup(curname, dummy); |
130 | while (contflag) | 130 | while (contflag) |
131 | { | 131 | { |
132 | buf.Printf("%s/%s", curdir.c_str(), curname.c_str() ); | 132 | buf.Printf(wxT("%s/%s"), curdir.c_str(), curname.c_str() ); |
133 | buf2 = buf; buf2.Replace(wxT("/"), wxT(PATH_SEP)); | 133 | buf2 = buf; buf2.Replace(wxT("/"), PATH_SEP); |
134 | workingAS.Add(buf2); | 134 | workingAS.Add(buf2); |
135 | EnumerateCurDir(buf); | 135 | EnumerateCurDir(buf); |
136 | contflag = logfile->GetNextGroup(curname, dummy); | 136 | contflag = logfile->GetNextGroup(curname, dummy); |
@@ -141,8 +141,8 @@ void InstallLog::EnumerateCurDir(wxString curdir) | |||
141 | { | 141 | { |
142 | if (curname != wxT(DIRECTORY_KLUDGE) ) | 142 | if (curname != wxT(DIRECTORY_KLUDGE) ) |
143 | { | 143 | { |
144 | buf.Printf("%s/%s", curdir.c_str(), curname.c_str() ); | 144 | buf.Printf(wxT("%s/%s"), curdir.c_str(), curname.c_str() ); |
145 | buf2 = buf; buf2.Replace(wxT("/"), wxT(PATH_SEP)); | 145 | buf2 = buf; buf2.Replace(wxT("/"), PATH_SEP); |
146 | workingAS.Add(buf2); | 146 | workingAS.Add(buf2); |
147 | } | 147 | } |
148 | contflag = logfile->GetNextEntry(curname, dummy); | 148 | contflag = logfile->GetNextEntry(curname, dummy); |