Merge insp20

[user/henk/code/inspircd.git] / include / hashcomp.h

diff --git a/include/hashcomp.h b/include/hashcomp.h
index de556f39316cf93216577eed69109bf50a3a9f92..c99b5d64613b3364ab754e1689bbe6e1cd1fd451 100644 (file)
--- a/include/hashcomp.h
+++ b/include/hashcomp.h
@@ -168,102 +168,11 @@ namespace irc
         */
        typedef std::basic_string<char, irc_char_traits, std::allocator<char> > string;
 
-       /** irc::stringjoiner joins string lists into a string, using
-        * space as the separator.
-        * This class can join a vector of std::string.
+       /** Joins the contents of a vector to a string.
+        * @param sequence Zero or more items to join.
+        * @separator The character to place between the items.
         */
-       class CoreExport stringjoiner
-       {
-        private:
-
-               /** Output string
-                */
-               std::string joined;
-
-        public:
-
-               /** Join all elements of a vector, in the resulting string
-                * each element will be seperated by a single space character.
-                * @param sequence Zero or more items to seperate
-                */
-               stringjoiner(const std::vector<std::string>& sequence);
-
-               /** Get the joined sequence
-                * @return A constant reference to the joined string
-                */
-               const std::string& GetJoined() const { return joined; }
-       };
-
-       /** irc::modestacker stacks mode sequences into a list.
-        * It can then reproduce this list, clamped to a maximum of MAXMODES
-        * values per line.
-        */
-       class CoreExport modestacker
-       {
-        private:
-               /** The mode sequence and its parameters
-                */
-               std::deque<std::string> sequence;
-
-               /** True if the mode sequence is initially adding
-                * characters, false if it is initially removing
-                * them
-                */
-               bool adding;
-        public:
-
-               /** Construct a new modestacker.
-                * @param add True if the stack is adding modes,
-                * false if it is removing them
-                */
-               modestacker(bool add);
-
-               /** Push a modeletter and its parameter onto the stack.
-                * No checking is performed as to if this mode actually
-                * requires a parameter. If you stack invalid mode
-                * sequences, they will be tidied if and when they are
-                * passed to a mode parser.
-                * @param modeletter The mode letter to insert
-                * @param parameter The parameter for the mode
-                */
-               void Push(char modeletter, const std::string &parameter);
-
-               /** Push a modeletter without parameter onto the stack.
-                * No checking is performed as to if this mode actually
-                * requires a parameter. If you stack invalid mode
-                * sequences, they will be tidied if and when they are
-                * passed to a mode parser.
-                * @param modeletter The mode letter to insert
-                */
-               void Push(char modeletter);
-
-               /** Push a '+' symbol onto the stack.
-                */
-               void PushPlus();
-
-               /** Push a '-' symbol onto the stack.
-                */
-               void PushMinus();
-
-               /** Return zero or more elements which form the
-                * mode line. This will be clamped to a max of
-                * MAXMODES items (MAXMODES-1 mode parameters and
-                * one mode sequence string), and max_line_size
-                * characters. As specified below, this function
-                * should be called in a loop until it returns zero,
-                * indicating there are no more modes to return.
-                * @param result The vector to populate. This will not
-                * be cleared before it is used.
-                * @param max_line_size The maximum size of the line
-                * to build, in characters, seperate to MAXMODES.
-                * @return The number of elements in the deque.
-                * The function should be called repeatedly until it
-                * returns 0, in case there are multiple lines of
-                * mode changes to be obtained.
-                */
-               int GetStackedLine(std::vector<std::string> &result, int max_line_size = 360);
-
-       };
+       std::string CoreExport stringjoiner(const std::vector<std::string>& sequence, char separator = ' ');
 
        /** irc::sepstream allows for splitting token seperated lists.
         * Each successive call to sepstream::GetToken() returns