diff options
author | Andrei Karas <akaras@inbox.ru> | 2011-05-24 00:38:44 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2011-05-24 00:38:44 +0300 |
commit | d2c42029b98c665725768b891aa877eb3267664f (patch) | |
tree | b232b9a20e45ecb4e7ec2133d7806669054708a6 /src/gui/widgets | |
parent | fe39570810969993f51a0ff6045d0a5d4397a5e5 (diff) | |
download | manaplus-d2c42029b98c665725768b891aa877eb3267664f.tar.gz manaplus-d2c42029b98c665725768b891aa877eb3267664f.tar.bz2 manaplus-d2c42029b98c665725768b891aa877eb3267664f.tar.xz manaplus-d2c42029b98c665725768b891aa877eb3267664f.zip |
Add simple memory leak detector.
Can be enabled by configure option -enable-memdebug=yes.
Known issue: not all memory allocations hooked with it.
Diffstat (limited to 'src/gui/widgets')
50 files changed, 100 insertions, 0 deletions
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp index c1025e66d..c4737160b 100644 --- a/src/gui/widgets/avatarlistbox.cpp +++ b/src/gui/widgets/avatarlistbox.cpp @@ -40,6 +40,8 @@ #include <guichan/font.hpp> +#include "debug.h" + int AvatarListBox::instances = 0; Image *AvatarListBox::onlineIcon = 0; Image *AvatarListBox::offlineIcon = 0; diff --git a/src/gui/widgets/battletab.cpp b/src/gui/widgets/battletab.cpp index e5f8c0f77..e72c78ee0 100644 --- a/src/gui/widgets/battletab.cpp +++ b/src/gui/widgets/battletab.cpp @@ -39,6 +39,8 @@ #include "utils/gettext.h" #include "utils/stringutils.h" +#include "debug.h" + BattleTab::BattleTab() : ChatTab(_("Battle")) { diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp index 5d144c5a9..f3ee7270b 100644 --- a/src/gui/widgets/browserbox.cpp +++ b/src/gui/widgets/browserbox.cpp @@ -44,6 +44,8 @@ #include <algorithm> +#include "debug.h" + BrowserBox::BrowserBox(unsigned int mode, bool opaque): gcn::Widget(), mLinkHandler(0), diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp index c0f174b2c..ba3ac5f36 100644 --- a/src/gui/widgets/button.cpp +++ b/src/gui/widgets/button.cpp @@ -38,6 +38,8 @@ #include <guichan/exception.hpp> #include <guichan/font.hpp> +#include "debug.h" + int Button::mInstances = 0; float Button::mAlpha = 1.0; diff --git a/src/gui/widgets/channeltab.cpp b/src/gui/widgets/channeltab.cpp index df2df2790..87d87f7d1 100644 --- a/src/gui/widgets/channeltab.cpp +++ b/src/gui/widgets/channeltab.cpp @@ -29,6 +29,8 @@ #include "utils/gettext.h" +#include "debug.h" + ChannelTab::ChannelTab(Channel *channel) : ChatTab(channel->getName()), mChannel(channel) diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp index 3c277fc8d..76f74dec8 100644 --- a/src/gui/widgets/chattab.cpp +++ b/src/gui/widgets/chattab.cpp @@ -46,6 +46,8 @@ #include <guichan/widgets/tabbedarea.hpp> +#include "debug.h" + #define MAX_WORD_SIZE 50 ChatTab::ChatTab(const std::string &name) : diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp index 9832c0cbd..0422345f7 100644 --- a/src/gui/widgets/checkbox.cpp +++ b/src/gui/widgets/checkbox.cpp @@ -33,6 +33,8 @@ #include <guichan/actionlistener.hpp> +#include "debug.h" + int CheckBox::instances = 0; float CheckBox::mAlpha = 1.0; Image *CheckBox::checkBoxNormal; diff --git a/src/gui/widgets/container.cpp b/src/gui/widgets/container.cpp index 136dedb97..96cea7119 100644 --- a/src/gui/widgets/container.cpp +++ b/src/gui/widgets/container.cpp @@ -22,6 +22,8 @@ #include "gui/widgets/container.h" +#include "debug.h" + Container::Container() { setOpaque(false); diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp index 09c106632..8b6217da2 100644 --- a/src/gui/widgets/desktop.cpp +++ b/src/gui/widgets/desktop.cpp @@ -36,6 +36,8 @@ #include "utils/stringutils.h" +#include "debug.h" + Desktop::Desktop() : mWallpaper(0) { diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp index 3fe015e2f..681d7736e 100644 --- a/src/gui/widgets/dropdown.cpp +++ b/src/gui/widgets/dropdown.cpp @@ -39,6 +39,8 @@ #include <algorithm> +#include "debug.h" + int DropDown::instances = 0; Image *DropDown::buttons[2][2]; ImageRect DropDown::skin; diff --git a/src/gui/widgets/dropshortcutcontainer.cpp b/src/gui/widgets/dropshortcutcontainer.cpp index c3aaed829..0125558dc 100644 --- a/src/gui/widgets/dropshortcutcontainer.cpp +++ b/src/gui/widgets/dropshortcutcontainer.cpp @@ -43,6 +43,8 @@ #include "utils/stringutils.h" +#include "debug.h" + DropShortcutContainer::DropShortcutContainer(): ShortcutContainer(), mItemClicked(false), diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp index 6e15d4bf9..c45c0a44c 100644 --- a/src/gui/widgets/emoteshortcutcontainer.cpp +++ b/src/gui/widgets/emoteshortcutcontainer.cpp @@ -41,6 +41,8 @@ #include "utils/dtor.h" +#include "debug.h" + static const int MAX_ITEMS = 44; EmoteShortcutContainer::EmoteShortcutContainer(): diff --git a/src/gui/widgets/flowcontainer.cpp b/src/gui/widgets/flowcontainer.cpp index cf7c76d68..98b90cdc7 100644 --- a/src/gui/widgets/flowcontainer.cpp +++ b/src/gui/widgets/flowcontainer.cpp @@ -21,6 +21,8 @@ #include "flowcontainer.h" +#include "debug.h" + FlowContainer::FlowContainer(int boxWidth, int boxHeight): mBoxWidth(boxWidth), mBoxHeight(boxHeight), mGridWidth(1), mGridHeight(1) diff --git a/src/gui/widgets/horizontcontainer.cpp b/src/gui/widgets/horizontcontainer.cpp index 7863408b2..a04230871 100644 --- a/src/gui/widgets/horizontcontainer.cpp +++ b/src/gui/widgets/horizontcontainer.cpp @@ -21,6 +21,8 @@ #include "gui/widgets/horizontcontainer.h" +#include "debug.h" + HorizontContainer::HorizontContainer(int height, int spacing): mSpacing(spacing), mCount(0), diff --git a/src/gui/widgets/icon.cpp b/src/gui/widgets/icon.cpp index ba1fa7e26..2799080b6 100644 --- a/src/gui/widgets/icon.cpp +++ b/src/gui/widgets/icon.cpp @@ -27,6 +27,8 @@ #include "resources/image.h" #include "resources/resourcemanager.h" +#include "debug.h" + Icon::Icon(const std::string &file) : mImage(0) { diff --git a/src/gui/widgets/inttextfield.cpp b/src/gui/widgets/inttextfield.cpp index 1feedd503..021340fbe 100644 --- a/src/gui/widgets/inttextfield.cpp +++ b/src/gui/widgets/inttextfield.cpp @@ -26,6 +26,8 @@ #include "utils/stringutils.h" +#include "debug.h" + IntTextField::IntTextField(int def, int min, int max, bool enabled, int width): TextField(toString(def)), diff --git a/src/gui/widgets/inventoryfilter.cpp b/src/gui/widgets/inventoryfilter.cpp index 8c62849a1..a220fdb98 100644 --- a/src/gui/widgets/inventoryfilter.cpp +++ b/src/gui/widgets/inventoryfilter.cpp @@ -25,6 +25,8 @@ #include "log.h" +#include "debug.h" + InventoryFilter::InventoryFilter(std::string group, int height, int spacing): HorizontContainer(height, spacing), mGroup(group) diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp index 509c7b218..d4cecced2 100644 --- a/src/gui/widgets/itemcontainer.cpp +++ b/src/gui/widgets/itemcontainer.cpp @@ -50,6 +50,8 @@ #include <guichan/mouseinput.hpp> #include <guichan/selectionlistener.hpp> +#include "debug.h" + // TODO: Add support for adding items to the item shortcut window (global // itemShortcut). diff --git a/src/gui/widgets/itemlinkhandler.cpp b/src/gui/widgets/itemlinkhandler.cpp index 87d708cd0..0d6ef9990 100644 --- a/src/gui/widgets/itemlinkhandler.cpp +++ b/src/gui/widgets/itemlinkhandler.cpp @@ -32,6 +32,8 @@ #include "resources/itemdb.h" +#include "debug.h" + ItemLinkHandler::ItemLinkHandler() { mItemPopup = new ItemPopup; diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp index 513b7cb51..4d0758e3d 100644 --- a/src/gui/widgets/itemshortcutcontainer.cpp +++ b/src/gui/widgets/itemshortcutcontainer.cpp @@ -46,6 +46,8 @@ #include "utils/stringutils.h" +#include "debug.h" + ItemShortcutContainer::ItemShortcutContainer(unsigned number): ShortcutContainer(), mItemClicked(false), diff --git a/src/gui/widgets/label.cpp b/src/gui/widgets/label.cpp index 56c604e64..16b813dd5 100644 --- a/src/gui/widgets/label.cpp +++ b/src/gui/widgets/label.cpp @@ -22,6 +22,8 @@ #include "gui/theme.h" +#include "debug.h" + Label::Label() { } diff --git a/src/gui/widgets/layout.cpp b/src/gui/widgets/layout.cpp index 3dc4eb038..274c17d61 100644 --- a/src/gui/widgets/layout.cpp +++ b/src/gui/widgets/layout.cpp @@ -26,6 +26,8 @@ #include <cassert> +#include "debug.h" + ContainerPlacer ContainerPlacer::at(int x, int y) { return ContainerPlacer(mContainer, &mCell->at(x, y)); diff --git a/src/gui/widgets/layouthelper.cpp b/src/gui/widgets/layouthelper.cpp index 17d4cb651..cded6313a 100644 --- a/src/gui/widgets/layouthelper.cpp +++ b/src/gui/widgets/layouthelper.cpp @@ -22,6 +22,8 @@ #include "gui/widgets/layouthelper.h" +#include "debug.h" + LayoutHelper::LayoutHelper(gcn::Container *container): mContainer(container) { diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp index 574cadf94..ae75d469e 100644 --- a/src/gui/widgets/listbox.cpp +++ b/src/gui/widgets/listbox.cpp @@ -34,6 +34,8 @@ #include <guichan/key.hpp> #include <guichan/listmodel.hpp> +#include "debug.h" + float ListBox::mAlpha = 1.0; ListBox::ListBox(gcn::ListModel *listModel): diff --git a/src/gui/widgets/passwordfield.cpp b/src/gui/widgets/passwordfield.cpp index 57ba6f695..34639b063 100644 --- a/src/gui/widgets/passwordfield.cpp +++ b/src/gui/widgets/passwordfield.cpp @@ -22,6 +22,8 @@ #include "passwordfield.h" +#include "debug.h" + PasswordField::PasswordField(const std::string &text): TextField(text) { diff --git a/src/gui/widgets/playerbox.cpp b/src/gui/widgets/playerbox.cpp index e3905e523..2efaa2088 100644 --- a/src/gui/widgets/playerbox.cpp +++ b/src/gui/widgets/playerbox.cpp @@ -34,6 +34,8 @@ #include "utils/dtor.h" +#include "debug.h" + int PlayerBox::instances = 0; float PlayerBox::mAlpha = 1.0; ImageRect PlayerBox::background; diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp index bc15a4c2c..444d147ff 100644 --- a/src/gui/widgets/popup.cpp +++ b/src/gui/widgets/popup.cpp @@ -38,6 +38,8 @@ #include <guichan/exception.hpp> +#include "debug.h" + Popup::Popup(const std::string &name, const std::string &skin): mPopupName(name), mMinWidth(100), diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp index bbde65207..363bab319 100644 --- a/src/gui/widgets/progressbar.cpp +++ b/src/gui/widgets/progressbar.cpp @@ -38,6 +38,8 @@ #include <guichan/font.hpp> +#include "debug.h" + ImageRect ProgressBar::mBorder; int ProgressBar::mInstances = 0; float ProgressBar::mAlpha = 1.0; diff --git a/src/gui/widgets/progressindicator.cpp b/src/gui/widgets/progressindicator.cpp index 9ca6fe3b8..e885aa0ec 100644 --- a/src/gui/widgets/progressindicator.cpp +++ b/src/gui/widgets/progressindicator.cpp @@ -32,6 +32,8 @@ #include <guichan/widgets/label.hpp> +#include "debug.h" + ProgressIndicator::ProgressIndicator() { ImageSet *images = Theme::getImageSetFromTheme("progress-indicator.png", diff --git a/src/gui/widgets/radiobutton.cpp b/src/gui/widgets/radiobutton.cpp index ffea0f372..8e3fdb9bb 100644 --- a/src/gui/widgets/radiobutton.cpp +++ b/src/gui/widgets/radiobutton.cpp @@ -30,6 +30,8 @@ #include "resources/image.h" +#include "debug.h" + int RadioButton::instances = 0; float RadioButton::mAlpha = 1.0; Image *RadioButton::radioNormal; diff --git a/src/gui/widgets/resizegrip.cpp b/src/gui/widgets/resizegrip.cpp index 3350adc6a..cf017b9ec 100644 --- a/src/gui/widgets/resizegrip.cpp +++ b/src/gui/widgets/resizegrip.cpp @@ -32,6 +32,8 @@ #include <guichan/graphics.hpp> +#include "debug.h" + Image *ResizeGrip::gripImage = 0; int ResizeGrip::mInstances = 0; float ResizeGrip::mAlpha = 1.0; diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp index 59e323e94..e290be21a 100644 --- a/src/gui/widgets/scrollarea.cpp +++ b/src/gui/widgets/scrollarea.cpp @@ -34,6 +34,8 @@ #include "utils/dtor.h" +#include "debug.h" + int ScrollArea::instances = 0; float ScrollArea::mAlpha = 1.0; ImageRect ScrollArea::background; diff --git a/src/gui/widgets/setuptab.cpp b/src/gui/widgets/setuptab.cpp index 127cd0f96..e98e9c3ac 100644 --- a/src/gui/widgets/setuptab.cpp +++ b/src/gui/widgets/setuptab.cpp @@ -22,6 +22,8 @@ #include "gui/widgets/setuptab.h" +#include "debug.h" + SetupTab::SetupTab() { setOpaque(false); diff --git a/src/gui/widgets/shopitems.cpp b/src/gui/widgets/shopitems.cpp index 764f22a57..85ee0a181 100644 --- a/src/gui/widgets/shopitems.cpp +++ b/src/gui/widgets/shopitems.cpp @@ -26,6 +26,8 @@ #include "utils/dtor.h" +#include "debug.h" + ShopItems::ShopItems(bool mergeDuplicates) : mMergeDuplicates(mergeDuplicates) { diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp index 2965cba5d..81a3b7b58 100644 --- a/src/gui/widgets/shoplistbox.cpp +++ b/src/gui/widgets/shoplistbox.cpp @@ -38,6 +38,8 @@ #include <guichan/font.hpp> #include <guichan/listmodel.hpp> +#include "debug.h" + const int ITEM_ICON_SIZE = 32; float ShopListBox::mAlpha = 1.0; diff --git a/src/gui/widgets/shortcutcontainer.cpp b/src/gui/widgets/shortcutcontainer.cpp index a804f2658..d4065677a 100644 --- a/src/gui/widgets/shortcutcontainer.cpp +++ b/src/gui/widgets/shortcutcontainer.cpp @@ -28,6 +28,8 @@ #include "utils/stringutils.h" +#include "debug.h" + float ShortcutContainer::mAlpha = 1.0; ShortcutContainer::ShortcutContainer(): diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp index 8d452dfbf..7950f6a24 100644 --- a/src/gui/widgets/slider.cpp +++ b/src/gui/widgets/slider.cpp @@ -30,6 +30,8 @@ #include "resources/image.h" +#include "debug.h" + Image *Slider::hStart, *Slider::hMid, *Slider::hEnd, *Slider::hGrip; Image *Slider::vStart, *Slider::vMid, *Slider::vEnd, *Slider::vGrip; Image *Slider::hStartHi, *Slider::hMidHi, *Slider::hEndHi, *Slider::hGripHi; diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp index 8f4cee1ac..bfeecbfa0 100644 --- a/src/gui/widgets/spellshortcutcontainer.cpp +++ b/src/gui/widgets/spellshortcutcontainer.cpp @@ -48,6 +48,8 @@ #include "utils/gettext.h" #include "utils/stringutils.h" +#include "debug.h" + SpellShortcutContainer::SpellShortcutContainer(unsigned number): ShortcutContainer(), mSpellClicked(false), diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp index 5e4a147c0..7287d6a8e 100644 --- a/src/gui/widgets/tab.cpp +++ b/src/gui/widgets/tab.cpp @@ -39,6 +39,8 @@ #include <guichan/widgets/label.hpp> +#include "debug.h" + int Tab::mInstances = 0; float Tab::mAlpha = 1.0; diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp index e76ac6d57..da6dfb64c 100644 --- a/src/gui/widgets/tabbedarea.cpp +++ b/src/gui/widgets/tabbedarea.cpp @@ -29,6 +29,8 @@ #include <guichan/widgets/container.hpp> +#include "debug.h" + TabbedArea::TabbedArea() : gcn::TabbedArea(), mTabsWidth(0), diff --git a/src/gui/widgets/table.cpp b/src/gui/widgets/table.cpp index ab8b3a339..d5325679f 100644 --- a/src/gui/widgets/table.cpp +++ b/src/gui/widgets/table.cpp @@ -34,6 +34,8 @@ #include <guichan/graphics.hpp> #include <guichan/key.hpp> +#include "debug.h" + float GuiTable::mAlpha = 1.0; class GuiTableActionListener : public gcn::ActionListener diff --git a/src/gui/widgets/tablemodel.cpp b/src/gui/widgets/tablemodel.cpp index f1bfd0832..6c932a411 100644 --- a/src/gui/widgets/tablemodel.cpp +++ b/src/gui/widgets/tablemodel.cpp @@ -26,6 +26,8 @@ #include <guichan/widget.hpp> +#include "debug.h" + void TableModel::installListener(TableModelListener *listener) { if (listener) diff --git a/src/gui/widgets/textbox.cpp b/src/gui/widgets/textbox.cpp index 8c8804b67..f31c8d129 100644 --- a/src/gui/widgets/textbox.cpp +++ b/src/gui/widgets/textbox.cpp @@ -28,6 +28,8 @@ #include <sstream> +#include "debug.h" + TextBox::TextBox() : mTextColor(&Theme::getThemeColor(Theme::TEXT)) { diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp index 8e61bce3c..fd50ee4d5 100644 --- a/src/gui/widgets/textfield.cpp +++ b/src/gui/widgets/textfield.cpp @@ -40,6 +40,8 @@ #undef DELETE //Win32 compatibility hack +#include "debug.h" + int TextField::instances = 0; float TextField::mAlpha = 1.0; ImageRect TextField::skin; diff --git a/src/gui/widgets/textpreview.cpp b/src/gui/widgets/textpreview.cpp index 6d41bef06..07cf19b61 100644 --- a/src/gui/widgets/textpreview.cpp +++ b/src/gui/widgets/textpreview.cpp @@ -32,6 +32,8 @@ #include <typeinfo> +#include "debug.h" + float TextPreview::mAlpha = 1.0; TextPreview::TextPreview(const std::string &text): diff --git a/src/gui/widgets/tradetab.cpp b/src/gui/widgets/tradetab.cpp index 0767dc5fe..99a145d86 100644 --- a/src/gui/widgets/tradetab.cpp +++ b/src/gui/widgets/tradetab.cpp @@ -38,6 +38,8 @@ #include "utils/gettext.h" #include "utils/stringutils.h" +#include "debug.h" + TradeTab::TradeTab() : ChatTab(_("Trade")) { diff --git a/src/gui/widgets/vertcontainer.cpp b/src/gui/widgets/vertcontainer.cpp index ad5199f7c..d4cf0a13f 100644 --- a/src/gui/widgets/vertcontainer.cpp +++ b/src/gui/widgets/vertcontainer.cpp @@ -21,6 +21,8 @@ #include "gui/widgets/vertcontainer.h" +#include "debug.h" + VertContainer::VertContainer(int spacing): mSpacing(spacing), mCount(0) diff --git a/src/gui/widgets/whispertab.cpp b/src/gui/widgets/whispertab.cpp index 0cfd41bcb..bee30b969 100644 --- a/src/gui/widgets/whispertab.cpp +++ b/src/gui/widgets/whispertab.cpp @@ -35,6 +35,8 @@ #include "utils/gettext.h" #include "utils/stringutils.h" +#include "debug.h" + WhisperTab::WhisperTab(const std::string &nick) : ChatTab(nick), mNick(nick) diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp index df8599b95..2b6c4ef58 100644 --- a/src/gui/widgets/window.cpp +++ b/src/gui/widgets/window.cpp @@ -41,6 +41,8 @@ #include <guichan/exception.hpp> #include <guichan/focushandler.hpp> +#include "debug.h" + int Window::instances = 0; int Window::mouseResize = 0; diff --git a/src/gui/widgets/windowcontainer.cpp b/src/gui/widgets/windowcontainer.cpp index f68eb0220..5a3c16037 100644 --- a/src/gui/widgets/windowcontainer.cpp +++ b/src/gui/widgets/windowcontainer.cpp @@ -24,6 +24,8 @@ #include "utils/dtor.h" +#include "debug.h" + WindowContainer *windowContainer = NULL; void WindowContainer::logic() |