Clean up chat and chat tabs some more

1 files changed, 14 insertions, 7 deletions

diff --git a/src/gui/widgets/chattab.h b/src/gui/widgets/chattab.h
index 3e64242c..52449f6f 100644
--- a/src/gui/widgets/chattab.h
+++ b/src/gui/widgets/chattab.h
@@ -22,11 +22,10 @@
 #ifndef CHATTAB_H
 #define CHATTAB_H
 
-#include <guichan/widgets/container.hpp>
-
-#include "tab.h"
+#include "gui/widgets/tab.h"
+#include "gui/chat.h"
 
-#include "../chat.h"
+#include <guichan/widgets/container.hpp>
 
 class BrowserBox;
 class Recorder;
@@ -48,6 +47,13 @@ enum
 };
 
 /**
+ * gets in between usernick and message text depending on
+ * message type
+ */
+#define CAT_NORMAL ": "
+#define CAT_IS     ""
+
+/**
  * A tab for the chat window. This is special to ease chat handling.
  */
 class ChatTab : public Tab
@@ -90,7 +96,7 @@ class ChatTab : public Tab
          * @param msg  The message text which is to be sent.
          *
          */
-        void chatSend(std::string &msg);
+        void chatInput(std::string &msg);
 
         /**
          * Scrolls the chat window
@@ -105,10 +111,11 @@ class ChatTab : public Tab
 
     protected:
         friend class ChatWindow;
+        friend class WhisperWindow;
 
-        virtual void sendChat(std::string &msg);
+        virtual void handleInput(const std::string &msg);
 
-        virtual void handleCommand(const std::string msg);
+        virtual void handleCommand(std::string msg);
 
         ScrollArea *mScrollArea;
         BrowserBox *mTextOutput;