From 6442fd9b685c8bb1b5da241a4b7befa3fdbca018 Mon Sep 17 00:00:00 2001 From: Björn Steinbrink Date: Sun, 28 Aug 2005 20:31:56 +0000 Subject: Prepare our source so that it'll survive a guichan header cleanup, should it ever happen... --- ChangeLog | 21 +++++++++++++++++++-- src/gui/browserbox.cpp | 2 ++ src/gui/buddywindow.cpp | 5 ++++- src/gui/buddywindow.h | 6 +++--- src/gui/buysell.h | 4 +++- src/gui/char_server.h | 1 + src/gui/chargedialog.h | 2 ++ src/gui/chat.cpp | 1 + src/gui/chat.h | 3 +++ src/gui/confirm_dialog.h | 2 ++ src/gui/equipmentwindow.h | 2 ++ src/gui/focushandler.h | 4 ++++ src/gui/gui.cpp | 1 + src/gui/gui.h | 1 + src/gui/help.h | 2 ++ src/gui/inttextbox.cpp | 2 ++ src/gui/inventorywindow.cpp | 2 ++ src/gui/inventorywindow.h | 2 ++ src/gui/item_amount.h | 2 ++ src/gui/itemcontainer.cpp | 2 ++ src/gui/listbox.cpp | 4 ++++ src/gui/newskill.h | 2 ++ src/gui/npc_text.h | 2 ++ src/gui/ok_dialog.h | 2 ++ src/gui/passwordfield.cpp | 3 +++ src/gui/requesttrade.h | 2 ++ src/gui/setup.h | 1 + src/gui/stats.h | 2 ++ src/gui/status.h | 2 ++ src/gui/textbox.cpp | 1 + src/gui/textfield.cpp | 2 ++ src/gui/trade.h | 2 ++ src/gui/updatewindow.h | 2 ++ src/openglgraphics.cpp | 2 ++ 34 files changed, 89 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 91ceae77..3858348c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,27 @@ -2005-08-27 Björn Steinbrink - +2005-08-28 Björn Steinbrink + + * src/openglgraphics.cpp, src/gui/browserbox.cpp, + src/gui/buddywindow.cpp, src/gui/buddywindow.h, src/gui/buysell.h, + src/gui/char_server.h, src/gui/chargedialog.h, src/gui/chat.cpp, + src/gui/chat.h, src/gui/confirm_dialog.h, src/gui/equipmentwindow.h, + src/gui/focushandler.h, src/gui/gui.cpp, src/gui/gui.h, + src/gui/help.h, src/gui/inttextbox.cpp, src/gui/inventorywindow.cpp, + src/gui/inventorywindow.h, src/gui/item_amount.h, + src/gui/itemcontainer.cpp, src/gui/listbox.cpp, src/gui/newskill.h, + src/gui/npc_text.h, src/gui/ok_dialog.h, src/gui/passwordfield.cpp, + src/gui/requesttrade.h, src/gui/setup.h, src/gui/stats.h, + src/gui/status.h, src/gui/textbox.cpp, src/gui/textfield.cpp, + src/gui/trade.h, src/gui/updatewindow.h: Add #include's that just + weren't necessary because the guichan folks don't provide clean + headers. This is preparatory for the case that they ever do. ;) * src/gui/gui.cpp, src/gui/gui.h: Create a GuiConfigListener class. * src/gui/window.h: Small cleanup. * src/gui/window.cpp, src/gui/window.h: Create a static ConfigListener for the Window class. (Fixes each Window listening to config changes, although they only affect a static class member.) + +2005-08-27 Björn Steinbrink + * src/gui/npc.cpp: Fix a memory leak. * src/game.cpp, src/gui/npc.cpp, src/gui/npc.h: Fix the bug when sometimes the last entry in npc list windows is missing. The network diff --git a/src/gui/browserbox.cpp b/src/gui/browserbox.cpp index 6fc91858..5a87fa5b 100644 --- a/src/gui/browserbox.cpp +++ b/src/gui/browserbox.cpp @@ -23,7 +23,9 @@ #include "browserbox.h" +#include #include +#include #include "linkhandler.h" #include "gui.h" diff --git a/src/gui/buddywindow.cpp b/src/gui/buddywindow.cpp index f587e020..0fec4e8c 100644 --- a/src/gui/buddywindow.cpp +++ b/src/gui/buddywindow.cpp @@ -22,9 +22,12 @@ */ #include "buddywindow.h" -#include "scrollarea.h" + +#include + #include "button.h" #include "chat.h" +#include "scrollarea.h" extern ChatWindow *chatWindow; diff --git a/src/gui/buddywindow.h b/src/gui/buddywindow.h index 4468f74e..5526e13f 100644 --- a/src/gui/buddywindow.h +++ b/src/gui/buddywindow.h @@ -24,12 +24,12 @@ #ifndef _TMW_BUDDYWINDOW_H #define _TMW_BUDDYWINDOW_H -#include -#include -#include +#include #include "window.h" +#include "../guichanfwd.h" + #include "../resources/buddylist.h" /** diff --git a/src/gui/buysell.h b/src/gui/buysell.h index 4ff4f768..f1c81b60 100644 --- a/src/gui/buysell.h +++ b/src/gui/buysell.h @@ -24,10 +24,12 @@ #ifndef _TMW_BUYSELL_H #define _TMW_BUYSELL_H -#include +#include #include "window.h" +#include "../guichanfwd.h" + /** * A dialog to choose between buying or selling at a shop. * diff --git a/src/gui/char_server.h b/src/gui/char_server.h index 2457634d..ec2e90d1 100644 --- a/src/gui/char_server.h +++ b/src/gui/char_server.h @@ -24,6 +24,7 @@ #ifndef _CHAR_SEL_SERVER_H #define _CHAR_SEL_SERVER_H +#include #include #include "window.h" diff --git a/src/gui/chargedialog.h b/src/gui/chargedialog.h index de1169b0..c42e06ec 100644 --- a/src/gui/chargedialog.h +++ b/src/gui/chargedialog.h @@ -23,6 +23,8 @@ #ifndef _TMW_CHARGE_H #define _TMW_CHARGE_H +#include + #include "window.h" class ProgressBar; diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp index ca24ac47..72de3c83 100644 --- a/src/gui/chat.cpp +++ b/src/gui/chat.cpp @@ -24,6 +24,7 @@ #include "chat.h" #include +#include #include "browserbox.h" #include "chatinput.h" diff --git a/src/gui/chat.h b/src/gui/chat.h index 248aabc6..1766bd08 100644 --- a/src/gui/chat.h +++ b/src/gui/chat.h @@ -28,6 +28,9 @@ #include #include +#include +#include + #include "window.h" #include "../guichanfwd.h" diff --git a/src/gui/confirm_dialog.h b/src/gui/confirm_dialog.h index cec13cc5..457cd748 100644 --- a/src/gui/confirm_dialog.h +++ b/src/gui/confirm_dialog.h @@ -24,6 +24,8 @@ #ifndef _TMW_OPTION_DIALOG_H #define _TMW_OPTION_DIALOG_H +#include + #include "window.h" #include "../guichanfwd.h" diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h index 66ee420f..0470ba6f 100644 --- a/src/gui/equipmentwindow.h +++ b/src/gui/equipmentwindow.h @@ -24,6 +24,8 @@ #ifndef _TMW_EQUIPMENT_H #define _TMW_EQUIPMENT_H +#include + #include "window.h" class Spriteset; diff --git a/src/gui/focushandler.h b/src/gui/focushandler.h index 82476d17..6c9d77cc 100644 --- a/src/gui/focushandler.h +++ b/src/gui/focushandler.h @@ -24,8 +24,12 @@ #ifndef _TMW_FOCUSHANDLER_H #define _TMW_FOCUSHANDLER_H +#include + #include +#include "../guichanfwd.h" + /** * The focus handler. This focus handler does exactly the same as the Guichan * focus handler, but keeps a stack of modal widgets to be able to handle diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 97bc8153..1c2b2063 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -24,6 +24,7 @@ #include "gui.h" #include +#include #include #ifdef USE_OPENGL diff --git a/src/gui/gui.h b/src/gui/gui.h index 959fa2ed..e612a7fe 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -25,6 +25,7 @@ #define _TMW_GUI #include +#include #include "../guichanfwd.h" diff --git a/src/gui/help.h b/src/gui/help.h index d2bada56..6a0c6551 100644 --- a/src/gui/help.h +++ b/src/gui/help.h @@ -24,6 +24,8 @@ #ifndef _TMW_HELP_H #define _TMW_HELP_H +#include + #include "window.h" #include "linkhandler.h" diff --git a/src/gui/inttextbox.cpp b/src/gui/inttextbox.cpp index 781fb580..1f26433d 100644 --- a/src/gui/inttextbox.cpp +++ b/src/gui/inttextbox.cpp @@ -25,6 +25,8 @@ #include +#include + IntTextBox::IntTextBox(): value(0) { diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp index 9ed6bb75..b89f19a3 100644 --- a/src/gui/inventorywindow.cpp +++ b/src/gui/inventorywindow.cpp @@ -26,6 +26,8 @@ #include #include +#include + #include #include "button.h" diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h index cec4aa15..c45245d6 100644 --- a/src/gui/inventorywindow.h +++ b/src/gui/inventorywindow.h @@ -24,6 +24,8 @@ #ifndef _TMW_INVENTORYWINDOW_H #define _TMW_INVENTORYWINDOW_H +#include + #include "window.h" #include "../guichanfwd.h" diff --git a/src/gui/item_amount.h b/src/gui/item_amount.h index 01004927..8c5260bf 100644 --- a/src/gui/item_amount.h +++ b/src/gui/item_amount.h @@ -26,6 +26,8 @@ #include +#include + #include "window.h" #include "../guichanfwd.h" diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp index 7c7baddc..81a85b8d 100644 --- a/src/gui/itemcontainer.cpp +++ b/src/gui/itemcontainer.cpp @@ -25,6 +25,8 @@ #include +#include + #include "../graphics.h" #include "../inventory.h" #include "../item.h" diff --git a/src/gui/listbox.cpp b/src/gui/listbox.cpp index 1e266fb8..5b20bb55 100644 --- a/src/gui/listbox.cpp +++ b/src/gui/listbox.cpp @@ -23,6 +23,10 @@ #include "listbox.h" +#include +#include +#include + ListBox::ListBox(): gcn::ListBox() { diff --git a/src/gui/newskill.h b/src/gui/newskill.h index cdd82ad2..afcd0eec 100644 --- a/src/gui/newskill.h +++ b/src/gui/newskill.h @@ -24,6 +24,8 @@ #ifndef _TMW_NSKILL_H #define _TMW_NSKILL_H +#include + #include "window.h" #include "../guichanfwd.h" diff --git a/src/gui/npc_text.h b/src/gui/npc_text.h index 2930a00a..41301aa9 100644 --- a/src/gui/npc_text.h +++ b/src/gui/npc_text.h @@ -26,6 +26,8 @@ #include +#include + #include "window.h" #include "../guichanfwd.h" diff --git a/src/gui/ok_dialog.h b/src/gui/ok_dialog.h index 1db3dd4e..6dcf1e6a 100644 --- a/src/gui/ok_dialog.h +++ b/src/gui/ok_dialog.h @@ -24,6 +24,8 @@ #ifndef _OK_DIALOG_H #define _OK_DIALOG_H +#include + #include "window.h" #include "../guichanfwd.h" diff --git a/src/gui/passwordfield.cpp b/src/gui/passwordfield.cpp index 51316fa8..7f27607b 100644 --- a/src/gui/passwordfield.cpp +++ b/src/gui/passwordfield.cpp @@ -23,6 +23,9 @@ #include "passwordfield.h" +#include +#include + PasswordField::PasswordField(const std::string& text): TextField(text) diff --git a/src/gui/requesttrade.h b/src/gui/requesttrade.h index b6783331..8c9ac29a 100644 --- a/src/gui/requesttrade.h +++ b/src/gui/requesttrade.h @@ -26,6 +26,8 @@ #include +#include + #include "window.h" #include "../guichanfwd.h" diff --git a/src/gui/setup.h b/src/gui/setup.h index cfe709dc..3fa41dd4 100644 --- a/src/gui/setup.h +++ b/src/gui/setup.h @@ -26,6 +26,7 @@ #include +#include #include #include "window.h" diff --git a/src/gui/stats.h b/src/gui/stats.h index 3d7d0f52..a6b799ce 100644 --- a/src/gui/stats.h +++ b/src/gui/stats.h @@ -26,6 +26,8 @@ #include +#include + #include "window.h" #include "../guichanfwd.h" diff --git a/src/gui/status.h b/src/gui/status.h index 45ccb75d..d6abd7af 100644 --- a/src/gui/status.h +++ b/src/gui/status.h @@ -26,6 +26,8 @@ #include +#include + #include "window.h" #include "../guichanfwd.h" diff --git a/src/gui/textbox.cpp b/src/gui/textbox.cpp index 315e0c0b..329813e5 100644 --- a/src/gui/textbox.cpp +++ b/src/gui/textbox.cpp @@ -26,6 +26,7 @@ #include #include +#include TextBox::TextBox(): gcn::TextBox() diff --git a/src/gui/textfield.cpp b/src/gui/textfield.cpp index 5055c328..ec3b55b4 100644 --- a/src/gui/textfield.cpp +++ b/src/gui/textfield.cpp @@ -23,6 +23,8 @@ #include "textfield.h" +#include + #include "../graphics.h" #include "../graphic/imagerect.h" diff --git a/src/gui/trade.h b/src/gui/trade.h index 6fdfcb92..7cb350da 100644 --- a/src/gui/trade.h +++ b/src/gui/trade.h @@ -24,6 +24,8 @@ #ifndef _TMW_TRADE_H #define _TMW_TRADE_H +#include + #include "window.h" #include "../guichanfwd.h" diff --git a/src/gui/updatewindow.h b/src/gui/updatewindow.h index c062b484..fa69bd4b 100644 --- a/src/gui/updatewindow.h +++ b/src/gui/updatewindow.h @@ -24,6 +24,8 @@ #ifndef _UPDATERWINDOW_H #define _UPDATERWINDOW_H +#include + #include "window.h" #include "../guichanfwd.h" diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp index 3376d4ae..cc85c0ef 100644 --- a/src/openglgraphics.cpp +++ b/src/openglgraphics.cpp @@ -27,6 +27,8 @@ #include +#include + #include "log.h" #include "resources/image.h" -- cgit v1.2.3-70-g09d2