Rename some gui class files to real class names.

45 files changed, 87 insertions, 87 deletions

diff --git a/manaplus.cbp b/manaplus.cbp
index a1558d70d..352aa6f6f 100644
--- a/manaplus.cbp
+++ b/manaplus.cbp
@@ -151,10 +151,10 @@
 		<Unit filename="src\gui\beingpopup.h" />

 		<Unit filename="src\gui\botcheckerwindow.cpp" />

 		<Unit filename="src\gui\botcheckerwindow.h" />

-		<Unit filename="src\gui\buy.cpp" />

-		<Unit filename="src\gui\buy.h" />

-		<Unit filename="src\gui\buysell.cpp" />

-		<Unit filename="src\gui\buysell.h" />

+		<Unit filename="src\gui\buydialog.cpp" />

+		<Unit filename="src\gui\buydialog.h" />

+		<Unit filename="src\gui\buyselldialog.cpp" />

+		<Unit filename="src\gui\buyselldialog.h" />

 		<Unit filename="src\gui\changeemaildialog.cpp" />

 		<Unit filename="src\gui\changeemaildialog.h" />

 		<Unit filename="src\gui\changepassworddialog.cpp" />

@@ -163,8 +163,8 @@
 		<Unit filename="src\gui\charcreatedialog.h" />

 		<Unit filename="src\gui\charselectdialog.cpp" />

 		<Unit filename="src\gui\charselectdialog.h" />

-		<Unit filename="src\gui\chat.cpp" />

-		<Unit filename="src\gui\chat.h" />

+		<Unit filename="src\gui\chatwindow.cpp" />

+		<Unit filename="src\gui\chatwindow.h" />

 		<Unit filename="src\gui\confirmdialog.cpp" />

 		<Unit filename="src\gui\confirmdialog.h" />

 		<Unit filename="src\gui\connectiondialog.cpp" />

@@ -181,12 +181,12 @@
 		<Unit filename="src\gui\focushandler.h" />

 		<Unit filename="src\gui\gui.cpp" />

 		<Unit filename="src\gui\gui.h" />

-		<Unit filename="src\gui\help.cpp" />

-		<Unit filename="src\gui\help.h" />

+		<Unit filename="src\gui\helpwindow.cpp" />

+		<Unit filename="src\gui\helpwindow.h" />

 		<Unit filename="src\gui\inventorywindow.cpp" />

 		<Unit filename="src\gui\inventorywindow.h" />

-		<Unit filename="src\gui\itemamount.cpp" />

-		<Unit filename="src\gui\itemamount.h" />

+		<Unit filename="src\gui\itemamountwindow.cpp" />

+		<Unit filename="src\gui\itemamountwindow.h" />

 		<Unit filename="src\gui\itempopup.cpp" />

 		<Unit filename="src\gui\itempopup.h" />

 		<Unit filename="src\gui\killstats.cpp" />

@@ -267,8 +267,8 @@
 		<Unit filename="src\gui\theme.h" />

 		<Unit filename="src\gui\trade.cpp" />

 		<Unit filename="src\gui\trade.h" />

-		<Unit filename="src\gui\truetypefont.cpp" />

-		<Unit filename="src\gui\truetypefont.h" />

+		<Unit filename="src\gui\sdlfont.cpp" />

