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 "synergy/PortableTaskBarReceiver.h"
#include "mt/Lock.h"
#include "base/StringUtil.h"
#include "base/String.h"
#include "base/IEventQueue.h"
#include "arch/Arch.h"
#include "common/Version.h"
@@ -106,14 +106,14 @@ CPortableTaskBarReceiver::getToolTip() const
{
switch (m_state) {
case kNotRunning:
return CStringUtil::print("%s: Not running", kAppVersion);
return synergy::string::sprintf("%s: Not running", kAppVersion);
case kNotWorking:
return CStringUtil::print("%s: %s",
return synergy::string::sprintf("%s: %s",
kAppVersion, m_errorMessage.c_str());
case kNotConnected:
return CStringUtil::print("%s: Unknown", kAppVersion);
return synergy::string::sprintf("%s: Unknown", kAppVersion);
default:
return "";