Change naming convention from _member to member_ (fixes #1905)

Ported from 31ce648e63
This commit is contained in:
Benoit Blanchon
2023-04-21 18:53:16 +02:00
parent 5d796781fb
commit dd46813dc0
60 changed files with 789 additions and 786 deletions

View File

@ -9,11 +9,11 @@
// Reproduces Arduino's String class
class String {
public:
String() : _maxCapacity(1024) {}
explicit String(const char* s) : _str(s), _maxCapacity(1024) {}
String() : maxCapacity_(1024) {}
explicit String(const char* s) : str_(s), maxCapacity_(1024) {}
void limitCapacityTo(size_t maxCapacity) {
_maxCapacity = maxCapacity;
maxCapacity_ = maxCapacity;
}
unsigned char concat(const char* s) {
@ -21,45 +21,45 @@ class String {
}
size_t length() const {
return _str.size();
return str_.size();
}
const char* c_str() const {
return _str.c_str();
return str_.c_str();
}
bool operator==(const char* s) const {
return _str == s;
return str_ == s;
}
String& operator=(const char* s) {
_str.assign(s);
str_.assign(s);
return *this;
}
char operator[](unsigned int index) const {
if (index >= _str.size())
if (index >= str_.size())
return 0;
return _str[index];
return str_[index];
}
friend std::ostream& operator<<(std::ostream& lhs, const ::String& rhs) {
lhs << rhs._str;
lhs << rhs.str_;
return lhs;
}
protected:
// This function is protected in most Arduino cores
unsigned char concat(const char* s, size_t n) {
if (_str.size() + n > _maxCapacity)
if (str_.size() + n > maxCapacity_)
return 0;
_str.append(s, n);
str_.append(s, n);
return 1;
}
private:
std::string _str;
size_t _maxCapacity;
std::string str_;
size_t maxCapacity_;
};
class StringSumHelper : public ::String {};