Move chat tab consts into separate file.

10 files changed, 44 insertions, 4 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3a549563c..785c949b2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -846,6 +846,7 @@ SET(SRCS
     events/actionevent.h
     listeners/actionlistener.h
     gui/widgets/basiccontainer.h
+    gui/chatconsts.h
     gui/cliprect.h
     gui/color.h
     listeners/deathlistener.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 69f58ab06..fe24cbf11 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -154,6 +154,7 @@ endif
 manaplus_SOURCES += events/actionevent.h \
 	      listeners/actionlistener.h \
 	      gui/widgets/basiccontainer.h \
+	      gui/chatconsts.h \
 	      gui/cliprect.h \
 	      gui/color.h \
 	      listeners/deathlistener.h \
diff --git a/src/commands.cpp b/src/commands.cpp
index f3ea4eff7..25b34fc81 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -35,6 +35,7 @@
 #include "being/localplayer.h"
 #include "being/playerrelations.h"
 
+#include "gui/chatconsts.h"
 #include "gui/gui.h"
 
 #include "gui/windows/buydialog.h"
diff --git a/src/game.cpp b/src/game.cpp
index f9f5305ae..241f15a6a 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -48,6 +48,7 @@
 #include "input/joystick.h"
 #include "input/keyboardconfig.h"
 
+#include "gui/chatconsts.h"
 #include "gui/font.h"
 #include "gui/gui.h"
 #include "gui/viewport.h"
diff --git a/src/gui/chatconsts.h b/src/gui/chatconsts.h
new file mode 100644
index 000000000..80969b38e
--- /dev/null
+++ b/src/gui/chatconsts.h
@@ -0,0 +1,31 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2014  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GUI_CHATCONSTS_H
+#define GUI_CHATCONSTS_H
+
+#include <string>
+
+const std::string GENERAL_CHANNEL = "";
+const std::string TRADE_CHANNEL = "";
+
+#endif  // GUI_CHATCONSTS_H
diff --git a/src/gui/widgets/tabs/chattab.h b/src/gui/widgets/tabs/chattab.h
index a46279483..84c00fdfc 100644
--- a/src/gui/widgets/tabs/chattab.h
+++ b/src/gui/widgets/tabs/chattab.h
@@ -32,9 +32,6 @@
 
 class ScrollArea;
 
-const std::string GENERAL_CHANNEL = "";
-const std::string TRADE_CHANNEL = "";
-
 /**
  * A tab for the chat window. This is special to ease chat handling.
  */
diff --git a/src/gui/widgets/tabs/tradetab.cpp b/src/gui/widgets/tabs/tradetab.cpp
index fbf10dc9b..12fa0d3a5 100644
--- a/src/gui/widgets/tabs/tradetab.cpp
+++ b/src/gui/widgets/tabs/tradetab.cpp
@@ -24,6 +24,8 @@
 
 #include "chatlogger.h"
 
+#include "gui/chatconsts.h"
+
 #include "utils/gettext.h"
 
 #include "debug.h"
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index 17e8924f5..f8337fff6 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -40,6 +40,7 @@
 
 #include "input/inputmanager.h"
 
+#include "gui/chatconsts.h"
 #include "gui/focushandler.h"
 #include "gui/gui.h"
 #include "gui/skin.h"
diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp
index 01fb7b033..67270ef36 100644
--- a/src/gui/windows/shopwindow.cpp
+++ b/src/gui/windows/shopwindow.cpp
@@ -20,10 +20,13 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "gui/windows/shopwindow.h"
+
+#include "gui/chatconsts.h"
+
 #include "gui/windows/buydialog.h"
 #include "gui/windows/confirmdialog.h"
 #include "gui/windows/itemamountwindow.h"
-#include "gui/windows/shopwindow.h"
 #include "gui/windows/selldialog.h"
 #include "gui/windows/tradewindow.h"
 
diff --git a/src/net/tmwa/pethandler.cpp b/src/net/tmwa/pethandler.cpp
index 77317a077..5c277891e 100644
--- a/src/net/tmwa/pethandler.cpp
+++ b/src/net/tmwa/pethandler.cpp
@@ -20,6 +20,8 @@
 
 #include "net/tmwa/pethandler.h"
 
+#include "gui/chatconsts.h"
+
 #include "gui/widgets/tabs/chattab.h"
 
 #include "net/net.h"