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

1 files changed, 75 insertions, 92 deletions

diff --git a/src/lib/server/Config.h b/src/lib/server/Config.h
index 69b01c4..c459393 100644
--- a/src/lib/server/Config.h
+++ b/src/lib/server/Config.h
@@ -23,7 +23,6 @@
 #include "barrier/protocol_types.h"
 #include "barrier/IPlatformScreen.h"
 #include "net/NetworkAddress.h"
-#include "base/String.h"
 #include "base/XBase.h"
 #include "common/stdmap.h"
 #include "common/stdset.h"
@@ -37,11 +36,11 @@ class IEventQueue;
 namespace std {
 template <>
 struct iterator_traits<Config> {
-    typedef String                        value_type;
+    typedef std::string value_type;
     typedef ptrdiff_t                    difference_type;
     typedef bidirectional_iterator_tag    iterator_category;
-    typedef String*                    pointer;
-    typedef String&                    reference;
+    typedef std::string* pointer;
+    typedef std::string& reference;
 };
 };
 
@@ -64,12 +63,12 @@ public:
     public:
         CellEdge(EDirection side, float position);
         CellEdge(EDirection side, const Interval&);
-        CellEdge(const String& name, EDirection side, const Interval&);
+        CellEdge(const std::string& name, EDirection side, const Interval&);
         ~CellEdge();
 
         Interval        getInterval() const;
-        void            setName(const String& newName);
-        String            getName() const;
+        void setName(const std::string& newName);
+        std::string getName() const;
         EDirection        getSide() const;
         bool            overlaps(const CellEdge&) const;
         bool            isInside(float x) const;
@@ -88,11 +87,10 @@ public:
         bool            operator!=(const CellEdge&) const;
 
     private:
-        void            init(const String& name, EDirection side,
-                            const Interval&);
+        void init(const std::string& name, EDirection side, const Interval&);
 
     private:
-        String            m_name;
+        std::string m_name;
         EDirection        m_side;
         Interval        m_interval;
     };
@@ -100,13 +98,13 @@ public:
 private:
     class Name {
     public:
-        Name(Config*, const String& name);
+        Name(Config*, const std::string& name);
 
-        bool            operator==(const String& name) const;
+        bool operator==(const std::string& name) const;
 
     private:
         Config*            m_config;
-        String            m_name;
+        std::string m_name;
     };
 
     class Cell {
@@ -120,7 +118,7 @@ private:
         void            remove(EDirection side);
         void            remove(EDirection side, float position);
         void            remove(const Name& destinationName);
-        void            rename(const Name& oldName, const String& newName);
+        void            rename(const Name& oldName, const std::string& newName);
 
         bool            hasEdge(const CellEdge&) const;
         bool            overlaps(const CellEdge&) const;
@@ -140,8 +138,8 @@ private:
     public:
         ScreenOptions    m_options;
     };
-    typedef std::map<String, Cell, barrier::string::CaselessCmp> CellMap;
-    typedef std::map<String, String, barrier::string::CaselessCmp> NameMap;
+    typedef std::map<std::string, Cell, barrier::string::CaselessCmp> CellMap;
+    typedef std::map<std::string, std::string, barrier::string::CaselessCmp> NameMap;
 
 public:
     typedef Cell::const_iterator link_const_iterator;
@@ -156,8 +154,8 @@ public:
             m_i = i.m_i;
             return *this;
         }
-        String            operator*() { return m_i->first; }
-        const String*    operator->() { return &(m_i->first); }
+        std::string operator*() { return m_i->first; }
+        const std::string* operator->() { return &(m_i->first); }
         const_iterator&    operator++() { ++m_i;  return *this; }
         const_iterator    operator++(int) { return const_iterator(m_i++); }
         const_iterator&    operator--() { --m_i;  return *this; }
@@ -188,15 +186,14 @@ public:
     Adds a screen, returning true iff successful.  If a screen or
     alias with the given name exists then it fails.
     */
-    bool                addScreen(const String& name);
+    bool addScreen(const std::string& name);
 
     //! Rename screen
     /*!
     Renames a screen.  All references to the name are updated.
     Returns true iff successful.
     */
-    bool                renameScreen(const String& oldName,
-                            const String& newName);
+    bool renameScreen(const std::string& oldName, const std::string& newName);
 
     //! Remove screen
     /*!
@@ -204,7 +201,7 @@ public:
     disconnects any connections to the screen.  \c name may be an
     alias.
     */
-    void                removeScreen(const String& name);
+    void removeScreen(const std::string& name);
 
     //! Remove all screens
     /*!
@@ -219,22 +216,21 @@ public:
     Returns false if the alias name already exists or the canonical
     name is unknown, otherwise returns true.
     */
-    bool                addAlias(const String& canonical,
-                            const String& alias);
+    bool addAlias(const std::string& canonical, const std::string& alias);
 
     //! Remove alias
     /*!
     Removes an alias for a screen name.  It returns false if the
     alias is unknown or a canonical name, otherwise returns true.
     */
