Remove "str" prefix from string helpers

This matches the naming in STL, which is what we are mostly mimicing now
that we are using std::string for these functions.

6 files changed, 9 insertions, 9 deletions

diff --git a/win/rfb_win32/Service.cxx b/win/rfb_win32/Service.cxx
index 259eb762..62230b07 100644
--- a/win/rfb_win32/Service.cxx
+++ b/win/rfb_win32/Service.cxx
@@ -323,7 +323,7 @@ bool rfb::win32::registerService(const char* name,
 
   // - Add the supplied extra parameters to the command line
   std::string cmdline;
-  cmdline = strFormat("\"%s\" %s", buffer.buf, defaultcmdline);
+  cmdline = format("\"%s\" %s", buffer.buf, defaultcmdline);
   for (i=0; i<argc; i++) {
     cmdline += " \"";
     cmdline += argv[i];
diff --git a/win/rfb_win32/Win32Util.cxx b/win/rfb_win32/Win32Util.cxx
index 002bf2bd..ed6b70cb 100644
--- a/win/rfb_win32/Win32Util.cxx
+++ b/win/rfb_win32/Win32Util.cxx
@@ -74,7 +74,7 @@ const char* FileVersionInfo::getVerString(const char* name, DWORD langId) {
 
   std::string langIdStr(binToHex(langIdBuf, sizeof(langId)));
   std::string infoName;
-  infoName = strFormat("\\StringFileInfo\\%s\\%s", langIdStr.c_str(), name);
+  infoName = format("\\StringFileInfo\\%s\\%s", langIdStr.c_str(), name);
 
   // Locate the required version string within the version info
   char* buffer = 0;
diff --git a/win/vncconfig/Connections.h b/win/vncconfig/Connections.h
index 1cf01777..888fd77b 100644
--- a/win/vncconfig/Connections.h
+++ b/win/vncconfig/Connections.h
@@ -99,7 +99,7 @@ namespace rfb {
           SendMessage(listBox, LB_DELETESTRING, 0, 0);
 
         std::vector<std::string> hostv;
-        hostv = strSplit(hosts, ',');
+        hostv = split(hosts, ',');
         for (size_t i = 0; i < hostv.size(); i++) {
           if (!hostv[i].empty())
             SendMessage(listBox, LB_ADDSTRING, 0, (LPARAM)hostv[i].c_str());
diff --git a/win/vncconfig/Legacy.cxx b/win/vncconfig/Legacy.cxx
index b21bccd7..7703c3a3 100644
--- a/win/vncconfig/Legacy.cxx
+++ b/win/vncconfig/Legacy.cxx
@@ -69,7 +69,7 @@ void LegacyPage::LoadPrefs()
             try {
               // Split the AuthHosts string into patterns to match
               std::vector<std::string> patterns;
-              patterns = rfb::strSplit(authHosts.c_str(), ':');
+              patterns = rfb::split(authHosts.c_str(), ':');
               for (size_t i = 0; i < patterns.size(); i++) {
                 if (!patterns[i].empty()) {
                   int bits = 0;
@@ -79,7 +79,7 @@ void LegacyPage::LoadPrefs()
 
                   // Split the pattern into IP address parts and process
                   std::vector<std::string> parts;
-                  parts = rfb::strSplit(&patterns[i][1], '.');
+                  parts = rfb::split(&patterns[i][1], '.');
                   for (size_t j = 0; j < parts.size(); j++) {
                     if (bits)
                       strcat(pattern, ".");
diff --git a/win/winvnc/VNCServerService.cxx b/win/winvnc/VNCServerService.cxx
index d2a994aa..4754d720 100644
--- a/win/winvnc/VNCServerService.cxx
+++ b/win/winvnc/VNCServerService.cxx
@@ -109,7 +109,7 @@ HANDLE LaunchProcessWin(DWORD /*dwSessionId*/)
     {
         ModuleFileName filename;
         std::string cmdLine;
-        cmdLine = strFormat("\"%s\" -noconsole -service_run", filename.buf);
+        cmdLine = format("\"%s\" -noconsole -service_run", filename.buf);
         STARTUPINFO si;
         ZeroMemory(&si, sizeof si);
         si.cb = sizeof si;
diff --git a/win/winvnc/winvnc.cxx b/win/winvnc/winvnc.cxx
index 2e705bf0..604df12e 100644
--- a/win/winvnc/winvnc.cxx
+++ b/win/winvnc/winvnc.cxx
@@ -154,9 +154,9 @@ static void processParams(int argc, char** argv) {
         runServer = false;
         std::string result;
         DWORD state = rfb::win32::getServiceState(VNCServerService::Name);
-        result = strFormat("The %s Service is in the %s state.",
-                           VNCServerService::Name,
-                           rfb::win32::serviceStateName(state));
+        result = format("The %s Service is in the %s state.",
+                        VNCServerService::Name,
+                        rfb::win32::serviceStateName(state));
         MsgBoxOrLog(result.c_str());
       } else if (strcasecmp(argv[i], "-service") == 0) {
         printf("Run in service mode\n");