+		<Unit filename="src\gui\sdlfont.h" />

 		<Unit filename="src\gui\unregisterdialog.cpp" />

 		<Unit filename="src\gui\unregisterdialog.h" />

 		<Unit filename="src\gui\updatewindow.cpp" />

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0b2dc20bf..9a466a57d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -219,10 +219,10 @@ SET(SRCS
     gui/widgets/windowcontainer.h
     gui/beingpopup.cpp
     gui/beingpopup.h
-    gui/buy.cpp
-    gui/buy.h
-    gui/buysell.cpp
-    gui/buysell.h
+    gui/buydialog.cpp
+    gui/buydialog.h
+    gui/buyselldialog.cpp
+    gui/buyselldialog.h
     gui/changeemaildialog.cpp
     gui/changeemaildialog.h
     gui/changepassworddialog.cpp
@@ -231,8 +231,8 @@ SET(SRCS
     gui/charselectdialog.h
     gui/charcreatedialog.cpp
     gui/charcreatedialog.h
-    gui/chat.cpp
-    gui/chat.h
+    gui/chatwindow.cpp
+    gui/chatwindow.h
     gui/confirmdialog.cpp
     gui/confirmdialog.h
     gui/connectiondialog.cpp
@@ -247,8 +247,8 @@ SET(SRCS
     gui/focushandler.h
     gui/gui.cpp
     gui/gui.h
-    gui/help.cpp
-    gui/help.h
+    gui/helpwindow.cpp
+    gui/helpwindow.h
     gui/inventorywindow.cpp
     gui/inventorywindow.h
     gui/itempopup.cpp
@@ -259,8 +259,8 @@ SET(SRCS
     gui/statuspopup.h
     gui/killstats.cpp
     gui/killstats.h
-    gui/itemamount.cpp
-    gui/itemamount.h
+    gui/itemamountwindow.cpp
+    gui/itemamountwindow.h
     gui/login.cpp
     gui/login.h
     gui/minimap.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index c07f5b1ea..68393ab44 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -114,10 +114,10 @@ manaplus_SOURCES = gui/widgets/avatarlistbox.cpp \
 	      gui/widgets/windowcontainer.h \
 	      gui/beingpopup.cpp \
 	      gui/beingpopup.h \
-	      gui/buy.cpp \
-	      gui/buy.h \
-	      gui/buysell.cpp \
-	      gui/buysell.h \
+	      gui/buydialog.cpp \
+	      gui/buydialog.h \
+	      gui/buyselldialog.cpp \
+	      gui/buyselldialog.h \
 	      gui/changeemaildialog.cpp \
 	      gui/changeemaildialog.h \
 	      gui/changepassworddialog.cpp \
@@ -126,8 +126,8 @@ manaplus_SOURCES = gui/widgets/avatarlistbox.cpp \
 	      gui/charselectdialog.h \
 	      gui/charcreatedialog.cpp \
 	      gui/charcreatedialog.h \
-	      gui/chat.cpp \
-	      gui/chat.h \
+	      gui/chatwindow.cpp \
+	      gui/chatwindow.h \
 	      gui/confirmdialog.cpp \
 	      gui/confirmdialog.h \
 	      gui/connectiondialog.cpp \
@@ -142,12 +142,12 @@ manaplus_SOURCES = gui/widgets/avatarlistbox.cpp \
 	      gui/focushandler.h \
 	      gui/gui.cpp \
 	      gui/gui.h \
-	      gui/help.cpp \
-	      gui/help.h \
+	      gui/helpwindow.cpp \
+	      gui/helpwindow.h \
 	      gui/inventorywindow.cpp \
 	      gui/inventorywindow.h \
-	      gui/itemamount.cpp \
-	      gui/itemamount.h \
+	      gui/itemamountwindow.cpp \
+	      gui/itemamountwindow.h \
 	      gui/itempopup.cpp \
 	      gui/itempopup.h \
 	      gui/spellpopup.cpp \
diff --git a/src/actorspritemanager.cpp b/src/actorspritemanager.cpp
index 302b656d7..2dfe08ef3 100644
--- a/src/actorspritemanager.cpp
+++ b/src/actorspritemanager.cpp
@@ -30,7 +30,7 @@
 
 #include "gui/widgets/chattab.h"
 #include "gui/killstats.h"
-#include "gui/chat.h"
+#include "gui/chatwindow.h"
 #include "gui/skilldialog.h"
 #include "gui/viewport.h"
 
diff --git a/src/being.cpp b/src/being.cpp
index be446e0fa..659b883bc 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -41,8 +41,8 @@
 #include "text.h"
 #include "statuseffect.h"
 
-#include "gui/buy.h"
-#include "gui/buysell.h"
+#include "gui/buydialog.h"
+#include "gui/buyselldialog.h"
 #include "gui/gui.h"
 #include "gui/npcdialog.h"
 #include "gui/npcpostdialog.h"
diff --git a/src/client.cpp b/src/client.cpp
index 2d5680d18..03c2fc648 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -41,8 +41,8 @@
 #include "statuseffect.h"
 #include "units.h"
 
-#include "gui/buy.h"
-#include "gui/buysell.h"
+#include "gui/buydialog.h"
+#include "gui/buyselldialog.h"
 #include "gui/changeemaildialog.h"
 #include "gui/changepassworddialog.h"
 #include "gui/charselectdialog.h"
diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp
index 3b2f38f72..df45a4f66 100644
--- a/src/commandhandler.cpp
+++ b/src/commandhandler.cpp
@@ -30,8 +30,8 @@
 #include "log.h"
 #include "main.h"
 
-#include "gui/chat.h"
-#include "gui/help.h"
+#include "gui/chatwindow.h"
+#include "gui/helpwindow.h"
 #include "gui/gui.h"
 #include "gui/outfitwindow.h"
 #include "gui/shopwindow.h"
diff --git a/src/dropshortcut.cpp b/src/dropshortcut.cpp
index 6976f3f1f..ca68ffbc9 100644
--- a/src/dropshortcut.cpp
+++ b/src/dropshortcut.cpp
@@ -28,7 +28,7 @@
 #include "localplayer.h"
 #include "playerinfo.h"
 
-#include "gui/chat.h"
+#include "gui/chatwindow.h"
 #include "gui/widgets/chattab.h"
 
 #include "net/inventoryhandler.h"
diff --git a/src/game.cpp b/src/game.cpp
index bcbbefc4a..9c1e4ca0d 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -48,13 +48,13 @@
 #include "sound.h"
 
 #include "gui/botcheckerwindow.h"
-#include "gui/buysell.h"
-#include "gui/chat.h"
+#include "gui/buyselldialog.h"
+#include "gui/chatwindow.h"
 #include "gui/confirmdialog.h"
 #include "gui/debugwindow.h"
 #include "gui/equipmentwindow.h"
 #include "gui/gui.h"
-#include "gui/help.h"
+#include "gui/helpwindow.h"
 #include "gui/inventorywindow.h"
 #include "gui/killstats.h"
 #include "gui/minimap.h"
diff --git a/src/gui/botcheckerwindow.cpp b/src/gui/botcheckerwindow.cpp
index c2cfab2f6..c110e880e 100644
--- a/src/gui/botcheckerwindow.cpp
+++ b/src/gui/botcheckerwindow.cpp
@@ -36,7 +36,7 @@
 #include "gui/widgets/table.h"
 
 #include "actorspritemanager.h"
-#include "chat.h"
+#include "chatwindow.h"
 #include "configuration.h"
 #include "localplayer.h"
 #include "main.h"
diff --git a/src/gui/buy.cpp b/src/gui/buydialog.cpp
index c413fdffc..fe504413c 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buydialog.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/buy.h"
+#include "gui/buydialog.h"
 
 #include "shopitem.h"
 #include "units.h"
diff --git a/src/gui/buy.h b/src/gui/buydialog.h
index c9d412645..eabf26ef8 100644
--- a/src/gui/buy.h
+++ b/src/gui/buydialog.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef BUY_H
-#define BUY_H
+#ifndef BUYDIALOG_H
+#define BUYDIALOG_H
 
 #include "guichanfwd.h"
 
diff --git a/src/gui/buysell.cpp b/src/gui/buyselldialog.cpp
index 30f8478ba..961e744c0 100644
--- a/src/gui/buysell.cpp
+++ b/src/gui/buyselldialog.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/buysell.h"
+#include "gui/buyselldialog.h"
 
 #include "gui/setup.h"
 
diff --git a/src/gui/buysell.h b/src/gui/buyselldialog.h
index f05c5d083..2c7e5c101 100644
--- a/src/gui/buysell.h
+++ b/src/gui/buyselldialog.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef BUYSELL_H
-#define BUYSELL_H
+#ifndef BUYSELLDIALOG_H
+#define BUYSELLDIALOG_H
 
 #include "gui/widgets/window.h"
 
diff --git a/src/gui/chat.cpp b/src/gui/chatwindow.cpp
index e50310409..1e530ecba 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chatwindow.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "chat.h"
+#include "chatwindow.h"
 
 #include "actorspritemanager.h"
 #include "client.h"
diff --git a/src/gui/chat.h b/src/gui/chatwindow.h
index 58405405d..97f586442 100644
--- a/src/gui/chat.h
+++ b/src/gui/chatwindow.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CHAT_H
-#define CHAT_H
+#ifndef CHATWINDOW_H
+#define CHATWINDOW_H
 
 #include "listener.h"
 
diff --git a/src/gui/help.cpp b/src/gui/helpwindow.cpp
index 40996d2b0..c67fa8424 100644
--- a/src/gui/help.cpp
+++ b/src/gui/helpwindow.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/help.h"
+#include "gui/helpwindow.h"
 
 #include "gui/gui.h"
 #include "gui/setup.h"
diff --git a/src/gui/help.h b/src/gui/helpwindow.h
index 7b74edab4..df7a867d2 100644
--- a/src/gui/help.h
+++ b/src/gui/helpwindow.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef HELP_H
-#define HELP_H
+#ifndef HELPWINDOW_H
+#define HELPWINDOW_H
 
 #include "gui/widgets/linkhandler.h"
 #include "gui/widgets/window.h"
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index bdef93f73..b897ad4b8 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -28,7 +28,7 @@
 #include "keyboardconfig.h"
 #include "playerinfo.h"
 
-#include "gui/itemamount.h"
+#include "gui/itemamountwindow.h"
 #include "gui/setup.h"
 #include "gui/sdlinput.h"
 #include "gui/shopwindow.h"
diff --git a/src/gui/itemamount.cpp b/src/gui/itemamountwindow.cpp
index b538d1d16..751578d9b 100644
--- a/src/gui/itemamount.cpp
+++ b/src/gui/itemamountwindow.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/itemamount.h"
+#include "gui/itemamountwindow.h"
 
 #include "item.h"
 #include "keyboardconfig.h"
diff --git a/src/gui/itemamount.h b/src/gui/itemamountwindow.h
index f51c074f7..f51c074f7 100644
--- a/src/gui/itemamount.h
+++ b/src/gui/itemamountwindow.h
diff --git a/src/gui/killstats.cpp b/src/gui/killstats.cpp
index f01dd01c7..e373153e6 100644
--- a/src/gui/killstats.cpp
+++ b/src/gui/killstats.cpp
@@ -29,7 +29,7 @@
 #include "gui/widgets/label.h"
 #include "gui/widgets/layout.h"
 #include "gui/widgets/chattab.h"
-#include "gui/chat.h"
+#include "gui/chatwindow.h"
 
 #include "actorspritemanager.h"
 #include "event.h"
diff --git a/src/gui/ministatus.cpp b/src/gui/ministatus.cpp
index 303b36ae3..e0103f080 100644
--- a/src/gui/ministatus.cpp
+++ b/src/gui/ministatus.cpp
@@ -27,7 +27,7 @@
 #include "graphics.h"
 #include "playerinfo.h"
 
-#include "gui/chat.h"
+#include "gui/chatwindow.h"
 #include "gui/gui.h"
 #include "gui/statuswindow.h"
 #include "gui/statuspopup.h"
diff --git a/src/gui/outfitwindow.cpp b/src/gui/outfitwindow.cpp
index 3550883ba..57ad6ab21 100644
--- a/src/gui/outfitwindow.cpp
+++ b/src/gui/outfitwindow.cpp
@@ -31,7 +31,7 @@
 #include "log.h"
 #include "playerinfo.h"
 
-#include "gui/chat.h"
+#include "gui/chatwindow.h"
 #include "gui/viewport.h"
 
 #include "gui/widgets/button.h"
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 0ab0ac4a3..8e668c1ed 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -38,10 +38,10 @@
 #include "playerrelations.h"
 #include "spellmanager.h"
 
-#include "gui/buy.h"
-#include "gui/chat.h"
+#include "gui/buydialog.h"
+#include "gui/chatwindow.h"
 #include "gui/inventorywindow.h"
-#include "gui/itemamount.h"
+#include "gui/itemamountwindow.h"
 #include "gui/ministatus.h"
 #include "gui/outfitwindow.h"
 #include "gui/sell.h"
diff --git a/src/gui/quitdialog.cpp b/src/gui/quitdialog.cpp
index f7ac5bff2..423e2404d 100644
--- a/src/gui/quitdialog.cpp
+++ b/src/gui/quitdialog.cpp
@@ -24,7 +24,7 @@
 
 #include "client.h"
 
-#include "gui/chat.h"
+#include "gui/chatwindow.h"
 #include "gui/npcdialog.h"
 #include "gui/sdlinput.h"
 #include "gui/viewport.h"
diff --git a/src/gui/setup_chat.cpp b/src/gui/setup_chat.cpp
index 08c76685a..f666284d6 100644
--- a/src/gui/setup_chat.cpp
+++ b/src/gui/setup_chat.cpp
@@ -22,7 +22,7 @@
 
 #include "gui/setup_chat.h"
 #include "gui/editdialog.h"
-#include "gui/chat.h"
+#include "gui/chatwindow.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/checkbox.h"
diff --git a/src/gui/shopwindow.cpp b/src/gui/shopwindow.cpp
index d458a5156..60d48a4c7 100644
--- a/src/gui/shopwindow.cpp
+++ b/src/gui/shopwindow.cpp
@@ -22,8 +22,8 @@
 
 #include "gui/shopwindow.h"
 
-#include "gui/buy.h"
-#include "gui/itemamount.h"
+#include "gui/buydialog.h"
+#include "gui/itemamountwindow.h"
 #include "gui/sell.h"
 #include "gui/setup.h"
 #include "gui/trade.h"
diff --git a/src/gui/textcommandeditor.cpp b/src/gui/textcommandeditor.cpp
index 2300033a5..019827048 100644
--- a/src/gui/textcommandeditor.cpp
+++ b/src/gui/textcommandeditor.cpp
@@ -38,7 +38,7 @@
 #include "gui/widgets/table.h"
 #include "gui/widgets/textfield.h"
 
-#include "chat.h"
+#include "chatwindow.h"
 #include "configuration.h"
 #include "item.h"
 #include "localplayer.h"
diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp
index ab53c38e6..38aaecb83 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/trade.cpp
@@ -29,7 +29,7 @@
 #include "units.h"
 
 #include "gui/inventorywindow.h"
-#include "gui/itemamount.h"
+#include "gui/itemamountwindow.h"
 #include "gui/setup.h"
 #include "gui/theme.h"
 
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 4dd5431ee..ef33aa75b 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -34,7 +34,7 @@
 #include "textmanager.h"
 
 #include "gui/beingpopup.h"
-#include "gui/chat.h"
+#include "gui/chatwindow.h"
 #include "gui/gui.h"
 #include "gui/ministatus.h"
 #include "gui/popupmenu.h"
diff --git a/src/gui/whoisonline.cpp b/src/gui/whoisonline.cpp
index 9a72bb7fd..c1b7f03d1 100644
--- a/src/gui/whoisonline.cpp
+++ b/src/gui/whoisonline.cpp
@@ -40,7 +40,7 @@
 #include "playerrelations.h"
 #include "main.h"
 
-#include "gui/chat.h"
+#include "gui/chatwindow.h"
 
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index fe8032063..c1458d3fd 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -27,7 +27,7 @@
 #include "guild.h"
 #include "localplayer.h"
 
-#include "gui/chat.h"
+#include "gui/chatwindow.h"
 #include "gui/gui.h"
 #include "gui/palette.h"
 #include "gui/viewport.h"
diff --git a/src/gui/widgets/chattab.h b/src/gui/widgets/chattab.h
index 611ca8ef3..66e9f637d 100644
--- a/src/gui/widgets/chattab.h
+++ b/src/gui/widgets/chattab.h
@@ -23,7 +23,7 @@
 #ifndef CHATTAB_H
 #define CHATTAB_H
 
-#include "gui/chat.h"
+#include "gui/chatwindow.h"
 
 #include "gui/widgets/browserbox.h"
 #include "gui/widgets/tab.h"
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index b76385f03..509c7b218 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -29,7 +29,7 @@
 #include "dropshortcut.h"
 #include "log.h"
 
-#include "gui/chat.h"
+#include "gui/chatwindow.h"
 #include "gui/itempopup.h"
 #include "gui/outfitwindow.h"
 #include "gui/palette.h"
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index a6ed4c00a..7cf26cd44 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -42,7 +42,7 @@
 #include "text.h"
 #include "dropshortcut.h"
 
-#include "gui/chat.h"
+#include "gui/chatwindow.h"
 #include "gui/gui.h"
 #include "gui/inventorywindow.h"
 #include "gui/killstats.h"
diff --git a/src/net/manaserv/buysellhandler.cpp b/src/net/manaserv/buysellhandler.cpp
index a519125de..cd73f03f5 100644
--- a/src/net/manaserv/buysellhandler.cpp
+++ b/src/net/manaserv/buysellhandler.cpp
@@ -28,8 +28,8 @@
 #include "playerinfo.h"
 #include "shopitem.h"
 
-#include "gui/buy.h"
-#include "gui/chat.h"
+#include "gui/buydialog.h"
+#include "gui/chatwindow.h"
 #include "gui/sell.h"
 
 #include "net/messagein.h"
diff --git a/src/net/manaserv/chathandler.cpp b/src/net/manaserv/chathandler.cpp
index 5536413ab..bdb903fe1 100644
--- a/src/net/manaserv/chathandler.cpp
+++ b/src/net/manaserv/chathandler.cpp
@@ -28,7 +28,7 @@
 #include "channel.h"
 #include "channelmanager.h"
 
-#include "gui/chat.h"
+#include "gui/chatwindow.h"
 
 #include "gui/widgets/channeltab.h"
 
diff --git a/src/net/manaserv/guildhandler.cpp b/src/net/manaserv/guildhandler.cpp
index dd57a5584..f074152d6 100644
--- a/src/net/manaserv/guildhandler.cpp
+++ b/src/net/manaserv/guildhandler.cpp
@@ -30,7 +30,7 @@
 #include "channelmanager.h"
 
 #include "gui/widgets/channeltab.h"
-#include "gui/chat.h"
+#include "gui/chatwindow.h"
 #include "gui/socialwindow.h"
 
 #include "net/messagein.h"
diff --git a/src/net/manaserv/inventoryhandler.cpp b/src/net/manaserv/inventoryhandler.cpp
index 741eee9df..111eee944 100644
--- a/src/net/manaserv/inventoryhandler.cpp
+++ b/src/net/manaserv/inventoryhandler.cpp
@@ -29,7 +29,7 @@
 #include "localplayer.h"
 #include "playerinfo.h"
 
-#include "gui/chat.h"
+#include "gui/chatwindow.h"
 
 #include "net/manaserv/connection.h"
 #include "net/manaserv/messagein.h"
diff --git a/src/net/manaserv/playerhandler.cpp b/src/net/manaserv/playerhandler.cpp
index 292915581..54d6dc7de 100644
--- a/src/net/manaserv/playerhandler.cpp
+++ b/src/net/manaserv/playerhandler.cpp
@@ -32,7 +32,7 @@
 #include "playerinfo.h"
 #include "configuration.h"
 
-#include "gui/chat.h"
+#include "gui/chatwindow.h"
 #include "gui/gui.h"
 #include "gui/okdialog.h"
 #include "gui/viewport.h"
diff --git a/src/net/tmwa/buysellhandler.cpp b/src/net/tmwa/buysellhandler.cpp
index 07d5bcc96..e1f6cfd22 100644
--- a/src/net/tmwa/buysellhandler.cpp
+++ b/src/net/tmwa/buysellhandler.cpp
@@ -31,8 +31,8 @@
 #include "playerinfo.h"
 #include "shopitem.h"
 
-#include "gui/buy.h"
-#include "gui/buysell.h"
+#include "gui/buydialog.h"
+#include "gui/buyselldialog.h"
 #include "gui/sell.h"
 #include "gui/shopwindow.h"
 
diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp
index 5bd3df339..d8a842003 100644
--- a/src/net/tmwa/chathandler.cpp
+++ b/src/net/tmwa/chathandler.cpp
@@ -31,7 +31,7 @@
 #include "playerrelations.h"
 #include "log.h"
 
-#include "gui/chat.h"
+#include "gui/chatwindow.h"
 #include "gui/shopwindow.h"
 
 #include "gui/widgets/chattab.h"
diff --git a/src/spellmanager.cpp b/src/spellmanager.cpp
index 31451c09a..f4462c732 100644
--- a/src/spellmanager.cpp
+++ b/src/spellmanager.cpp
@@ -28,7 +28,7 @@
 #include "localplayer.h"
 #include "playerinfo.h"
 
-#include "gui/chat.h"
+#include "gui/chatwindow.h"
 
 #include "net/net.h"
 #include "net/playerhandler.h"
diff --git a/src/spellshortcut.cpp b/src/spellshortcut.cpp
index 89a82401e..1559cfa47 100644
--- a/src/spellshortcut.cpp
+++ b/src/spellshortcut.cpp
@@ -26,7 +26,7 @@
 #include "spellshortcut.h"
 #include "localplayer.h"
 
-#include "gui/chat.h"
+#include "gui/chatwindow.h"
 #include "gui/widgets/chattab.h"
 
 #include "net/inventoryhandler.h"