From 05b48af15328b383ade4c776dc4908359b802400 Mon Sep 17 00:00:00 2001 From: andrey Date: Thu, 10 Sep 2020 12:37:33 +0300 Subject: [PATCH] remove at(index) reference function remove chrUpr and chrLwr from PIString --- libs/main/containers/pideque.h | 1 - libs/main/containers/pimap.h | 1 - libs/main/containers/pivector.h | 1 - libs/main/core/pistring.cpp | 18 +++--------------- libs/main/core/pistring.h | 9 --------- libs/main/core/pistringlist.h | 2 +- 6 files changed, 4 insertions(+), 28 deletions(-) diff --git a/libs/main/containers/pideque.h b/libs/main/containers/pideque.h index 9d7ffdcb..dd62b501 100644 --- a/libs/main/containers/pideque.h +++ b/libs/main/containers/pideque.h @@ -167,7 +167,6 @@ public: inline bool isEmpty() const {return (pid_size == 0);} inline T & operator [](size_t index) {return pid_data[pid_start + index];} - inline T & at(size_t index) {return pid_data[pid_start + index];} inline const T & operator [](size_t index) const {return pid_data[pid_start + index];} inline const T & at(size_t index) const {return pid_data[pid_start + index];} inline T & back() {return pid_data[pid_start + pid_size - 1];} diff --git a/libs/main/containers/pimap.h b/libs/main/containers/pimap.h index ea71ead1..38339dd7 100644 --- a/libs/main/containers/pimap.h +++ b/libs/main/containers/pimap.h @@ -206,7 +206,6 @@ public: return pim_content.back(); } const T operator [](const Key & key) const {bool f(false); ssize_t i = _find(key, f); if (f) return pim_content[pim_index[i].index]; return T();} - T & at(const Key & key) {return (*this)[key];} const T at(const Key & key) const {return (*this)[key];} PIMap & operator <<(const PIMap & other) { diff --git a/libs/main/containers/pivector.h b/libs/main/containers/pivector.h index 1dce7786..73f4d572 100644 --- a/libs/main/containers/pivector.h +++ b/libs/main/containers/pivector.h @@ -167,7 +167,6 @@ public: inline bool isEmpty() const {return (piv_size == 0);} inline T & operator [](size_t index) {return piv_data[index];} - inline T & at(size_t index) {return piv_data[index];} inline const T & operator [](size_t index) const {return piv_data[index];} inline const T & at(size_t index) const {return piv_data[index];} inline T & back() {return piv_data[piv_size - 1];} diff --git a/libs/main/core/pistring.cpp b/libs/main/core/pistring.cpp index f2f454e8..c5e5c3e5 100644 --- a/libs/main/core/pistring.cpp +++ b/libs/main/core/pistring.cpp @@ -613,7 +613,7 @@ PIString PIString::trimmed() const { PIString & PIString::replace(int from, int count, const PIString & with) { count = piMini(count, length() - from); if (count == with.size_s()) - memcpy(&(at(from)), &(with.at(0)), count * sizeof(PIChar)); + memcpy(PIDeque::data(from), static_cast>(with).data(), count * sizeof(PIChar)); else { remove(from, count); PIDeque::insert(from, with); @@ -671,7 +671,7 @@ PIString & PIString::replaceAll(const PIString & what, const char with) { } if (!match) continue; if (dl > 0) PIDeque::remove(i, dl); - at(i) = PIChar(with); + (*this)[i] = PIChar(with); //i -= l; } return *this; @@ -682,7 +682,7 @@ PIString & PIString::replaceAll(const char what, const char with) { int l = length(); for (int i = 0; i < l; ++i) { if (at(i) == what) - at(i) = with; + (*this)[i] = with; } return *this; } @@ -1166,18 +1166,6 @@ PIString & PIString::setReadableSize(llong bytes) { } -inline char chrUpr(char c) { - if (c >= 'a' && c <= 'z') return c + 'A' - 'a'; - return c; -} - - -inline char chrLwr(char c) { - if (c >= 'A' && c <= 'Z') return c + 'a' - 'A'; - return c; -} - - const static PIString _versionDelims_ = PIStringAscii("._-+"); diff --git a/libs/main/core/pistring.h b/libs/main/core/pistring.h index 6c166521..b1c9d540 100644 --- a/libs/main/core/pistring.h +++ b/libs/main/core/pistring.h @@ -101,12 +101,6 @@ public: * Example: \snippet pistring.cpp PIString::char* */ operator const char*() {return data();} - //! Return symbol at index "pos" - PIChar operator [](const int pos) const {return at(pos);} - - //! Return reference to symbol at index "pos" - PIChar & operator [](const int pos) {return at(pos);} - //! Compare operator bool operator ==(const PIString & str) const; @@ -790,9 +784,6 @@ inline PIString operator +(const char c, const PIString & f) {return PIChar(c) + //! \relatesalso PIString \brief Return concatenated string inline PIString operator +(const PIString & f, const char c) {return f + PIChar(c);} -inline char chrUpr(char c); -inline char chrLwr(char c); - int versionCompare(const PIString & v0, const PIString & v1, int components = 6); diff --git a/libs/main/core/pistringlist.h b/libs/main/core/pistringlist.h index ce2bb7e8..9220aacf 100644 --- a/libs/main/core/pistringlist.h +++ b/libs/main/core/pistringlist.h @@ -77,7 +77,7 @@ public: //! \brief Trim all strings //! \details Example: \snippet pistring.cpp PIStringList::trim - PIStringList & trim() {for (uint i = 0; i < size(); ++i) at(i).trim(); return *this;} + PIStringList & trim() {for (uint i = 0; i < size(); ++i) (*this)[i].trim(); return *this;} //! Return sum of lengths of all strings uint contentSize() {uint s = 0; for (uint i = 0; i < size(); ++i) s += at(i).size(); return s;}