From fbc30002ab3438356c0476e70c4577a0310d52c0 Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Tue, 21 Jul 2020 06:15:04 -0400 Subject: New upstream version 2.3.3+dfsg. --- src/lib/platform/OSXClipboardUTF16Converter.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/lib/platform/OSXClipboardUTF16Converter.cpp') diff --git a/src/lib/platform/OSXClipboardUTF16Converter.cpp b/src/lib/platform/OSXClipboardUTF16Converter.cpp index 02d8fa3..8411e92 100644 --- a/src/lib/platform/OSXClipboardUTF16Converter.cpp +++ b/src/lib/platform/OSXClipboardUTF16Converter.cpp @@ -40,15 +40,13 @@ OSXClipboardUTF16Converter::getOSXFormat() const return CFSTR("public.utf16-plain-text"); } -String -OSXClipboardUTF16Converter::doFromIClipboard(const String& data) const +std::string OSXClipboardUTF16Converter::doFromIClipboard(const std::string& data) const { // convert and add nul terminator return Unicode::UTF8ToUTF16(data); } -String -OSXClipboardUTF16Converter::doToIClipboard(const String& data) const +std::string OSXClipboardUTF16Converter::doToIClipboard(const std::string& data) const { // convert and strip nul terminator return Unicode::UTF16ToUTF8(data); -- cgit v1.2.3