New upstream version 2.3.3+dfsg.upstream/2.3.3+dfsg

1 files changed, 4 insertions, 5 deletions

diff --git a/src/lib/platform/OSXClipboardTextConverter.h b/src/lib/platform/OSXClipboardTextConverter.h
index 55d82ce..8211f1e 100644
--- a/src/lib/platform/OSXClipboardTextConverter.h
+++ b/src/lib/platform/OSXClipboardTextConverter.h
@@ -32,11 +32,10 @@ public:
 
 protected:
     // OSXClipboardAnyTextConverter overrides
-    virtual String        doFromIClipboard(const String&) const;
-    virtual String        doToIClipboard(const String&) const;
+    virtual std::string doFromIClipboard(const std::string&) const;
+    virtual std::string doToIClipboard(const std::string&) const;
 
     // generic encoding converter
-    static String        convertString(const String& data,  
-                            CFStringEncoding fromEncoding,
-                            CFStringEncoding toEncoding);
+    static std::string convertString(const std::string& data, CFStringEncoding fromEncoding,
+                                     CFStringEncoding toEncoding);
 };