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/OSXClipboardBMPConverter.h b/src/lib/platform/OSXClipboardBMPConverter.h
index 400831d..f841bee 100644
--- a/src/lib/platform/OSXClipboardBMPConverter.h
+++ b/src/lib/platform/OSXClipboardBMPConverter.h
@@ -34,11 +34,10 @@ public:
                         getOSXFormat() const;
 
     // OSXClipboardAnyBMPConverter overrides
-    virtual String        fromIClipboard(const String&) const;
-    virtual String        toIClipboard(const String&) const;
+    virtual std::string fromIClipboard(const std::string&) const;
+    virtual std::string toIClipboard(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);
 };