Merge branch 'aethyra/master'

9 files changed, 0 insertions, 69 deletions

diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index 6d3a0b4c..ae60eaf7 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -93,9 +93,7 @@ EquipmentWindow::EquipmentWindow():
 
 EquipmentWindow::~EquipmentWindow()
 {
-    delete mUnequip;
     delete mItemPopup;
-    delete mPlayerBox;
 }
 
 void EquipmentWindow::draw(gcn::Graphics *graphics)
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 471ebf3a..880994d7 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -107,14 +107,7 @@ InventoryWindow::InventoryWindow(int invSize):
 
 InventoryWindow::~InventoryWindow()
 {
-    delete mWeightBar;
-    delete mSlotsBar;
-    delete mUseButton;
-    delete mDropButton;
     delete mItems;
-    delete mWeightLabel;
-    delete mSlotsLabel;
-    delete mInvenScroll;
 }
 
 void InventoryWindow::logic()
diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index 9c109687..c1eda00a 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -121,13 +121,6 @@ LoginDialog::LoginDialog(LoginData *loginData):
     mOkButton->setEnabled(canSubmit());
 }
 
-LoginDialog::~LoginDialog()
-{
-    delete mServerList;
-    delete mServerListBox;
-    delete mServerScrollArea;
-}
-
 void LoginDialog::action(const gcn::ActionEvent &event)
 {
     if (event.getId() == "ok" && canSubmit())
diff --git a/src/gui/login.h b/src/gui/login.h
index c0d6e755..1f0f2ddb 100644
--- a/src/gui/login.h
+++ b/src/gui/login.h
@@ -52,11 +52,6 @@ class LoginDialog : public Window, public gcn::ActionListener,
         LoginDialog(LoginData *loginData);
 
         /**
-         * Destructor
-         */
-        ~LoginDialog();
-
-        /**
          * Called when receiving actions from the widgets.
          */
         void action(const gcn::ActionEvent &event);
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 6e26bab6..fd7481a5 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -292,44 +292,6 @@ Setup_Video::Setup_Video():
     setDimension(gcn::Rectangle(0, 0, 325, 280));
 }
 
-Setup_Video::~Setup_Video()
-{
-    delete mModeListModel;
-
-    delete speechLabel;
-    delete alphaLabel;
-    delete scrollRadiusLabel;
-    delete scrollLazinessLabel;
-    delete overlayDetailLabel;
-    delete particleDetailLabel;
-
-    delete mModeList;
-    delete mFsCheckBox;
-    delete mOpenGLCheckBox;
-    delete mCustomCursorCheckBox;
-    delete mParticleEffectsCheckBox;
-    delete mNameCheckBox;
-
-    delete mSpeechSlider;
-    delete mSpeechLabel;
-    delete mAlphaSlider;
-    delete mFpsCheckBox;
-    delete mFpsSlider;
-    delete mFpsField;
-
-    delete mScrollLazinessSlider;
-    delete mScrollLazinessField;
-
-    delete mScrollRadiusSlider;
-    delete mScrollRadiusField;
-
-    delete mOverlayDetailSlider;
-    delete mOverlayDetailField;
-
-    delete mParticleDetailSlider;
-    delete mParticleDetailField;
-}
-
 void Setup_Video::apply()
 {
     // Full screen changes
diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h
index 13735e0f..e57e33cc 100644
--- a/src/gui/setup_video.h
+++ b/src/gui/setup_video.h
@@ -32,7 +32,6 @@ class Setup_Video : public SetupTab, public gcn::ActionListener,
 {
     public:
         Setup_Video();
-        ~Setup_Video();
 
         void apply();
         void cancel();
diff --git a/src/gui/shortcutwindow.cpp b/src/gui/shortcutwindow.cpp
index b6987b3e..c704fc44 100644
--- a/src/gui/shortcutwindow.cpp
+++ b/src/gui/shortcutwindow.cpp
@@ -69,7 +69,6 @@ ShortcutWindow::ShortcutWindow(const char *title, ShortcutContainer *content)
 ShortcutWindow::~ShortcutWindow()
 {
     delete mItems;
-    delete mScrollArea;
 }
 
 void ShortcutWindow::widgetResized(const gcn::Event &event)
diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp
index 4781bd36..f63b02c3 100644
--- a/src/gui/speechbubble.cpp
+++ b/src/gui/speechbubble.cpp
@@ -59,13 +59,6 @@ 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 323f6667..6daff8fb 100644
--- a/src/gui/speechbubble.h
+++ b/src/gui/speechbubble.h
@@ -31,7 +31,6 @@ class SpeechBubble : public Window
 {
     public:
         SpeechBubble();
-        ~SpeechBubble();
 
         void setCaption(const std::string &name,
                         const gcn::Color &color = 0x000000);