summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/buydialog.cpp (renamed from src/gui/buy.cpp)2
-rw-r--r--src/gui/buydialog.h (renamed from src/gui/buy.h)0
-rw-r--r--src/gui/buyselldialog.cpp (renamed from src/gui/buysell.cpp)2
-rw-r--r--src/gui/buyselldialog.h (renamed from src/gui/buysell.h)0
-rw-r--r--src/gui/chatwindow.cpp (renamed from src/gui/chat.cpp)2
-rw-r--r--src/gui/chatwindow.h (renamed from src/gui/chat.h)0
-rw-r--r--src/gui/helpwindow.cpp (renamed from src/gui/help.cpp)2
-rw-r--r--src/gui/helpwindow.h (renamed from src/gui/help.h)0
-rw-r--r--src/gui/inventorywindow.cpp2
-rw-r--r--src/gui/itemamountwindow.cpp (renamed from src/gui/itemamount.cpp)4
-rw-r--r--src/gui/itemamountwindow.h (renamed from src/gui/itemamount.h)0
-rw-r--r--src/gui/logindialog.cpp (renamed from src/gui/login.cpp)2
-rw-r--r--src/gui/logindialog.h (renamed from src/gui/login.h)0
-rw-r--r--src/gui/ministatuswindow.cpp (renamed from src/gui/ministatus.cpp)2
-rw-r--r--src/gui/ministatuswindow.h (renamed from src/gui/ministatus.h)0
-rw-r--r--src/gui/outfitwindow.cpp2
-rw-r--r--src/gui/popupmenu.cpp4
-rw-r--r--src/gui/recorder.cpp2
-rw-r--r--src/gui/register.cpp2
-rw-r--r--src/gui/selldialog.cpp (renamed from src/gui/sell.cpp)2
-rw-r--r--src/gui/selldialog.h (renamed from src/gui/sell.h)0
-rw-r--r--src/gui/serverdialog.cpp2
-rw-r--r--src/gui/tradewindow.cpp (renamed from src/gui/trade.cpp)4
-rw-r--r--src/gui/tradewindow.h (renamed from src/gui/trade.h)0
-rw-r--r--src/gui/updaterwindow.cpp (renamed from src/gui/updatewindow.cpp)2
-rw-r--r--src/gui/updaterwindow.h (renamed from src/gui/updatewindow.h)0
-rw-r--r--src/gui/viewport.cpp2
-rw-r--r--src/gui/widgets/chattab.cpp2
-rw-r--r--src/gui/widgets/chattab.h2
-rw-r--r--src/gui/widgets/itemcontainer.cpp2
-rw-r--r--src/gui/widgets/whispertab.cpp2
31 files changed, 24 insertions, 24 deletions
diff --git a/src/gui/buy.cpp b/src/gui/buydialog.cpp
index 0ef187be..1f9781c4 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buydialog.cpp
@@ -19,7 +19,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "gui/buy.h"
+#include "gui/buydialog.h"
#include "client.h"
#include "playerinfo.h"
diff --git a/src/gui/buy.h b/src/gui/buydialog.h
index 2ecf89e1..2ecf89e1 100644
--- a/src/gui/buy.h
+++ b/src/gui/buydialog.h
diff --git a/src/gui/buysell.cpp b/src/gui/buyselldialog.cpp
index 4419ffcc..a0248650 100644
--- a/src/gui/buysell.cpp
+++ b/src/gui/buyselldialog.cpp
@@ -19,7 +19,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "buysell.h"
+#include "buyselldialog.h"
#include "playerinfo.h"
diff --git a/src/gui/buysell.h b/src/gui/buyselldialog.h
index 3408821a..3408821a 100644
--- a/src/gui/buysell.h
+++ b/src/gui/buyselldialog.h
diff --git a/src/gui/chat.cpp b/src/gui/chatwindow.cpp
index 92386e76..95323387 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chatwindow.cpp
@@ -19,7 +19,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "chat.h"
+#include "chatwindow.h"
#include "actorspritemanager.h"
#include "channel.h"
diff --git a/src/gui/chat.h b/src/gui/chatwindow.h
index c6acf532..c6acf532 100644
--- a/src/gui/chat.h
+++ b/src/gui/chatwindow.h
diff --git a/src/gui/help.cpp b/src/gui/helpwindow.cpp
index aca036c1..e059daaf 100644
--- a/src/gui/help.cpp
+++ b/src/gui/helpwindow.cpp
@@ -19,7 +19,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "gui/help.h"
+#include "gui/helpwindow.h"
#include "gui/setup.h"
diff --git a/src/gui/help.h b/src/gui/helpwindow.h
index add49ced..add49ced 100644
--- a/src/gui/help.h
+++ b/src/gui/helpwindow.h
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 0bf2b313..73b59d95 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/viewport.h"
diff --git a/src/gui/itemamount.cpp b/src/gui/itemamountwindow.cpp
index 43cdf1cf..58197092 100644
--- a/src/gui/itemamount.cpp
+++ b/src/gui/itemamountwindow.cpp
@@ -19,12 +19,12 @@
* 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"
-#include "gui/trade.h"
+#include "gui/tradewindow.h"
#include "gui/itempopup.h"
#include "gui/viewport.h"
diff --git a/src/gui/itemamount.h b/src/gui/itemamountwindow.h
index 81243444..81243444 100644
--- a/src/gui/itemamount.h
+++ b/src/gui/itemamountwindow.h
diff --git a/src/gui/login.cpp b/src/gui/logindialog.cpp
index b12e6a5d..abb5cff2 100644
--- a/src/gui/login.cpp
+++ b/src/gui/logindialog.cpp
@@ -19,7 +19,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 38e858f6..38e858f6 100644
--- a/src/gui/login.h
+++ b/src/gui/logindialog.h
diff --git a/src/gui/ministatus.cpp b/src/gui/ministatuswindow.cpp
index 2bdf79b4..c4400656 100644
--- a/src/gui/ministatus.cpp
+++ b/src/gui/ministatuswindow.cpp
@@ -19,7 +19,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "gui/ministatus.h"
+#include "gui/ministatuswindow.h"
#include "animatedsprite.h"
#include "configuration.h"
diff --git a/src/gui/ministatus.h b/src/gui/ministatuswindow.h
index 38025202..38025202 100644
--- a/src/gui/ministatus.h
+++ b/src/gui/ministatuswindow.h
diff --git a/src/gui/outfitwindow.cpp b/src/gui/outfitwindow.cpp
index 053c6659..3cb3e9d9 100644
--- a/src/gui/outfitwindow.cpp
+++ b/src/gui/outfitwindow.cpp
@@ -29,7 +29,7 @@
#include "log.h"
#include "playerinfo.h"
-#include "gui/chat.h"
+#include "gui/chatwindow.h"
#include "gui/widgets/button.h"
#include "gui/widgets/checkbox.h"
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 742d480d..4e994dc3 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -31,10 +31,10 @@
#include "playerinfo.h"
#include "playerrelations.h"
-#include "gui/chat.h"
+#include "gui/chatwindow.h"
#include "gui/equipmentwindow.h"
#include "gui/inventorywindow.h"
-#include "gui/itemamount.h"
+#include "gui/itemamountwindow.h"
#include "gui/widgets/browserbox.h"
diff --git a/src/gui/recorder.cpp b/src/gui/recorder.cpp
index 2345369e..da2ee80f 100644
--- a/src/gui/recorder.cpp
+++ b/src/gui/recorder.cpp
@@ -23,7 +23,7 @@
#include "client.h"
#include "event.h"
-#include "gui/chat.h"
+#include "gui/chatwindow.h"
#include "gui/widgets/button.h"
#include "gui/widgets/layout.h"
diff --git a/src/gui/register.cpp b/src/gui/register.cpp
index 9fbd8cc8..2b3dd1cc 100644
--- a/src/gui/register.cpp
+++ b/src/gui/register.cpp
@@ -25,7 +25,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 46bef092..f8b497ea 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/selldialog.cpp
@@ -19,7 +19,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "gui/sell.h"
+#include "gui/selldialog.h"
#include "client.h"
#include "playerinfo.h"
diff --git a/src/gui/sell.h b/src/gui/selldialog.h
index e28b0744..e28b0744 100644
--- a/src/gui/sell.h
+++ b/src/gui/selldialog.h
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index 2bb0e0dc..78a86d24 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -21,7 +21,7 @@
#include "gui/serverdialog.h"
-#include "chatlog.h"
+#include "chatlogger.h"
#include "client.h"
#include "configuration.h"
#include "gui.h"
diff --git a/src/gui/trade.cpp b/src/gui/tradewindow.cpp
index 37662bef..16b66c1d 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/tradewindow.cpp
@@ -19,7 +19,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "gui/trade.h"
+#include "gui/tradewindow.h"
#include "event.h"
#include "inventory.h"
@@ -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/widgets/button.h"
diff --git a/src/gui/trade.h b/src/gui/tradewindow.h
index f854d698..f854d698 100644
--- a/src/gui/trade.h
+++ b/src/gui/tradewindow.h
diff --git a/src/gui/updatewindow.cpp b/src/gui/updaterwindow.cpp
index 23d23b5e..54373f05 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updaterwindow.cpp
@@ -19,7 +19,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "gui/updatewindow.h"
+#include "gui/updaterwindow.h"
#include "client.h"
#include "configuration.h"
diff --git a/src/gui/updatewindow.h b/src/gui/updaterwindow.h
index a4dbf674..a4dbf674 100644
--- a/src/gui/updatewindow.h
+++ b/src/gui/updaterwindow.h
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 453f615e..e6115805 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -32,7 +32,7 @@
#include "textmanager.h"
#include "gui/gui.h"
-#include "gui/ministatus.h"
+#include "gui/ministatuswindow.h"
#include "gui/popupmenu.h"
#include "gui/beingpopup.h"
diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp
index 20aadfb7..ce9ee878 100644
--- a/src/gui/widgets/chattab.cpp
+++ b/src/gui/widgets/chattab.cpp
@@ -22,7 +22,7 @@
#include "gui/widgets/chattab.h"
#include "actorspritemanager.h"
-#include "chatlog.h"
+#include "chatlogger.h"
#include "commandhandler.h"
#include "configuration.h"
#include "localplayer.h"
diff --git a/src/gui/widgets/chattab.h b/src/gui/widgets/chattab.h
index 1b666da1..93636b8f 100644
--- a/src/gui/widgets/chattab.h
+++ b/src/gui/widgets/chattab.h
@@ -22,7 +22,7 @@
#ifndef CHATTAB_H
#define CHATTAB_H
-#include "gui/chat.h"
+#include "gui/chatwindow.h"
#include "gui/widgets/tab.h"
#include "gui/widgets/textfield.h"
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index d88a5747..27f952c4 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -27,7 +27,7 @@
#include "itemshortcut.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/gui/widgets/whispertab.cpp b/src/gui/widgets/whispertab.cpp
index c3674c54..6da9461d 100644
--- a/src/gui/widgets/whispertab.cpp
+++ b/src/gui/widgets/whispertab.cpp
@@ -21,7 +21,7 @@
#include "whispertab.h"
-#include "chatlog.h"
+#include "chatlogger.h"
#include "commandhandler.h"
#include "localplayer.h"