-    bool                removeAlias(const String& alias);
+    bool removeAlias(const std::string& alias);
 
     //! Remove aliases
     /*!
     Removes all aliases for a canonical screen name.  It returns false
     if the canonical name is unknown, otherwise returns true.
     */
-    bool                removeAliases(const String& canonical);
+    bool removeAliases(const std::string& canonical);
 
     //! Remove all aliases
     /*!
@@ -258,19 +254,15 @@ public:
     and all of \c srcStart, \c srcEnd, \c dstStart, or \c dstEnd must
     be inside the range [0,1].
     */
-    bool                connect(const String& srcName,
-                            EDirection srcSide,
-                            float srcStart, float srcEnd,
-                            const String& dstName,
-                            float dstStart, float dstEnd);
+    bool connect(const std::string& srcName, EDirection srcSide, float srcStart, float srcEnd,
+                 const std::string& dstName, float dstStart, float dstEnd);
 
     //! Disconnect screens
     /*!
     Removes all connections created by connect() on side \c srcSide.
     Returns false if \c srcName is unknown.
     */
-    bool                disconnect(const String& srcName,
-                            EDirection srcSide);
+    bool disconnect(const std::string& srcName, EDirection srcSide);
 
     //! Disconnect screens
     /*!
@@ -278,8 +270,7 @@ public:
     covering position \c position.  Returns false if \c srcName is
     unknown.
     */
-    bool                disconnect(const String& srcName,
-                            EDirection srcSide, float position);
+    bool disconnect(const std::string& srcName, EDirection srcSide, float position);
 
     //! Set server address
     /*!
@@ -294,8 +285,7 @@ public:
     existing option's value if there is one.  Returns true iff \c name
     is a known screen.
     */
-    bool                addOption(const String& name,
-                            OptionID option, OptionValue value);
+    bool addOption(const std::string& name, OptionID option, OptionValue value);
 
     //! Remove a screen option
     /*!
@@ -303,14 +293,14 @@ public:
     nothing if the option doesn't exist on the screen.  Returns true
     iff \c name is a known screen.
     */
-    bool                removeOption(const String& name, OptionID option);
+    bool removeOption(const std::string& name, OptionID option);
 
     //! Remove a screen options
     /*!
     Removes all options and values from the named screen.  Returns true
     iff \c name is a known screen.
     */
-    bool                removeOptions(const String& name);
+    bool removeOptions(const std::string& name);
 
     //! Get the hot key input filter
     /*!
@@ -328,7 +318,7 @@ public:
     /*!
     Returns true iff \c name is a valid screen name.
     */
-    bool                isValidScreenName(const String& name) const;
+    bool isValidScreenName(const std::string& name) const;
 
     //! Get beginning (canonical) screen name iterator
     const_iterator        begin() const;
@@ -344,20 +334,20 @@ public:
     /*!
     Returns true iff \c name names a screen.
     */
-    virtual bool        isScreen(const String& name) const;
+    virtual bool isScreen(const std::string& name) const;
 
     //! Test for canonical screen name
     /*!
     Returns true iff \c name is the canonical name of a screen.
     */
-    bool                isCanonicalName(const String& name) const;
+    bool isCanonicalName(const std::string& name) const;
 
     //! Get canonical name
     /*!
     Returns the canonical name of a screen or the empty string if
     the name is unknown.  Returns the canonical name if one is given.
     */
-    String                getCanonicalName(const String& name) const;
+    std::string getCanonicalName(const std::string& name) const;
 
     //! Get neighbor
     /*!
@@ -367,7 +357,7 @@ public:
     saves the position on the neighbor in \c positionOut if it's not
     \c NULL.
     */
