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/MSWindowsClipboardAnyTextConverter.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/lib/platform/MSWindowsClipboardAnyTextConverter.h') diff --git a/src/lib/platform/MSWindowsClipboardAnyTextConverter.h b/src/lib/platform/MSWindowsClipboardAnyTextConverter.h index cabdb0b..622d281 100644 --- a/src/lib/platform/MSWindowsClipboardAnyTextConverter.h +++ b/src/lib/platform/MSWindowsClipboardAnyTextConverter.h @@ -31,8 +31,8 @@ public: virtual IClipboard::EFormat getFormat() const; virtual UINT getWin32Format() const = 0; - virtual HANDLE fromIClipboard(const String&) const; - virtual String toIClipboard(HANDLE) const; + virtual HANDLE fromIClipboard(const std::string&) const; + virtual std::string toIClipboard(HANDLE) const; protected: //! Convert from IClipboard format @@ -40,18 +40,18 @@ protected: Do UTF-8 conversion only. Memory handle allocation and linefeed conversion is done by this class. doFromIClipboard() must include the nul terminator in the returned string (not - including the String's nul terminator). + including the std::string's nul terminator). */ - virtual String doFromIClipboard(const String&) const = 0; + virtual std::string doFromIClipboard(const std::string&) const = 0; //! Convert to IClipboard format /*! Do UTF-8 conversion only. Memory handle allocation and linefeed conversion is done by this class. */ - virtual String doToIClipboard(const String&) const = 0; + virtual std::string doToIClipboard(const std::string&) const = 0; private: - String convertLinefeedToWin32(const String&) const; - String convertLinefeedToUnix(const String&) const; + std::string convertLinefeedToWin32(const std::string&) const; + std::string convertLinefeedToUnix(const std::string&) const; }; -- cgit v1.2.3