Merge branch 'master' of git@gitorious.org:tmw/mainline

1 files changed, 14 insertions, 21 deletions

diff --git a/src/gui/chat.h b/src/gui/chat.h
index 177aa38f..3a2f7fdb 100644
--- a/src/gui/chat.h
+++ b/src/gui/chat.h
@@ -22,6 +22,8 @@
 #ifndef CHAT_H
 #define CHAT_H
 
+#include "window.h"
+
 #include <list>
 #include <string>
 #include <map>
@@ -31,10 +33,6 @@
 #include <guichan/widget.hpp>
 #include <guichan/widgetlistener.hpp>
 
-#include "widgets/chattab.h"
-
-#include "window.h"
-
 class BrowserBox;
 class Channel;
 class ChatTab;
@@ -42,19 +40,9 @@ class Recorder;
 class ScrollArea;
 class TabbedArea;
 class ItemLinkHandler;
-#ifdef EATHENA_SUPPORT
-class Network;
-#endif
+class Tab;
 class WhisperTab;
 
-/**
- * gets in between usernick and message text depending on
- * message type
- */
-#define CAT_NORMAL        ": "
-#define CAT_IS            ""
-#define CAT_WHISPER       " whispers: "
-
 #define DEFAULT_CHAT_WINDOW_SCROLL 7 // 1 means `1/8th of the window size'.
 
 /** One item in the chat log */
@@ -78,11 +66,7 @@ class ChatWindow : public Window,
         /**
          * Constructor.
          */
-#ifdef TMWSERV_SUPPORT
         ChatWindow();
-#else
-        ChatWindow(Network *network);
-#endif
 
         /**
          * Destructor: used to write back values to the config file
@@ -119,6 +103,16 @@ class ChatWindow : public Window,
         void clearTab();
 
         /**
+         * Switch to the previous tab in order
+         */
+        void prevTab();
+
+        /**
+         * Switch to the next tab in order
+         */
+        void nextTab();
+
+        /**
          * Performs action.
          */
         void action(const gcn::ActionEvent &event);
@@ -142,7 +136,7 @@ class ChatWindow : public Window,
          * @param msg  The message text which is to be sent.
          *
          */
-        void chatSend(std::string &msg);
+        void chatInput(std::string &msg);
 
         /** Called when key is pressed */
         void keyPressed(gcn::KeyEvent &event);
@@ -199,7 +193,6 @@ class ChatWindow : public Window,
         void adjustTabSize();
 
 #ifdef EATHENA_SUPPORT
-        Network *mNetwork;
         char mPartyPrefix; /**< Messages beginning with the prefix are sent to
                               the party */
 #endif