Update upstream source from tag 'upstream/2.3.3+dfsg'

Update to upstream version '2.3.3+dfsg'
with Debian dir f7eeed313bc1a4c2bda69f04f0316ee29651397f

1 files changed, 7 insertions, 7 deletions

diff --git a/src/lib/platform/MSWindowsClipboard.h b/src/lib/platform/MSWindowsClipboard.h
index 3e92a39..35ccb56 100644
--- a/src/lib/platform/MSWindowsClipboard.h
+++ b/src/lib/platform/MSWindowsClipboard.h
@@ -55,21 +55,21 @@ public:
 
     // IClipboard overrides
     virtual bool        empty();
-    virtual void        add(EFormat, const String& data);
+    virtual void add(EFormat, const std::string& data);
     virtual bool        open(Time) const;
     virtual void        close() const;
     virtual Time        getTime() const;
     virtual bool        has(EFormat) const;
-    virtual String        get(EFormat) const;
+    virtual std::string get(EFormat) const;
 
     void setFacade(IMSWindowsClipboardFacade& facade);
 
 private:
     void                clearConverters();
 
-    UINT                convertFormatToWin32(EFormat) const;
-    HANDLE                convertTextToWin32(const String& data) const;
-    String                convertTextFromWin32(HANDLE) const;
+    UINT convertFormatToWin32(EFormat) const;
+    HANDLE convertTextToWin32(const std::string& data) const;
+    std::string convertTextFromWin32(HANDLE) const;
 
     static UINT            getOwnershipFormat();
 
@@ -105,9 +105,9 @@ public:
     // the input data must be in the IClipboard format returned by
     // getFormat().  the return data will be in the win32 clipboard
     // format returned by getWin32Format(), allocated by GlobalAlloc().
-    virtual HANDLE        fromIClipboard(const String&) const = 0;
+    virtual HANDLE fromIClipboard(const std::string&) const = 0;
 
     // convert from the win32 clipboard format to the IClipboard format
     // (i.e., the reverse of fromIClipboard()).
-    virtual String        toIClipboard(HANDLE data) const = 0;
+    virtual std::string toIClipboard(HANDLE data) const = 0;
 };