| Index: Source/WTF/wtf/text/WTFString.h
|
| diff --git a/Source/WTF/wtf/text/WTFString.h b/Source/WTF/wtf/text/WTFString.h
|
| index 9c0fc27fe3807b8a4d0658ab7f13719c26abab8c..fc72a31a881b725e9ab1bb6d8cbea49db92696d9 100644
|
| --- a/Source/WTF/wtf/text/WTFString.h
|
| +++ b/Source/WTF/wtf/text/WTFString.h
|
| @@ -32,24 +32,6 @@
|
| #include <objc/objc.h>
|
| #endif
|
|
|
| -#if PLATFORM(QT)
|
| -QT_BEGIN_NAMESPACE
|
| -class QString;
|
| -QT_END_NAMESPACE
|
| -#endif
|
| -
|
| -#if PLATFORM(WX)
|
| -class wxString;
|
| -#endif
|
| -
|
| -#if PLATFORM(BLACKBERRY)
|
| -namespace BlackBerry {
|
| -namespace Platform {
|
| -class String;
|
| -}
|
| -}
|
| -#endif
|
| -
|
| namespace WTF {
|
|
|
| class CString;
|
| @@ -360,11 +342,7 @@ public:
|
| // Return the string with case folded for case insensitive comparison.
|
| WTF_EXPORT_STRING_API String foldCase() const;
|
|
|
| -#if !PLATFORM(QT)
|
| WTF_EXPORT_STRING_API static String format(const char *, ...) WTF_ATTRIBUTE_PRINTF(1, 2);
|
| -#else
|
| - WTF_EXPORT_STRING_API static String format(const char *, ...);
|
| -#endif
|
|
|
| // Returns an uninitialized string. The characters needs to be written
|
| // into the buffer returned in data before the returned string is used.
|
| @@ -426,22 +404,6 @@ public:
|
| operator NSString*() const { if (!m_impl) return @""; return *m_impl; }
|
| #endif
|
|
|
| -#if PLATFORM(QT)
|
| - WTF_EXPORT_STRING_API String(const QString&);
|
| - WTF_EXPORT_STRING_API String(const QStringRef&);
|
| - WTF_EXPORT_STRING_API operator QString() const;
|
| -#endif
|
| -
|
| -#if PLATFORM(WX)
|
| - WTF_EXPORT_PRIVATE String(const wxString&);
|
| - WTF_EXPORT_PRIVATE operator wxString() const;
|
| -#endif
|
| -
|
| -#if PLATFORM(BLACKBERRY)
|
| - String(const BlackBerry::Platform::String&);
|
| - operator BlackBerry::Platform::String() const;
|
| -#endif
|
| -
|
| WTF_EXPORT_STRING_API static String make8BitFrom16BitSource(const UChar*, size_t);
|
| template<size_t inlineCapacity>
|
| static String make8BitFrom16BitSource(const Vector<UChar, inlineCapacity>& buffer)
|
|
|