Update upstream source from tag 'upstream/2.3.3+dfsg'

Update to upstream version '2.3.3+dfsg'
with Debian dir f7eeed313bc1a4c2bda69f04f0316ee29651397f

1 files changed, 4 insertions, 5 deletions

diff --git a/src/lib/platform/OSXClipboardHTMLConverter.h b/src/lib/platform/OSXClipboardHTMLConverter.h
index 21c2b82..a821e25 100644
--- a/src/lib/platform/OSXClipboardHTMLConverter.h
+++ b/src/lib/platform/OSXClipboardHTMLConverter.h
@@ -34,11 +34,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);
 };