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, 6 insertions, 10 deletions

diff --git a/src/lib/platform/OSXClipboardAnyTextConverter.cpp b/src/lib/platform/OSXClipboardAnyTextConverter.cpp
index 7095006..ae8dc4a 100644
--- a/src/lib/platform/OSXClipboardAnyTextConverter.cpp
+++ b/src/lib/platform/OSXClipboardAnyTextConverter.cpp
@@ -40,15 +40,13 @@ OSXClipboardAnyTextConverter::getFormat() const
     return IClipboard::kText;
 }
 
-String
-OSXClipboardAnyTextConverter::fromIClipboard(const String& data) const
+std::string OSXClipboardAnyTextConverter::fromIClipboard(const std::string& data) const
 {
     // convert linefeeds and then convert to desired encoding
     return doFromIClipboard(convertLinefeedToMacOS(data));
 }
 
-String
-OSXClipboardAnyTextConverter::toIClipboard(const String& data) const
+std::string OSXClipboardAnyTextConverter::toIClipboard(const std::string& data) const
 {
     // convert text then newlines
     return convertLinefeedToUnix(doToIClipboard(data));
@@ -68,21 +66,19 @@ isCR(char ch)
     return (ch == '\r');
 }
 
-String
-OSXClipboardAnyTextConverter::convertLinefeedToMacOS(const String& src)
+std::string OSXClipboardAnyTextConverter::convertLinefeedToMacOS(const std::string& src)
 {
     // note -- we assume src is a valid UTF-8 string
-    String copy = src;
+    std::string copy = src;
 
     std::replace_if(copy.begin(), copy.end(), isLF, '\r');
 
     return copy;
 }
 
-String
-OSXClipboardAnyTextConverter::convertLinefeedToUnix(const String& src)
+std::string OSXClipboardAnyTextConverter::convertLinefeedToUnix(const std::string& src)
 {
-    String copy = src;
+    std::string copy = src;
 
     std::replace_if(copy.begin(), copy.end(), isCR, '\n');