--- a/sources/mystring.h Wed Jul 20 16:52:00 2016 +0300
+++ b/sources/mystring.h Wed Jul 20 17:31:51 2016 +0300
@@ -56,25 +56,25 @@
ConstIterator begin() const;
Iterator begin();
int compare(const String &other) const;
- int count(char needle) const;
+ int count(char character) const;
const char* chars() const;
void clear();
ConstIterator end() const;
Iterator end();
bool endsWith(const String &other) const;
- int find(const char* c, int a = 0) const;
- int find(char ch, int a = 0) const;
+ int find(const char* subString, int startingPosition = 0) const;
+ int find(char character, int startingPosition = 0) const;
int indexDifference(int a, int b);
void insert(int position, char character);
void insert(int position, const char* string);
bool isEmpty() const;
bool isNumeric() const;
void modifyIndex(int &a) const;
- int findLast(const char*c, int a) const;
+ int findLast(const char* subString, int startingPosition = -1) const;
int length() const;
bool maskAgainst(const String &pattern) const;
String md5() const;
- String mid(int a, int b) const;
+ String mid(int rangeBegin, int rangeEnd) const;
void normalize(int(*filter)(int) = &isspace);
String normalized(int(*filter)(int) = &isspace) const;
void prepend(String text);
@@ -82,23 +82,22 @@
void removeAt(int position);
void removeFromEnd(int length);
void removeFromStart(int length);
- void replace(const char* a, const char* b);
+ void replace(const char* text, const char* replacement);
void replace(int position, int amount, const String &text);
String right(int length) const;
void shrinkToFit();
- class StringList split(const String &del) const;
- class StringList split(char del) const;
+ class StringList split(const String &delimeter) const;
+ class StringList split(char delimeter) const;
void __cdecl sprintf(const char* fmtstr, ...);
bool startsWith(const String &other) const;
const std::string& stdString() const;
- String strip(char unwanted) const;
- String strip(const List<char> &unwanted) const;
+ void strip(char unwanted);
+ void strip(const List<char> &unwanted);
double toDouble(bool* ok = nullptr) const;
float toFloat(bool* ok = nullptr) const;
long toInt(bool* ok = nullptr, int base = 10) const;
String toLowerCase() const;
String toUpperCase() const;
- void trim(int n);
void vsprintf(const char* fmtstr, va_list args);
static String fromNumber(short int a);
@@ -556,20 +555,20 @@
/*!
* \brief Constructs an empty string list.
*/
-StringList::StringList() {}
+inline StringList::StringList() {}
/*!
* \brief Constructs a string list containing \c numvalues empty strings.
* \param numvalues Amount of empty strings to fill.
*/
-StringList::StringList(int numvalues) :
+inline StringList::StringList(int numvalues) :
List<String>(numvalues) {}
/*!
* \brief Constructs a string list from another list of strings.
* \param other The list of strings to use for construction.
*/
-StringList::StringList(const List<String>& other) :
+inline StringList::StringList(const List<String>& other) :
List<String>(other) {}
/*!