24 files changed, 44 insertions, 44 deletions
diff --git a/manaplus.cbp b/manaplus.cbp
index 352aa6f6f..bc131d50b 100644
--- a/manaplus.cbp
+++ b/manaplus.cbp
@@ -191,8 +191,8 @@
 		<Unit filename="src\gui\itempopup.h" />
 		<Unit filename="src\gui\killstats.cpp" />
 		<Unit filename="src\gui\killstats.h" />
-		<Unit filename="src\gui\login.cpp" />
-		<Unit filename="src\gui\login.h" />
+		<Unit filename="src\gui\logindialog.cpp" />
+		<Unit filename="src\gui\logindialog.h" />
 		<Unit filename="src\gui\minimap.cpp" />
 		<Unit filename="src\gui\minimap.h" />
 		<Unit filename="src\gui\ministatus.cpp" />
@@ -215,8 +215,8 @@
 		<Unit filename="src\gui\register.h" />
 		<Unit filename="src\gui\sdlinput.cpp" />
 		<Unit filename="src\gui\sdlinput.h" />
-		<Unit filename="src\gui\sell.cpp" />
-		<Unit filename="src\gui\sell.h" />
+		<Unit filename="src\gui\selldialog.cpp" />
+		<Unit filename="src\gui\selldialog.h" />
 		<Unit filename="src\gui\serverdialog.cpp" />
 		<Unit filename="src\gui\serverdialog.h" />
 		<Unit filename="src\gui\setup.cpp" />
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9a466a57d..825cecd01 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -261,8 +261,8 @@ SET(SRCS
     gui/killstats.h
     gui/itemamountwindow.cpp
     gui/itemamountwindow.h
-    gui/login.cpp
-    gui/login.h
+    gui/logindialog.cpp
+    gui/logindialog.h
     gui/minimap.cpp
     gui/minimap.h
     gui/ministatus.cpp
@@ -291,8 +291,8 @@ SET(SRCS
     gui/register.h
     gui/sdlinput.cpp
     gui/sdlinput.h
-    gui/sell.cpp
-    gui/sell.h
+    gui/selldialog.cpp
+    gui/selldialog.h
     gui/serverdialog.cpp
     gui/serverdialog.h
     gui/setup.cpp
@@ -337,8 +337,8 @@ SET(SRCS
     gui/textpopup.h
     gui/theme.cpp
     gui/theme.h
-    gui/trade.cpp
-    gui/trade.h
+    gui/tradewindow.cpp
+    gui/tradewindow.h
     gui/unregisterdialog.cpp
     gui/unregisterdialog.h
     gui/updatewindow.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 68393ab44..956595304 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -156,8 +156,8 @@ manaplus_SOURCES = gui/widgets/avatarlistbox.cpp \
 	      gui/statuspopup.h \
 	      gui/killstats.cpp \
 	      gui/killstats.h \
-	      gui/login.cpp \
-	      gui/login.h \
+	      gui/logindialog.cpp \
+	      gui/logindialog.h \
 	      gui/minimap.cpp \
 	      gui/minimap.h \
 	      gui/ministatus.cpp \
@@ -186,8 +186,8 @@ manaplus_SOURCES = gui/widgets/avatarlistbox.cpp \
 	      gui/register.h \
 	      gui/sdlinput.cpp \
 	      gui/sdlinput.h \
-	      gui/sell.cpp \
-	      gui/sell.h \
+	      gui/selldialog.cpp \
+	      gui/selldialog.h \
 	      gui/serverdialog.cpp \
 	      gui/serverdialog.h \
 	      gui/setup.cpp \
@@ -232,8 +232,8 @@ manaplus_SOURCES = gui/widgets/avatarlistbox.cpp \
 	      gui/textpopup.h \
 	      gui/theme.cpp \
 	      gui/theme.h \
-	      gui/trade.cpp \
-	      gui/trade.h \
+	      gui/tradewindow.cpp \
+	      gui/tradewindow.h \
 	      gui/unregisterdialog.cpp \
 	      gui/unregisterdialog.h \
 	      gui/updatewindow.cpp \
diff --git a/src/being.cpp b/src/being.cpp
index 8a9d3c1e1..5e5fd3bdc 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -46,7 +46,7 @@
 #include "gui/gui.h"
 #include "gui/npcdialog.h"
 #include "gui/npcpostdialog.h"
-#include "gui/sell.h"
+#include "gui/selldialog.h"
 #include "gui/socialwindow.h"
 #include "gui/speechbubble.h"
 #include "gui/theme.h"
diff --git a/src/client.cpp b/src/client.cpp
index 8bfebf58d..4bd321712 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -48,12 +48,12 @@
 #include "gui/charselectdialog.h"
 #include "gui/connectiondialog.h"
 #include "gui/gui.h"
-#include "gui/login.h"
+#include "gui/logindialog.h"
 #include "gui/okdialog.h"
 #include "gui/quitdialog.h"
 #include "gui/register.h"
 #include "gui/npcdialog.h"
-#include "gui/sell.h"
+#include "gui/selldialog.h"
 #include "gui/sdlinput.h"
 #include "gui/serverdialog.h"
 #include "gui/setup.h"
diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp
index 41b901997..9371fd493 100644
--- a/src/commandhandler.cpp
+++ b/src/commandhandler.cpp
@@ -36,7 +36,7 @@
 #include "gui/outfitwindow.h"
 #include "gui/shopwindow.h"
 #include "gui/socialwindow.h"
-#include "gui/trade.h"
+#include "gui/tradewindow.h"
 #include "gui/sdlfont.h"
 
 #include "gui/widgets/channeltab.h"
diff --git a/src/game.cpp b/src/game.cpp
index 47fcf30c9..999a89664 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -72,7 +72,7 @@
 #include "gui/statuswindow.h"
 #include "gui/quitdialog.h"
 #include "gui/textdialog.h"
-#include "gui/trade.h"
+#include "gui/tradewindow.h"
 #include "gui/viewport.h"
 #include "gui/windowmenu.h"
 #include "gui/whoisonline.h"
diff --git a/src/gui/buydialog.cpp b/src/gui/buydialog.cpp
index fe504413c..00602e6f2 100644
--- a/src/gui/buydialog.cpp
+++ b/src/gui/buydialog.cpp
@@ -26,7 +26,7 @@
 #include "units.h"
 
 #include "gui/setup.h"
-#include "gui/trade.h"
+#include "gui/tradewindow.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/label.h"
diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp
index 0e12f024a..bf4225df9 100644
--- a/src/gui/charselectdialog.cpp
+++ b/src/gui/charselectdialog.cpp
@@ -32,7 +32,7 @@
 #include "gui/changepassworddialog.h"
 #include "gui/charcreatedialog.h"
 #include "gui/confirmdialog.h"
-#include "gui/login.h"
+#include "gui/logindialog.h"
 #include "gui/okdialog.h"
 #include "gui/sdlinput.h"
 #include "gui/textdialog.h"
diff --git a/src/gui/itemamountwindow.cpp b/src/gui/itemamountwindow.cpp
index 751578d9b..5506f1690 100644
--- a/src/gui/itemamountwindow.cpp
+++ b/src/gui/itemamountwindow.cpp
@@ -25,7 +25,7 @@
 #include "item.h"
 #include "keyboardconfig.h"
 
-#include "gui/trade.h"
+#include "gui/tradewindow.h"
 #include "net/inventoryhandler.h"
 #include "gui/itempopup.h"
 #include "net/net.h"
diff --git a/src/gui/login.cpp b/src/gui/logindialog.cpp
index d910d37bc..e32caeb13 100644
--- a/src/gui/login.cpp
+++ b/src/gui/logindialog.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/login.h"
+#include "gui/logindialog.h"
 
 #include "client.h"
 #include "configuration.h"
diff --git a/src/gui/login.h b/src/gui/logindialog.h
index 9a65e9718..ade45c211 100644
--- a/src/gui/login.h
+++ b/src/gui/logindialog.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LOGIN_H
-#define LOGIN_H
+#ifndef LOGINDIALOG_H
+#define LOGINDIALOG_H
 
 #include "gui/widgets/window.h"
 
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 73fd360fa..9048c53b2 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -44,11 +44,11 @@
 #include "gui/itemamountwindow.h"
 #include "gui/ministatus.h"
 #include "gui/outfitwindow.h"
-#include "gui/sell.h"
+#include "gui/selldialog.h"
 #include "gui/socialwindow.h"
 #include "gui/textcommandeditor.h"
 #include "gui/textdialog.h"
-#include "gui/trade.h"
+#include "gui/tradewindow.h"
 #include "gui/viewport.h"
 #include "gui/windowmenu.h"
 
diff --git a/src/gui/register.cpp b/src/gui/register.cpp
index 9ebc82fb7..4bce1b8b8 100644
--- a/src/gui/register.cpp
+++ b/src/gui/register.cpp
@@ -26,7 +26,7 @@
 #include "configuration.h"
 #include "log.h"
 
-#include "gui/login.h"
+#include "gui/logindialog.h"
 #include "gui/okdialog.h"
 
 #include "gui/widgets/button.h"
diff --git a/src/gui/sell.cpp b/src/gui/selldialog.cpp
index 1a1fa60e0..e1ed7c1b0 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/selldialog.cpp
@@ -20,13 +20,13 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/sell.h"
+#include "gui/selldialog.h"
 
 #include "shopitem.h"
 #include "units.h"
 
 #include "gui/setup.h"
-#include "gui/trade.h"
+#include "gui/tradewindow.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/label.h"
diff --git a/src/gui/sell.h b/src/gui/selldialog.h
index 86343a953..e40dd50c2 100644
--- a/src/gui/sell.h
+++ b/src/gui/selldialog.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SELL_H
-#define SELL_H
+#ifndef SELLDIALOG_H
+#define SELLDIALOG_H
 
 #include "gui/widgets/window.h"
 
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index 3f4e2650f..48b364264 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -29,7 +29,7 @@
 #include "main.h"
 
 #include "gui/gui.h"
-#include "gui/login.h"
+#include "gui/logindialog.h"
 #include "gui/okdialog.h"
 #include "gui/sdlinput.h"
 #include "gui/theme.h"
diff --git a/src/gui/shopwindow.cpp b/src/gui/shopwindow.cpp
index 60d48a4c7..72553ea01 100644
--- a/src/gui/shopwindow.cpp
+++ b/src/gui/shopwindow.cpp
@@ -24,9 +24,9 @@
 
 #include "gui/buydialog.h"
 #include "gui/itemamountwindow.h"
-#include "gui/sell.h"
+#include "gui/selldialog.h"
 #include "gui/setup.h"
-#include "gui/trade.h"
+#include "gui/tradewindow.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/chattab.h"
diff --git a/src/gui/trade.cpp b/src/gui/tradewindow.cpp
index 38aaecb83..279f6c178 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/tradewindow.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/trade.h"
+#include "gui/tradewindow.h"
 
 #include "inventory.h"
 #include "item.h"
diff --git a/src/gui/trade.h b/src/gui/tradewindow.h
index 67515c013..6865434b6 100644
--- a/src/gui/trade.h
+++ b/src/gui/tradewindow.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TRADE_H
-#define TRADE_H
+#ifndef TRADEWINDOW_H
+#define TRADEWINDOW_H
 
 #include "guichanfwd.h"
 
diff --git a/src/net/manaserv/buysellhandler.cpp b/src/net/manaserv/buysellhandler.cpp
index cd73f03f5..97ec36654 100644
--- a/src/net/manaserv/buysellhandler.cpp
+++ b/src/net/manaserv/buysellhandler.cpp
@@ -30,7 +30,7 @@
 
 #include "gui/buydialog.h"
 #include "gui/chatwindow.h"
-#include "gui/sell.h"
+#include "gui/selldialog.h"
 
 #include "net/messagein.h"
 #include "net/net.h"
diff --git a/src/net/manaserv/tradehandler.cpp b/src/net/manaserv/tradehandler.cpp
index cd3a21aca..5c91b5457 100644
--- a/src/net/manaserv/tradehandler.cpp
+++ b/src/net/manaserv/tradehandler.cpp
@@ -30,7 +30,7 @@
 #include "playerrelations.h"
 
 #include "gui/confirmdialog.h"
-#include "gui/trade.h"
+#include "gui/tradewindow.h"
 
 #include "net/net.h"
 
diff --git a/src/net/tmwa/buysellhandler.cpp b/src/net/tmwa/buysellhandler.cpp
index e1f6cfd22..5113f0303 100644
--- a/src/net/tmwa/buysellhandler.cpp
+++ b/src/net/tmwa/buysellhandler.cpp
@@ -33,7 +33,7 @@
 
 #include "gui/buydialog.h"
 #include "gui/buyselldialog.h"
-#include "gui/sell.h"
+#include "gui/selldialog.h"
 #include "gui/shopwindow.h"
 
 #include "gui/widgets/chattab.h"
diff --git a/src/net/tmwa/tradehandler.cpp b/src/net/tmwa/tradehandler.cpp
index b7cf70661..cc7ad6e27 100644
--- a/src/net/tmwa/tradehandler.cpp
+++ b/src/net/tmwa/tradehandler.cpp
@@ -31,7 +31,7 @@
 #include "playerrelations.h"
 
 #include "gui/confirmdialog.h"
-#include "gui/trade.h"
+#include "gui/tradewindow.h"
 
 #include "net/inventoryhandler.h"
 #include "net/messagein.h"