archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: comments (long lines) in string

Browse Source
This commit is contained in:
Campbell Barton
2019-05-01 20:31:00 +10:00
parent 59fb13c2b1
commit 8a10da1cf8
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intern/string/STR_String.h
View File

@@ -312,7 +312,7 @@ class STR_String {
} }
// serializing // serializing
//int Serialize(pCStream stream); // int Serialize(pCStream stream);
protected: protected:
// Implementation // Implementation
@@ -334,7 +334,7 @@ class STR_String {
} }
char *m_data; // -> STR_String data char *m_data; // -> STR_String data
int m_len; //z Data length int m_len; // z Data length
int m_max; // Space in data buffer int m_max; // Space in data buffer
#ifdef WITH_CXX_GUARDEDALLOC #ifdef WITH_CXX_GUARDEDALLOC

14
intern/string/intern/STR_String.cpp
View File

@@ -336,7 +336,7 @@ int STR_String::FindOneOf(const char *set, int pos) const
// //
void STR_String::Replace(int pos, rcSTR_String str) void STR_String::Replace(int pos, rcSTR_String str)
{ {
//bounds(pos, 0, Length()-1); // bounds(pos, 0, Length()-1);
if (str.Length() < 1) { if (str.Length() < 1) {
// Remove one character from the string // Remove one character from the string
@@ -358,8 +358,8 @@ void STR_String::Replace(int pos, rcSTR_String str)
// //
void STR_String::Replace(int pos, int num, rcSTR_String str) void STR_String::Replace(int pos, int num, rcSTR_String str)
{ {
//bounds(pos, 0, Length()-1); // bounds(pos, 0, Length()-1);
//bounds(pos+num, 0, Length()); // bounds(pos+num, 0, Length());
assertd(num >= 1); assertd(num >= 1);
if (str.Length() < num) { if (str.Length() < num) {
@@ -385,7 +385,8 @@ void STR_String::Replace(int pos, int num, rcSTR_String str)
-------------------------------------------------------------------------------------------------*/ -------------------------------------------------------------------------------------------------*/
// //
// Compare two strings and return the result, <0 if *this<rhs, >0 if *this>rhs or 0 if *this==rhs // Compare two strings and return the result,
// <0 if *this<rhs, >0 if *this>rhs or 0 if *this==rhs
// //
int STR_String::Compare(rcSTR_String rhs) const int STR_String::Compare(rcSTR_String rhs) const
{ {
@@ -393,7 +394,8 @@ int STR_String::Compare(rcSTR_String rhs) const
} }
// //
// Compare two strings without respecting case and return the result, <0 if *this<rhs, >0 if *this>rhs or 0 if *this==rhs // Compare two strings without respecting case and return the result,
// <0 if *this<rhs, >0 if *this>rhs or 0 if *this==rhs
// //
int STR_String::CompareNoCase(rcSTR_String rhs) const int STR_String::CompareNoCase(rcSTR_String rhs) const
{ {
@@ -608,7 +610,7 @@ std::vector<STR_String> STR_String::Explode(char c) const
} }
} }
//uc. -= STR_String(""); // uc. -= STR_String("");
return uc; return uc;
} }