diff options
Diffstat (limited to 'src/lib/platform/XWindowsClipboard.h')
| -rw-r--r-- | src/lib/platform/XWindowsClipboard.h | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/src/lib/platform/XWindowsClipboard.h b/src/lib/platform/XWindowsClipboard.h index f00c3fc..091036e 100644 --- a/src/lib/platform/XWindowsClipboard.h +++ b/src/lib/platform/XWindowsClipboard.h @@ -90,12 +90,12 @@ 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; private: // remove all converters from our list @@ -148,7 +148,7 @@ private: // cannot be performed (in which case *actualTarget == None). bool readClipboard(Display* display, Atom selection, Atom target, - Atom* actualTarget, String* data); + Atom* actualTarget, std::string* data); private: bool processEvent(Display* display, XEvent* event); @@ -169,7 +169,7 @@ private: bool m_reading; // the converted selection data - String* m_data; + std::string* m_data; // the actual type of the data. if this is None then the // selection owner cannot convert to the requested type. @@ -224,8 +224,8 @@ private: class Reply { public: Reply(Window, Atom target, ::Time); - Reply(Window, Atom target, ::Time, Atom property, - const String& data, Atom type, int format); + Reply(Window, Atom target, ::Time, Atom property, const std::string& data, + Atom type, int format); public: // information about the request @@ -241,7 +241,7 @@ private: bool m_done; // the data to send and its type and format - String m_data; + std::string m_data; Atom m_type; int m_format; @@ -254,8 +254,7 @@ private: // ICCCM interoperability methods void icccmFillCache(); - bool icccmGetSelection(Atom target, - Atom* actualTarget, String* data) const; + bool icccmGetSelection(Atom target, Atom* actualTarget, std::string* data) const; Time icccmGetTime() const; // motif interoperability methods @@ -263,8 +262,7 @@ private: void motifUnlockClipboard() const; bool motifOwnsClipboard() const; void motifFillCache(); - bool motifGetSelection(const MotifClipFormat*, - Atom* actualTarget, String* data) const; + bool motifGetSelection(const MotifClipFormat*, Atom* actualTarget, std::string* data) const; Time motifGetTime() const; // reply methods @@ -281,8 +279,8 @@ private: bool wasOwnedAtTime(::Time) const; // data conversion methods - Atom getTargetsData(String&, int* format) const; - Atom getTimestampData(String&, int* format) const; + Atom getTargetsData(std::string&, int* format) const; + Atom getTimestampData(std::string&, int* format) const; private: typedef std::vector<IXWindowsClipboardConverter*> ConverterList; @@ -306,7 +304,7 @@ private: bool m_cached; Time m_cacheTime; bool m_added[kNumFormats]; - String m_data[kNumFormats]; + std::string m_data[kNumFormats]; // conversion request replies ReplyMap m_replies; @@ -368,14 +366,14 @@ public: getFormat(). The return data will be in the X selection format returned by getAtom(). */ - virtual String fromIClipboard(const String&) const = 0; + virtual std::string fromIClipboard(const std::string&) const = 0; //! Convert to IClipboard format /*! Convert from the X selection format to the IClipboard format (i.e., the reverse of fromIClipboard()). */ - virtual String toIClipboard(const String&) const = 0; + virtual std::string toIClipboard(const std::string&) const = 0; //@} }; |