summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIra Rice <irarice@gmail.com>2009-02-04 16:03:18 -0700
committerIra Rice <irarice@gmail.com>2009-02-04 16:03:18 -0700
commitd05b238a3c100ed0b5b31093f3d15bb039dde8d6 (patch)
tree0fcbc93ed21ef467b857ac37d065cf10972c5648
parent0bc83fbba9c8b5f2677b8183f16dd95645f3e998 (diff)
downloadmana-d05b238a3c100ed0b5b31093f3d15bb039dde8d6.tar.gz
mana-d05b238a3c100ed0b5b31093f3d15bb039dde8d6.tar.bz2
mana-d05b238a3c100ed0b5b31093f3d15bb039dde8d6.tar.xz
mana-d05b238a3c100ed0b5b31093f3d15bb039dde8d6.zip
Added destructors to some classes originally obtained from Legends of
Mazzeroth. At the moment, I think this is the last of the missing pointer deletes, but if more are found, then I'll add them to the proper classes and delete them. Signed-off-by: Ira Rice <irarice@gmail.com>
-rw-r--r--src/gui/itempopup.cpp11
-rw-r--r--src/gui/itempopup.h1
-rw-r--r--src/gui/speechbubble.cpp7
-rw-r--r--src/gui/speechbubble.h1
4 files changed, 20 insertions, 0 deletions
diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp
index 39a5ecf1..8651ede6 100644
--- a/src/gui/itempopup.cpp
+++ b/src/gui/itempopup.cpp
@@ -90,6 +90,17 @@ ItemPopup::ItemPopup():
setLocationRelativeTo(getParent());
}
+ItemPopup::~ItemPopup()
+{
+ delete mItemName;
+ delete mItemDesc;
+ delete mItemDescScroll;
+ delete mItemEffect;
+ delete mItemEffectScroll;
+ delete mItemWeight;
+ delete mItemWeightScroll;
+}
+
void ItemPopup::setItem(const ItemInfo &item)
{
mItemName->setCaption(item.getName());
diff --git a/src/gui/itempopup.h b/src/gui/itempopup.h
index d9d37264..95ab6ffa 100644
--- a/src/gui/itempopup.h
+++ b/src/gui/itempopup.h
@@ -33,6 +33,7 @@ class ItemPopup : public Window
{
public:
ItemPopup();
+ ~ItemPopup();
void setItem(const ItemInfo &item);
unsigned int getNumRows();
diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp
index f14dcd52..f8c69e87 100644
--- a/src/gui/speechbubble.cpp
+++ b/src/gui/speechbubble.cpp
@@ -60,6 +60,13 @@ SpeechBubble::SpeechBubble():
setLocationRelativeTo(getParent());
}
+SpeechBubble::~SpeechBubble()
+{
+ delete mCaption;
+ delete mSpeechBox;
+ delete mSpeechArea;
+}
+
void SpeechBubble::setCaption(const std::string &name, const gcn::Color &color)
{
mCaption->setCaption(name);
diff --git a/src/gui/speechbubble.h b/src/gui/speechbubble.h
index 323e5cbb..7f5818af 100644
--- a/src/gui/speechbubble.h
+++ b/src/gui/speechbubble.h
@@ -33,6 +33,7 @@ class SpeechBubble : public Window
public:
SpeechBubble();
+ ~SpeechBubble();
void setCaption(const std::string &name,
const gcn::Color &color = 0x000000);