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/MSWindowsClipboardUTF16Converter.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'src/lib/platform/MSWindowsClipboardUTF16Converter.cpp') diff --git a/src/lib/platform/MSWindowsClipboardUTF16Converter.cpp b/src/lib/platform/MSWindowsClipboardUTF16Converter.cpp index 0f8642a..4b72717 100644 --- a/src/lib/platform/MSWindowsClipboardUTF16Converter.cpp +++ b/src/lib/platform/MSWindowsClipboardUTF16Converter.cpp @@ -40,20 +40,18 @@ MSWindowsClipboardUTF16Converter::getWin32Format() const return CF_UNICODETEXT; } -String -MSWindowsClipboardUTF16Converter::doFromIClipboard(const String& data) const +std::string MSWindowsClipboardUTF16Converter::doFromIClipboard(const std::string& data) const { // convert and add nul terminator return Unicode::UTF8ToUTF16(data).append(sizeof(wchar_t), 0); } -String -MSWindowsClipboardUTF16Converter::doToIClipboard(const String& data) const +std::string MSWindowsClipboardUTF16Converter::doToIClipboard(const std::string& data) const { // convert and strip nul terminator - String dst = Unicode::UTF16ToUTF8(data); - String::size_type n = dst.find('\0'); - if (n != String::npos) { + std::string dst = Unicode::UTF16ToUTF8(data); + std::string::size_type n = dst.find('\0'); + if (n != std::string::npos) { dst.erase(n); } return dst; -- cgit v1.2.3