Style cleanups throughout most of the code. Splitting function type from

the function names should no longer be around.

Signed-off-by: Ira Rice <irarice@gmail.com>

1 files changed, 129 insertions, 136 deletions

diff --git a/src/gui/chat.h b/src/gui/chat.h
index 437dc115..9e137499 100644
--- a/src/gui/chat.h
+++ b/src/gui/chat.h
@@ -107,149 +107,142 @@ struct CHATSKILL
  * \ingroup Interface
  */
 class ChatWindow : public Window, public gcn::ActionListener,
-		   public gcn::KeyListener
+                   public gcn::KeyListener
 {
     public:
-	/**
-	 * Constructor.
-	 */
-	ChatWindow(Network *network);
-
-	/**
-	 * Destructor: used to write back values to the config file
-	 */
-	~ChatWindow();
-
-	/**
-	 * Logic (updates components' size)
-	 */
-	void logic();
-
-	/**
-	 * Adds a line of text to our message list. Parameters:
-	 *
-	 * @param line Text message.
-	 * @parem own  Type of message (usually the owner-type).
-	 */
-	void chatLog(std::string line, int own, bool ignoreRecord = false);
-
-	/**
-	 * Calls original chat_log() after processing the packet.
-	 */
-	void chatLog(CHATSKILL);
-
-	/**
-	 * Performs action.
-	 */
-	void action(const gcn::ActionEvent &event);
-
-	/**
-	 * Request focus for typing chat message.
-	 */
-	void requestChatFocus();
-
-	/**
-	 * Checks whether ChatWindow is Focused or not.
-	 */
-	bool isInputFocused();
-
-	/**
-	 * Determines whether to send a command or an ordinary message, then
-	 * contructs packets & sends them.
-	 *
-	 * @param nick The character's name to display in front.
-	 * @param msg  The message text which is to be send.
-	 *
-	 * NOTE:
-	 * The nickname is required by the server, if not specified
-	 * the message may not be sent unless a command was intended
-	 * which requires another packet to be constructed! you can
-	 * achieve this by putting a slash ("/") infront of the
-	 * message followed by the command name and the message.
-	 * of course all slash-commands need implemented handler-
-	 * routines. ;-)
-	 * remember, a line starting with "@" is not a command that needs
-	 * to be parsed rather is sent using the normal chat-packet.
-	 *
-	 * EXAMPLE:
-	 * // for an global announcement   /- command
-	 * chatlog.chat_send("", "/announce Hello to all logged in users!");
-	 * // for simple message by a user /- message
-	 * chatlog.chat_send("Zaeiru", "Hello to all users on the screen!");
-	 */
-	void
-	chatSend(const std::string &nick, std::string msg);
-
-	/** Called when key is pressed */
-	void
-	keyPressed(gcn::KeyEvent &event);
-
-	/** Called to set current text */
-	void
-	setInputText(std::string input_str);
-
-	/** Override to reset mTmpVisible */
-	void
-	setVisible(bool visible);
+        /**
+         * Constructor.
+         */
+        ChatWindow(Network *network);
+
+        /**
+         * Destructor: used to write back values to the config file
+         */
+        ~ChatWindow();
+
+        /**
+         * Logic (updates components' size)
+         */
+        void logic();
+
+        /**
+         * Adds a line of text to our message list. Parameters:
+         *
+         * @param line Text message.
+         * @parem own  Type of message (usually the owner-type).
+         */
+        void chatLog(std::string line, int own, bool ignoreRecord = false);
+
+        /**
+         * Calls original chat_log() after processing the packet.
+         */
+        void chatLog(CHATSKILL);
+
+        /**
+         * Performs action.
+         */
+        void action(const gcn::ActionEvent &event);
+
+        /**
+         * Request focus for typing chat message.
+         */
+        void requestChatFocus();
+
+        /**
+         * Checks whether ChatWindow is Focused or not.
+         */
+        bool isInputFocused();
+
+        /**
+         * Determines whether to send a command or an ordinary message, then
+         * contructs packets & sends them.
+         *
+         * @param nick The character's name to display in front.
+         * @param msg  The message text which is to be send.
+         *
+         * NOTE:
+         * The nickname is required by the server, if not specified
+         * the message may not be sent unless a command was intended
+         * which requires another packet to be constructed! you can
+         * achieve this by putting a slash ("/") infront of the
+         * message followed by the command name and the message.
+         * of course all slash-commands need implemented handler-
+         * routines. ;-)
+         * remember, a line starting with "@" is not a command that needs
+         * to be parsed rather is sent using the normal chat-packet.
+         *
+         * EXAMPLE:
+         * // for an global announcement   /- command
+         * chatlog.chat_send("", "/announce Hello to all logged in users!");
+         * // for simple message by a user /- message
+         * chatlog.chat_send("Zaeiru", "Hello to all users on the screen!");
+         */
+        void chatSend(const std::string &nick, std::string msg);
+
+        /** Called when key is pressed */
+        void keyPressed(gcn::KeyEvent &event);
+
+        /** Called to set current text */
+        void setInputText(std::string input_str);
+
+        /** Override to reset mTmpVisible */
+        void setVisible(bool visible);
 
        /**
-	* Scrolls the chat window
-	*
-	* @param amount direction and amount to scroll.  Negative numbers scroll
-	* up, positive numbers scroll down.  The absolute amount indicates the
-	* amount of 1/8ths of chat window real estate that should be scrolled.
-	*/
-	void
-	scroll(int amount);
-
-	/**
-	 * party implements the partying chat commands
-	 *
-	 * @param command is the party command to perform
-	 * @param msg is the remainder of the message
-	 */
-	void
-	party(const std::string &command, const std::string &msg);
-
-	/**
-	 * help implements the /help command
-	 *
-	 * @param msg1 is the command that the player needs help on
-	 * @param msg2 is the sub-command relating to the command
-	 */
-	void
-	help(const std::string &msg1, const std::string &msg2);
+        * Scrolls the chat window
+        *
+        * @param amount direction and amount to scroll.  Negative numbers scroll
+        * up, positive numbers scroll down.  The absolute amount indicates the
+        * amount of 1/8ths of chat window real estate that should be scrolled.
+        */
+        void scroll(int amount);
+
+        /**
+         * party implements the partying chat commands
+         *
+         * @param command is the party command to perform
+         * @param msg is the remainder of the message
+         */
+        void party(const std::string &command, const std::string &msg);
+
+        /**
+         * help implements the /help command
+         *
+         * @param msg1 is the command that the player needs help on
+         * @param msg2 is the sub-command relating to the command
+         */
+        void help(const std::string &msg1, const std::string &msg2);
 
     private:
 
-	Network *mNetwork;
-	bool mTmpVisible;
-
-	/** One item in the chat log */
-	struct CHATLOG
-	{
-	    std::string nick;
-	    std::string text;
-	    int own;
-	};
-
-	/** Constructs failed messages for actions */
-	std::string const_msg(CHATSKILL);
-
-	gcn::TextField *mChatInput; /**< Input box for typing chat messages */
-	BrowserBox *mTextOutput;    /**< Text box for displaying chat history */
-	ScrollArea *mScrollArea;    /**< Scroll area around text output */
-
-	typedef std::list<std::string> History;
-	typedef History::iterator HistoryIterator;
-	History mHistory;           /**< Command history */
-	HistoryIterator mCurHist; /**< History iterator */
-	Recorder *mRecorder; /**< Recording class */
-	char mPartyPrefix; /**< Messages beginning with the prefix are sent to
-			      the party */
-	bool mReturnToggles; /**< Marks whether <Return> toggles the chat log
-				or not */
-	Party *mParty;
+        Network *mNetwork;
+        bool mTmpVisible;
+
+        /** One item in the chat log */
+        struct CHATLOG
+        {
+            std::string nick;
+            std::string text;
+            int own;
+        };
+
+        /** Constructs failed messages for actions */
+        std::string const_msg(CHATSKILL);
+
+        gcn::TextField *mChatInput; /**< Input box for typing chat messages */
+        BrowserBox *mTextOutput;    /**< Text box for displaying chat history */
+        ScrollArea *mScrollArea;    /**< Scroll area around text output */
+
+        typedef std::list<std::string> History;
+        typedef History::iterator HistoryIterator;
+        History mHistory;           /**< Command history */
+        HistoryIterator mCurHist; /**< History iterator */
+        Recorder *mRecorder; /**< Recording class */
+        char mPartyPrefix; /**< Messages beginning with the prefix are sent to
+                              the party */
+        bool mReturnToggles; /**< Marks whether <Return> toggles the chat log
+                                or not */
+        Party *mParty;
 };
 extern ChatWindow *chatWindow;