Task #3969 - Merge String.cpp and StringUtil.cpp

This commit is contained in:
Nick Bolton 2014-03-21 08:32:36 +00:00
parent a4416d4b16
commit 0745d5884b
26 changed files with 360 additions and 408 deletions

View file

@ -18,7 +18,7 @@
#include "platform/MSWindowsUtil.h"
#include "base/StringUtil.h"
#include "base/String.h"
#include <stdio.h>
@ -69,8 +69,8 @@ CMSWindowsUtil::getErrorString(HINSTANCE hinstance, DWORD error, DWORD id)
(LPTSTR)&buffer,
0,
NULL) == 0) {
CString errorString = CStringUtil::print("%d", error);
return CStringUtil::format(getString(hinstance, id).c_str(),
CString errorString = synergy::string::sprintf("%d", error);
return synergy::string::format(getString(hinstance, id).c_str(),
errorString.c_str());
}
else {