diff --git a/nel/include/nel/misc/common.h b/nel/include/nel/misc/common.h index 1e98ca3f7..8446b58b0 100644 --- a/nel/include/nel/misc/common.h +++ b/nel/include/nel/misc/common.h @@ -1,10 +1,10 @@ // NeL - MMORPG Framework -// Copyright (C) 2010-2020 Winch Gate Property Limited +// Copyright (C) 2010-2018 Winch Gate Property Limited // // This source file has been modified by the following contributors: // Copyright (C) 2010 Matt RAYKOWSKI (sfb) // Copyright (C) 2010 Robert TIMM (rti) -// Copyright (C) 2015-2020 Jan BOON (Kaetemi) +// Copyright (C) 2015-2019 Jan BOON (Kaetemi) // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU Affero General Public License as @@ -227,62 +227,18 @@ inline double isValidDouble (double v) * \param str a string to transform to lower case */ -std::string toLower ( const char *str ); // UTF-8 -std::string toLower ( const std::string &str ); // UTF-8 -void toLower ( char *str ); // Ascii only +std::string toLower ( const char *str ); +std::string toLower ( const std::string &str ); +void toLower ( char *str ); char toLower ( const char ch ); // convert only one character /** Convert a string in upper case. * \param a string to transform to upper case */ -std::string toUpper ( const char *str ); // UTF-8 -std::string toUpper ( const std::string &str); // UTF-8 -void toUpper ( char *str); // Ascii only +std::string toUpper ( const std::string &str); +void toUpper ( char *str); -/** Convert a single character in UTF-8 to upper or lowercase. -* \param res Character is appended in UTF-8 into this string. -* \param src Character is sourced from this UTF-8 string. -* \param i Index in `str`, incremented by the number of bytes read. -*/ -void appendToLower(std::string &res, const char *str, ptrdiff_t &i); -void appendToLower(std::string &res, const std::string &str, ptrdiff_t &i); -void appendToUpper(std::string &res, const char *str, ptrdiff_t &i); -void appendToUpper(std::string &res, const std::string &str, ptrdiff_t &i); -void appendToTitle(std::string &res, const char *str, ptrdiff_t &i); -void appendToTitle(std::string &res, const std::string &str, ptrdiff_t &i); - -/** UTF-8 case insensitive compare */ -int compareCaseInsensitive(const char *a, const char *b); -int compareCaseInsensitive(const char *a, size_t lenA, const char *b, size_t lenB); -inline int compareCaseInsensitive(const std::string &a, const std::string &b) { return compareCaseInsensitive(&a[0], a.size(), &b[0], b.size()); } -inline bool ltCaseInsensitive(const std::string &a, const std::string &b) { return compareCaseInsensitive(&a[0], a.size(), &b[0], b.size()) < 0; } -std::string toCaseInsensitive(const char *str); // UTF-8, case-insensitive toLower -std::string toCaseInsensitive(const std::string &str); // UTF-8, case-insensitive toLower - -/** ASCII to lowercase. Useful for internal identifiers. -* Characters outside of the 7-bit ASCII space, and control characters, are replaced. -*/ -std::string toLowerAscii(const std::string &str, char replacement); -void toLowerAscii(char *str, char replacement); - -/** ASCII to uppercase. Useful for internal identifiers. -* Characters outside of the 7-bit ASCII space, and control characters, are replaced. -*/ -std::string toUpperAscii(const std::string &str, char replacement); -void toUpperAscii(char *str, char replacement); - -/** ASCII to lowercase. Useful for internal identifiers. -* Characters outside of the 7-bit ASCII space are not affected. -*/ -std::string toLowerAscii(const std::string &str); -void toLowerAscii(char *str); - -/** ASCII to uppercase. Useful for internal identifiers. -* Characters outside of the 7-bit ASCII space are not affected. -*/ -std::string toUpperAscii(const std::string &str); -void toUpperAscii(char *str); /** * Convert to an hexadecimal std::string diff --git a/nel/include/nel/misc/file.h b/nel/include/nel/misc/file.h index 0271be4a3..3e40d122a 100644 --- a/nel/include/nel/misc/file.h +++ b/nel/include/nel/misc/file.h @@ -1,8 +1,5 @@ // NeL - MMORPG Framework -// Copyright (C) 2010-2019 Winch Gate Property Limited -// -// This source file has been modified by the following contributors: -// Copyright (C) 2020 Jan BOON (Kaetemi) +// Copyright (C) 2010 Winch Gate Property Limited // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU Affero General Public License as diff --git a/nel/include/nel/misc/stream.h b/nel/include/nel/misc/stream.h index 1dc56b1cd..da9f2835e 100644 --- a/nel/include/nel/misc/stream.h +++ b/nel/include/nel/misc/stream.h @@ -1,9 +1,6 @@ // NeL - MMORPG Framework // Copyright (C) 2010 Winch Gate Property Limited // -// This source file has been modified by the following contributors: -// Copyright (C) 2020 Jan BOON (Kaetemi) -// // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU Affero General Public License as // published by the Free Software Foundation, either version 3 of the diff --git a/nel/src/web/http_package_provider.cpp b/nel/src/web/http_package_provider.cpp index b71f97467..d2abe78d1 100644 --- a/nel/src/web/http_package_provider.cpp +++ b/nel/src/web/http_package_provider.cpp @@ -41,7 +41,7 @@ CHttpPackageProvider::~CHttpPackageProvider() // release } -bool CHttpPackageProvider::getFile(std::string &filePath, const CHashKey &hash, const std::string &name) + bool CHttpPackageProvider::getFile(std::string &filePath, const CHashKey &hash, const std::string &name) { CStreamedPackage::makePath(filePath, hash); std::string downloadUrlFile = filePath + ".lzma"; diff --git a/ryzom/common/src/game_share/object.h b/ryzom/common/src/game_share/object.h index 5e8868256..65f32526c 100644 --- a/ryzom/common/src/game_share/object.h +++ b/ryzom/common/src/game_share/object.h @@ -1,9 +1,6 @@ // Ryzom - MMORPG Framework // Copyright (C) 2010 Winch Gate Property Limited // -// This source file has been modified by the following contributors: -// Copyright (C) 2019 Jan BOON (Kaetemi) -// // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU Affero General Public License as // published by the Free Software Foundation, either version 3 of the