Rename some gui class files to real class names.

26 files changed, 32 insertions, 32 deletions

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"