From fbc30002ab3438356c0476e70c4577a0310d52c0 Mon Sep 17 00:00:00 2001
From: Unit 193 <unit193@unit193.net>
Date: Tue, 21 Jul 2020 06:15:04 -0400
Subject: New upstream version 2.3.3+dfsg.

---
 src/lib/platform/OSXClipboardBMPConverter.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'src/lib/platform/OSXClipboardBMPConverter.cpp')

diff --git a/src/lib/platform/OSXClipboardBMPConverter.cpp b/src/lib/platform/OSXClipboardBMPConverter.cpp
index 51c44ec..ac74fbb 100644
--- a/src/lib/platform/OSXClipboardBMPConverter.cpp
+++ b/src/lib/platform/OSXClipboardBMPConverter.cpp
@@ -91,8 +91,7 @@ OSXClipboardBMPConverter::getOSXFormat() const
     return CFSTR("com.microsoft.bmp");
 }
 
-String
-OSXClipboardBMPConverter::fromIClipboard(const String& bmp) const
+std::string OSXClipboardBMPConverter::fromIClipboard(const std::string& bmp) const
 {
     LOG((CLOG_DEBUG1 "ENTER OSXClipboardBMPConverter::doFromIClipboard()"));
     // create BMP image
@@ -104,21 +103,20 @@ OSXClipboardBMPConverter::fromIClipboard(const String& bmp) const
     toLE(dst, static_cast<UInt16>(0));
     toLE(dst, static_cast<UInt16>(0));
     toLE(dst, static_cast<UInt32>(14 + 40));
-    return String(reinterpret_cast<const char*>(header), 14) + bmp;
+    return std::string(reinterpret_cast<const char*>(header), 14) + bmp;
 }
 
-String
-OSXClipboardBMPConverter::toIClipboard(const String& bmp) const
+std::string OSXClipboardBMPConverter::toIClipboard(const std::string& bmp) const
 {
     // make sure data is big enough for a BMP file
     if (bmp.size() <= 14 + 40) {
-        return String();
+        return {};
     }
 
     // check BMP file header
     const UInt8* rawBMPHeader = reinterpret_cast<const UInt8*>(bmp.data());
     if (rawBMPHeader[0] != 'B' || rawBMPHeader[1] != 'M') {
-        return String();
+        return {};
     }
 
     // get offset to image data
-- 
cgit v1.2.3