-    String                getNeighbor(const String&, EDirection,
+    std::string getNeighbor(const std::string&, EDirection,
                             float position, float* positionOut) const;
 
     //! Check for neighbor
@@ -375,20 +365,19 @@ public:
     Returns \c true if the screen has a neighbor anywhere along the edge
     given by the direction.
     */
-    bool                hasNeighbor(const String&, EDirection) const;
+    bool hasNeighbor(const std::string&, EDirection) const;
 
     //! Check for neighbor
     /*!
     Returns \c true if the screen has a neighbor in the given range along
     the edge given by the direction.
     */
-    bool                hasNeighbor(const String&, EDirection,
-                            float start, float end) const;
+    bool hasNeighbor(const std::string&, EDirection, float start, float end) const;
 
     //! Get beginning neighbor iterator
-    link_const_iterator    beginNeighbor(const String&) const;
+    link_const_iterator beginNeighbor(const std::string&) const;
     //! Get ending neighbor iterator
-    link_const_iterator    endNeighbor(const String&) const;
+    link_const_iterator endNeighbor(const std::string&) const;
 
     //! Get the server address
     const NetworkAddress&
@@ -400,8 +389,7 @@ public:
     if the screen is unknown and an empty collection if there are no
     options.
     */
-    const ScreenOptions*
-                        getOptions(const String& name) const;
+    const ScreenOptions* getOptions(const std::string& name) const;
 
     //! Check for lock to screen action
     /*!
@@ -446,7 +434,7 @@ public:
     /*!
     Returns an interval as a parseable string.
     */
-    static String        formatInterval(const Interval&);
+    static std::string formatInterval(const Interval&);
 
     //@}
 
@@ -457,19 +445,16 @@ private:
     void                readSectionLinks(ConfigReadContext&);
     void                readSectionAliases(ConfigReadContext&);
 
-    InputFilter::Condition*
-                        parseCondition(ConfigReadContext&,
-                            const String& condition,
-                            const std::vector<String>& args);
-    void                parseAction(ConfigReadContext&,
-                            const String& action,
-                            const std::vector<String>& args,
-                            InputFilter::Rule&, bool activate);
-
-    void                parseScreens(ConfigReadContext&, const String&,
-                            std::set<String>& screens) const;
+    InputFilter::Condition* parseCondition(ConfigReadContext&, const std::string& condition,
+                                           const std::vector<std::string>& args);
+
+    void parseAction(ConfigReadContext&, const std::string& action,
+                     const std::vector<std::string>& args, InputFilter::Rule&, bool activate);
+
+    void parseScreens(ConfigReadContext&, const std::string&, std::set<std::string>& screens) const;
+
     static const char*    getOptionName(OptionID);
-    static String        getOptionValue(OptionID, OptionValue);
+    static std::string getOptionValue(OptionID, OptionValue);
 
 private:
     CellMap                m_map;
@@ -487,42 +472,41 @@ Maintains a context when reading a configuration from a stream.
 */
 class ConfigReadContext {
 public:
-    typedef std::vector<String> ArgList;
+    typedef std::vector<std::string> ArgList;
 
     ConfigReadContext(std::istream&, SInt32 firstLine = 1);
     ~ConfigReadContext();
 
-    bool                readLine(String&);
+    bool                readLine(std::string&);
     UInt32                getLineNumber() const;
 
     bool                operator!() const;
 
-    OptionValue            parseBoolean(const String&) const;
-    OptionValue            parseInt(const String&) const;
-    OptionValue            parseModifierKey(const String&) const;
-    OptionValue            parseCorner(const String&) const;
-    OptionValue            parseCorners(const String&) const;
-    Config::Interval
-                        parseInterval(const ArgList& args) const;
-    void                parseNameWithArgs(
-                            const String& type, const String& line,
-                            const String& delim, String::size_type& index,
-                            String& name, ArgList& args) const;
-    IPlatformScreen::KeyInfo*
-                        parseKeystroke(const String& keystroke) const;
-    IPlatformScreen::KeyInfo*
-                        parseKeystroke(const String& keystroke,
-                            const std::set<String>& screens) const;
-    IPlatformScreen::ButtonInfo*
-                        parseMouse(const String& mouse) const;
-    KeyModifierMask        parseModifier(const String& modifiers) const;
+    OptionValue parseBoolean(const std::string&) const;
+    OptionValue parseInt(const std::string&) const;
+    OptionValue parseModifierKey(const std::string&) const;
+    OptionValue parseCorner(const std::string&) const;
+    OptionValue parseCorners(const std::string&) const;
+
+    Config::Interval parseInterval(const ArgList& args) const;
+
+    void parseNameWithArgs(const std::string& type, const std::string& line,
+                           const std::string& delim, std::string::size_type& index,
+                           std::string& name, ArgList& args) const;
+
+    IPlatformScreen::KeyInfo* parseKeystroke(const std::string& keystroke) const;
+    IPlatformScreen::KeyInfo* parseKeystroke(const std::string& keystroke,
+                                             const std::set<std::string>& screens) const;
+    IPlatformScreen::ButtonInfo* parseMouse(const std::string& mouse) const;
+    KeyModifierMask parseModifier(const std::string& modifiers) const;
+
     std::istream&        getStream() const { return m_stream; };
 
 private:
     // not implemented
     ConfigReadContext&    operator=(const ConfigReadContext&);
 
-    static String        concatArgs(const ArgList& args);
+    static std::string        concatArgs(const ArgList& args);
 
 private:
     std::istream&        m_stream;
@@ -535,15 +519,14 @@ Thrown when a configuration stream cannot be parsed.
 */
 class XConfigRead : public XBase {
 public:
-    XConfigRead(const ConfigReadContext& context, const String&);
-    XConfigRead(const ConfigReadContext& context,
-                            const char* errorFmt, const String& arg);
-    virtual ~XConfigRead() _NOEXCEPT;
+    XConfigRead(const ConfigReadContext& context, const std::string&);
+    XConfigRead(const ConfigReadContext& contex, const char* errorFmt, const std::string& arg);
+    virtual ~XConfigRead() noexcept;
 
 protected:
     // XBase overrides
-    virtual String        getWhat() const throw();
+    virtual std::string getWhat() const noexcept;
 
 private:
-    String                m_error;
+    std::string                m_error;
 };