From fbc30002ab3438356c0476e70c4577a0310d52c0 Mon Sep 17 00:00:00 2001
From: Unit 193 <unit193@unit193.net>
Date: Tue, 21 Jul 2020 06:15:04 -0400
Subject: New upstream version 2.3.3+dfsg.

---
 src/lib/platform/XWindowsUtil.h | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

(limited to 'src/lib/platform/XWindowsUtil.h')

diff --git a/src/lib/platform/XWindowsUtil.h b/src/lib/platform/XWindowsUtil.h
index 4df888f..f5b3ea8 100644
--- a/src/lib/platform/XWindowsUtil.h
+++ b/src/lib/platform/XWindowsUtil.h
@@ -18,7 +18,6 @@
 
 #pragma once
 
-#include "base/String.h"
 #include "base/EventTypes.h"
 #include "common/stdmap.h"
 #include "common/stdvector.h"
@@ -29,6 +28,8 @@
 #    include <X11/Xlib.h>
 #endif
 
+#include <string>
+
 //! X11 utility functions
 class XWindowsUtil {
 public:
@@ -42,10 +43,9 @@ public:
     if \c format is not NULL.  If \c deleteProperty is true then the
     property is deleted after being read.
     */
-    static bool            getWindowProperty(Display*,
-                            Window window, Atom property,
-                            String* data, Atom* type,
-                            SInt32* format, bool deleteProperty);
+    static bool getWindowProperty(Display*, Window window, Atom property,
+                                  std::string* data, Atom* type,
+                                  SInt32* format, bool deleteProperty);
 
     //! Set property
     /*!
@@ -81,44 +81,42 @@ public:
     /*!
     Converts \p atom to its string representation.
     */
-    static String        atomToString(Display*, Atom atom);
+    static std::string atomToString(Display*, Atom atom);
 
     //! Convert several Atoms to a string
     /*!
     Converts each atom in \p atoms to its string representation and
     concatenates the results.
     */
-    static String        atomsToString(Display* display,
-                            const Atom* atom, UInt32 num);
+    static std::string atomsToString(Display* display, const Atom* atom, UInt32 num);
 
     //! Prepare a property of atoms for use
     /*!
     64-bit systems may need to modify a property's data if it's a
     list of Atoms before using it.
     */
-    static void            convertAtomProperty(String& data);
+    static void convertAtomProperty(std::string& data);
 
     //! Append an Atom to property data
     /*!
     Converts \p atom to a 32-bit on-the-wire format and appends it to
     \p data.
     */
-    static void            appendAtomData(String& data, Atom atom);
+    static void appendAtomData(std::string& data, Atom atom);
 
     //! Replace an Atom in property data
     /*!
     Converts \p atom to a 32-bit on-the-wire format and replaces the atom
     at index \p index in \p data.
     */
-    static void            replaceAtomData(String& data,
-                            UInt32 index, Atom atom);
+    static void replaceAtomData(std::string& data, UInt32 index, Atom atom);
 
     //! Append an Time to property data
     /*!
     Converts \p time to a 32-bit on-the-wire format and appends it to
     \p data.
     */
-    static void            appendTimeData(String& data, Time time);
+    static void appendTimeData(std::string& data, Time time);
 
     //! X11 error handler
     /*!
-- 
cgit v1.2.3