From 1b9c0f1030ec212eb39c5291f44d99313a2b638d Mon Sep 17 00:00:00 2001 From: Mattes D Date: Sun, 25 Jan 2015 17:06:15 +0100 Subject: Removed cFile::ReplaceFileNameInvalidChars(). Its only usage in cProtocol18 has been changed to a simple string replace - only the IPv6's colons were causing problems. --- src/OSSupport/File.cpp | 23 ----------------------- src/OSSupport/File.h | 3 --- 2 files changed, 26 deletions(-) (limited to 'src/OSSupport') diff --git a/src/OSSupport/File.cpp b/src/OSSupport/File.cpp index 1ee9feafe..8957dfaef 100644 --- a/src/OSSupport/File.cpp +++ b/src/OSSupport/File.cpp @@ -453,29 +453,6 @@ AString cFile::ReadWholeFile(const AString & a_FileName) -AString cFile::ReplaceFileNameInvalidChars(const AString & a_FileName, char a_Replacement) -{ - AString res(a_FileName); - for (auto & ch: res) - { - switch (ch) - { - case ':': - case '\\': - case '/': - { - ch = a_Replacement; - break; - } - } - } - return res; -} - - - - - int cFile::Printf(const char * a_Fmt, ...) { AString buf; diff --git a/src/OSSupport/File.h b/src/OSSupport/File.h index b39f71e28..ac6d1ab21 100644 --- a/src/OSSupport/File.h +++ b/src/OSSupport/File.h @@ -127,9 +127,6 @@ public: /** Returns the entire contents of the specified file as a string. Returns empty string on error. */ static AString ReadWholeFile(const AString & a_FileName); - /** Replaces characters that cannot be in a file name with the specified char. */ - static AString ReplaceFileNameInvalidChars(const AString & a_FileName, char a_Replacement = '_'); - // tolua_end /** Returns the list of all items in the specified folder (files, folders, nix pipes, whatever's there). */ -- cgit v1.2.3