diff options
| author | 2020-07-21 06:15:16 -0400 | |
|---|---|---|
| committer | 2020-07-21 06:15:16 -0400 | |
| commit | 37a7155ea7c504b308a8afa642c653a12bbe5f84 (patch) | |
| tree | bd68ea5d2a2400dcd04b1aa85617534e66aba94c /src/lib/platform/OSXClipboardAnyBitmapConverter.cpp | |
| parent | 1ae09e76cde035d716763fc88b570535884cd50f (diff) | |
| parent | fbc30002ab3438356c0476e70c4577a0310d52c0 (diff) | |
Update upstream source from tag 'upstream/2.3.3+dfsg'
Update to upstream version '2.3.3+dfsg'
with Debian dir f7eeed313bc1a4c2bda69f04f0316ee29651397f
Diffstat (limited to 'src/lib/platform/OSXClipboardAnyBitmapConverter.cpp')
| -rw-r--r-- | src/lib/platform/OSXClipboardAnyBitmapConverter.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/lib/platform/OSXClipboardAnyBitmapConverter.cpp b/src/lib/platform/OSXClipboardAnyBitmapConverter.cpp index 73f64c7..8b1b6d4 100644 --- a/src/lib/platform/OSXClipboardAnyBitmapConverter.cpp +++ b/src/lib/platform/OSXClipboardAnyBitmapConverter.cpp @@ -35,14 +35,12 @@ OSXClipboardAnyBitmapConverter::getFormat() const return IClipboard::kBitmap; } -String -OSXClipboardAnyBitmapConverter::fromIClipboard(const String& data) const +std::string OSXClipboardAnyBitmapConverter::fromIClipboard(const std::string& data) const { return doFromIClipboard(data); } -String -OSXClipboardAnyBitmapConverter::toIClipboard(const String& data) const +std::string OSXClipboardAnyBitmapConverter::toIClipboard(const std::string& data) const { return doToIClipboard(data); } |
