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, 4 deletions

diff --git a/src/lib/platform/OSXClipboardAnyBitmapConverter.h b/src/lib/platform/OSXClipboardAnyBitmapConverter.h
index 277e75d..78f7809 100644
--- a/src/lib/platform/OSXClipboardAnyBitmapConverter.h
+++ b/src/lib/platform/OSXClipboardAnyBitmapConverter.h
@@ -30,19 +30,19 @@ public:
     virtual IClipboard::EFormat
                         getFormat() const;
     virtual CFStringRef    getOSXFormat() const = 0;
-    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;
 
 protected:
     //! Convert from IClipboard format
     /*!
      Do UTF-8 conversion and linefeed conversion.
     */
-    virtual String        doFromIClipboard(const String&) const = 0;
+    virtual std::string doFromIClipboard(const std::string&) const = 0;
 
     //! Convert to IClipboard format
     /*!
      Do UTF-8 conversion and Linefeed conversion.
     */
-    virtual String        doToIClipboard(const String&) const = 0;
+    virtual std::string doToIClipboard(const std::string&) const = 0;
 };