--- a/src/string.h Thu Jun 13 16:33:17 2013 +0300 +++ b/src/string.h Fri Jun 14 16:00:54 2013 +0300 @@ -24,81 +24,5 @@ #include <QString> #include "types.h" -typedef class String { -public: - typedef typename std::string::iterator it; - typedef typename std::string::const_iterator c_it; - typedef vector<String> stringlist; - - String (); - String (const char* data); - String (const QString data); - String (std::string data); - - void append (const char* data); - void append (const char data); - void append (const String data); - it begin (); - c_it begin () const; - const char* c () const; - size_t capacity () const; - const char* chars () const; - int compare (const char* other) const; - int compare (String other) const; - it end (); - c_it end () const; - void clear (); - ushort count (const char needle) const; - bool empty () const; - void erase (size_t pos); - int first (const char* c, int a = 0) const; - void format (const char* fmtstr, ...); - void insert (size_t pos, char c); - int last (const char* c, int a = -1) const; - size_t len () const; - String lower () const; - size_t maxSize () const; - void replace (const char* a, const char* b); - void resize (size_t n); - void shrinkToFit (); - stringlist split (String del) const; - stringlist split (char del) const; - String strip (char unwanted); - String strip (std::initializer_list<char> unwanted); - String substr (long a, long b) const; - void trim (short n); - String upper () const; - - String operator+ (const String data) const; - String operator+ (const char* data) const; - String& operator+= (const String data); - String& operator+= (const char* data); - String& operator+= (const char data); - String operator+ () const; - String operator- () const; - String operator- (size_t n) const; - String& operator-= (size_t n); - size_t operator~ () const; - vector<String> operator/ (String del) const; - char& operator[] (size_t n); - const char& operator[] (size_t n) const; - bool operator== (const String other) const; - bool operator== (const char* other) const; - bool operator!= (const String other) const; - bool operator!= (const char* other) const; - bool operator! () const; - operator const char* () const; - operator QString (); - operator const QString () const; - - static str join (const vector<str>& items, const str& delim); - -private: - std::string m_string; -} str; - -// Accessories -char* dynafmt (const char* fmtstr, va_list va, ulong size); -str fmt (const char* fmtstr, ...); #endif // STR_H \ No newline at end of file