| @@ -566,16 +566,16 @@ JUCE_API bool JUCE_CALLTYPE operator== (const String& s1, const wchar_t* s2) noe | |||
| JUCE_API bool JUCE_CALLTYPE operator!= (const String& s1, const wchar_t* s2) noexcept { return s1.compare (s2) != 0; } | |||
| JUCE_API bool JUCE_CALLTYPE operator== (const String& s1, StringRef s2) noexcept { return s1.getCharPointer().compare (s2.text) == 0; } | |||
| JUCE_API bool JUCE_CALLTYPE operator!= (const String& s1, StringRef s2) noexcept { return s1.getCharPointer().compare (s2.text) != 0; } | |||
| JUCE_API bool JUCE_CALLTYPE operator< (const String& s1, StringRef s2) noexcept { return s1.getCharPointer().compare (s2.text) < 0; } | |||
| JUCE_API bool JUCE_CALLTYPE operator<= (const String& s1, StringRef s2) noexcept { return s1.getCharPointer().compare (s2.text) <= 0; } | |||
| JUCE_API bool JUCE_CALLTYPE operator> (const String& s1, StringRef s2) noexcept { return s1.getCharPointer().compare (s2.text) > 0; } | |||
| JUCE_API bool JUCE_CALLTYPE operator>= (const String& s1, StringRef s2) noexcept { return s1.getCharPointer().compare (s2.text) >= 0; } | |||
| JUCE_API bool JUCE_CALLTYPE operator== (const String& s1, const CharPointer_UTF8 s2) noexcept { return s1.getCharPointer().compare (s2) == 0; } | |||
| JUCE_API bool JUCE_CALLTYPE operator!= (const String& s1, const CharPointer_UTF8 s2) noexcept { return s1.getCharPointer().compare (s2) != 0; } | |||
| JUCE_API bool JUCE_CALLTYPE operator== (const String& s1, const CharPointer_UTF16 s2) noexcept { return s1.getCharPointer().compare (s2) == 0; } | |||
| JUCE_API bool JUCE_CALLTYPE operator!= (const String& s1, const CharPointer_UTF16 s2) noexcept { return s1.getCharPointer().compare (s2) != 0; } | |||
| JUCE_API bool JUCE_CALLTYPE operator== (const String& s1, const CharPointer_UTF32 s2) noexcept { return s1.getCharPointer().compare (s2) == 0; } | |||
| JUCE_API bool JUCE_CALLTYPE operator!= (const String& s1, const CharPointer_UTF32 s2) noexcept { return s1.getCharPointer().compare (s2) != 0; } | |||
| JUCE_API bool JUCE_CALLTYPE operator> (const String& s1, const String& s2) noexcept { return s1.compare (s2) > 0; } | |||
| JUCE_API bool JUCE_CALLTYPE operator< (const String& s1, const String& s2) noexcept { return s1.compare (s2) < 0; } | |||
| JUCE_API bool JUCE_CALLTYPE operator>= (const String& s1, const String& s2) noexcept { return s1.compare (s2) >= 0; } | |||
| JUCE_API bool JUCE_CALLTYPE operator<= (const String& s1, const String& s2) noexcept { return s1.compare (s2) <= 0; } | |||
| bool String::equalsIgnoreCase (const wchar_t* const t) const noexcept | |||
| { | |||
| @@ -1513,15 +1513,6 @@ JUCE_API bool JUCE_CALLTYPE operator!= (const String& string1, CharPointer_UTF16 | |||
| /** Case-sensitive comparison of two strings. */ | |||
| JUCE_API bool JUCE_CALLTYPE operator!= (const String& string1, CharPointer_UTF32 string2) noexcept; | |||
| /** Case-sensitive comparison of two strings. */ | |||
| JUCE_API bool JUCE_CALLTYPE operator> (const String& string1, const String& string2) noexcept; | |||
| /** Case-sensitive comparison of two strings. */ | |||
| JUCE_API bool JUCE_CALLTYPE operator< (const String& string1, const String& string2) noexcept; | |||
| /** Case-sensitive comparison of two strings. */ | |||
| JUCE_API bool JUCE_CALLTYPE operator>= (const String& string1, const String& string2) noexcept; | |||
| /** Case-sensitive comparison of two strings. */ | |||
| JUCE_API bool JUCE_CALLTYPE operator<= (const String& string1, const String& string2) noexcept; | |||
| //============================================================================== | |||
| /** This operator allows you to write a juce String directly to std output streams. | |||
| This is handy for writing strings to std::cout, std::cerr, etc. | |||
| @@ -111,6 +111,14 @@ public: | |||
| bool operator== (const String& s) const noexcept { return text.compare (s.getCharPointer()) == 0; } | |||
| /** Compares this StringRef with a String. */ | |||
| bool operator!= (const String& s) const noexcept { return text.compare (s.getCharPointer()) != 0; } | |||
| /** Compares this StringRef with a String. */ | |||
| bool operator< (const String& s) const noexcept { return text.compare (s.getCharPointer()) < 0; } | |||
| /** Compares this StringRef with a String. */ | |||
| bool operator<= (const String& s) const noexcept { return text.compare (s.getCharPointer()) <= 0; } | |||
| /** Compares this StringRef with a String. */ | |||
| bool operator> (const String& s) const noexcept { return text.compare (s.getCharPointer()) > 0; } | |||
| /** Compares this StringRef with a String. */ | |||
| bool operator>= (const String& s) const noexcept { return text.compare (s.getCharPointer()) >= 0; } | |||
| /** Case-sensitive comparison of two StringRefs. */ | |||
| bool operator== (StringRef s) const noexcept { return text.compare (s.text) == 0; } | |||
| @@ -133,6 +141,14 @@ public: | |||
| JUCE_API bool JUCE_CALLTYPE operator== (const String& string1, StringRef string2) noexcept; | |||
| /** Case-sensitive comparison of two strings. */ | |||
| JUCE_API bool JUCE_CALLTYPE operator!= (const String& string1, StringRef string2) noexcept; | |||
| /** Case-sensitive comparison of two strings. */ | |||
| JUCE_API bool JUCE_CALLTYPE operator< (const String& string1, StringRef string2) noexcept; | |||
| /** Case-sensitive comparison of two strings. */ | |||
| JUCE_API bool JUCE_CALLTYPE operator<= (const String& string1, StringRef string2) noexcept; | |||
| /** Case-sensitive comparison of two strings. */ | |||
| JUCE_API bool JUCE_CALLTYPE operator> (const String& string1, StringRef string2) noexcept; | |||
| /** Case-sensitive comparison of two strings. */ | |||
| JUCE_API bool JUCE_CALLTYPE operator>= (const String& string1, StringRef string2) noexcept; | |||
| inline String operator+ (String s1, StringRef s2) { return s1 += String (s2.text); } | |||
| inline String operator+ (StringRef s1, const String& s2) { return String (s1.text) + s2; } | |||