New upstream version 2.3.3+dfsg.upstream/2.3.3+dfsg

1 files changed, 6 insertions, 8 deletions

diff --git a/src/lib/platform/XWindowsClipboardAnyBitmapConverter.h b/src/lib/platform/XWindowsClipboardAnyBitmapConverter.h
index d723a33..861b1b6 100644
--- a/src/lib/platform/XWindowsClipboardAnyBitmapConverter.h
+++ b/src/lib/platform/XWindowsClipboardAnyBitmapConverter.h
@@ -32,29 +32,27 @@ public:
                         getFormat() const;
     virtual Atom        getAtom() const = 0;
     virtual int            getDataSize() const;
-    virtual String        fromIClipboard(const String&) const;
-    virtual String        toIClipboard(const String&) const;
+    virtual std::string fromIClipboard(const std::string&) const;
+    virtual std::string toIClipboard(const std::string&) const;
 
 protected:
     //! Convert from IClipboard format
     /*!
     Convert raw BGR pixel data to another image format.
     */
-    virtual String        doBGRFromIClipboard(const UInt8* bgrData,
-                            UInt32 w, UInt32 h) const = 0;
+    virtual std::string doBGRFromIClipboard(const UInt8* bgrData, UInt32 w, UInt32 h) const = 0;
 
     //! Convert from IClipboard format
     /*!
     Convert raw BGRA pixel data to another image format.
     */
-    virtual String        doBGRAFromIClipboard(const UInt8* bgrData,
-                            UInt32 w, UInt32 h) const = 0;
+    virtual std::string doBGRAFromIClipboard(const UInt8* bgrData, UInt32 w, UInt32 h) const = 0;
 
     //! Convert to IClipboard format
     /*!
     Convert an image into raw BGR or BGRA image data and store the
     width, height, and image depth (24 or 32).
     */
-    virtual String        doToIClipboard(const String&,
-                            UInt32& w, UInt32& h, UInt32& depth) const = 0;
+    virtual std::string doToIClipboard(const std::string&, UInt32& w, UInt32& h,
+                                       UInt32& depth) const = 0;
 };