diff --git a/renderdoc/common/string_utils.h b/renderdoc/common/string_utils.h deleted file mode 100644 index 39458fd11..000000000 --- a/renderdoc/common/string_utils.h +++ /dev/null @@ -1,138 +0,0 @@ -/****************************************************************************** - * The MIT License (MIT) - * - * Copyright (c) 2014 Crytek - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - ******************************************************************************/ - - -#pragma once - -#include -#include -#include -#include -#include -using std::basic_string; -using std::vector; - -// in common.cpp -template const charType* pathSeparator(); -template const charType* curdir(); - -template strType basename(const strType &path) -{ - strType base = path; - - if(base.length() == 0) - return base; - - if(base[base.length()-1] == '/' || base[base.length()-1] == '\\') - base.erase(base.size()-1); - - size_t offset = base.find_last_of(pathSeparator()); - - if(offset == strType::npos) - return base; - - return base.substr(offset+1); -} - -template strType dirname(const strType &path) -{ - strType base = path; - - if(base.length() == 0) - return base; - - if(base[base.length()-1] == '/' || base[base.length()-1] == '\\') - base.erase(base.size()-1); - - size_t offset = base.find_last_of(pathSeparator()); - - if(offset == strType::npos) - return curdir(); - - return base.substr(0, offset); -} - -template -void strreplace(basic_string& str, const basic_string& toFind, const basic_string& replacement, typename basic_string::size_type index = 0) -{ - typename basic_string::size_type length = toFind.length(); - - while(index < str.length()) - { - index = str.find(toFind, index); - - if(index < str.length()) - { - str.replace(index, length, replacement); - } - } -} - -template -basic_string strlower(const basic_string& str) -{ - basic_string newstr(str); - transform(newstr.begin(), newstr.end(), newstr.begin(), tolower); - return newstr; -} - -template -basic_string strupper(const basic_string& str) -{ - basic_string newstr(str); - transform(newstr.begin(), newstr.end(), newstr.begin(), (int(*)(int))toupper); - return newstr; -} - -template -void split(const basic_string& in, vector >& out, const CharType sep) -{ - basic_string work = in; - typename basic_string::size_type offset = work.find(sep); - - while(offset != basic_string::npos) - { - out.push_back(work.substr(0, offset)); - work = work.substr(offset+1); - - offset = work.find(sep); - } - - if(work.size() && work[0] != 0) - out.push_back(work); -} - -template -void merge(const vector >& in, basic_string& out, const CharType sep) -{ - out = basic_string(); - for(size_t i=0; i < in.size(); i++) - { - out += in[i]; - out += sep; - } -} - -std::wstring widen(std::string str); -std::string narrow(std::wstring str); diff --git a/renderdoc/hooks/gl_linux_hooks.cpp b/renderdoc/hooks/gl_linux_hooks.cpp index 8c0572ec0..dca451c9b 100644 --- a/renderdoc/hooks/gl_linux_hooks.cpp +++ b/renderdoc/hooks/gl_linux_hooks.cpp @@ -34,7 +34,7 @@ #include "driver/gl/gl_hookset_defs.h" #include "common/threading.h" -#include "common/string_utils.h" +#include "serialise/string_utils.h" namespace glEmulate { void EmulateUnsupportedFunctions(GLHookSet *hooks); } diff --git a/renderdoc/os/linux/linux_network.cpp b/renderdoc/os/linux/linux_network.cpp index 9af69961a..08d9c78d6 100644 --- a/renderdoc/os/linux/linux_network.cpp +++ b/renderdoc/os/linux/linux_network.cpp @@ -38,7 +38,7 @@ #include using std::string; -#include "common/string_utils.h" +#include "serialise/string_utils.h" #include "os/os_specific.h" namespace Network diff --git a/renderdoc/os/linux/linux_stringio.cpp b/renderdoc/os/linux/linux_stringio.cpp index 2d0dabed8..822236890 100644 --- a/renderdoc/os/linux/linux_stringio.cpp +++ b/renderdoc/os/linux/linux_stringio.cpp @@ -42,7 +42,7 @@ // for dladdr #include -#include "common/string_utils.h" +#include "serialise/string_utils.h" #include "common/threading.h" using std::string;