From 8b58389c3829b752d299e72899635902d2fecd48 Mon Sep 17 00:00:00 2001
From: Sebastian Holtermann <sebholt@xwmw.org>
Date: Tue, 19 Mar 2019 16:21:22 +0100
Subject: [PATCH] SystemTools: Move private ReplaceString method to
SystemToolsStatic class
---
SystemTools.cxx | 18 +++++++++++++-----
SystemTools.hxx.in | 6 ------
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/SystemTools.cxx b/SystemTools.cxx
index 2b06b1fe..b736ed47 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -469,6 +469,12 @@ public:
StringMap Cyg2Win32Map;
#endif
+ /**
+ * Actual implementation of ReplaceString.
+ */
+ static void ReplaceString(std::string& source, const char* replace,
+ size_t replaceSize, const std::string& with);
+
/**
* Actual implementation of FileIsFullPath.
*/
@@ -942,7 +948,8 @@ void SystemTools::ReplaceString(std::string& source,
return;
}
- SystemTools::ReplaceString(source, replace.c_str(), replace.size(), with);
+ SystemToolsStatic::ReplaceString(source, replace.c_str(), replace.size(),
+ with);
}
void SystemTools::ReplaceString(std::string& source, const char* replace,
@@ -953,12 +960,13 @@ void SystemTools::ReplaceString(std::string& source, const char* replace,
return;
}
- SystemTools::ReplaceString(source, replace, strlen(replace),
- with ? with : "");
+ SystemToolsStatic::ReplaceString(source, replace, strlen(replace),
+ with ? with : "");
}
-void SystemTools::ReplaceString(std::string& source, const char* replace,
- size_t replaceSize, const std::string& with)
+void SystemToolsStatic::ReplaceString(std::string& source, const char* replace,
+ size_t replaceSize,
+ const std::string& with)
{
const char* src = source.c_str();
char* searchPos = const_cast<char*>(strstr(src, replace));
diff --git a/SystemTools.hxx.in b/SystemTools.hxx.in
index bd2c4921..cdc9483a 100644
--- a/SystemTools.hxx.in
+++ b/SystemTools.hxx.in
@@ -965,12 +965,6 @@ private:
return &SystemToolsManagerInstance;
}
- /**
- * Actual implementation of ReplaceString.
- */
- static void ReplaceString(std::string& source, const char* replace,
- size_t replaceSize, const std::string& with);
-
static SystemToolsStatic* Statics;
friend class SystemToolsStatic;
friend class SystemToolsManager;
--
GitLab