From c0a0160ecda75a9c0de53ac6cecb0da46beff089 Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Sun, 15 Feb 2009 12:11:26 -0700 Subject: Fixed header copyright notices. Signed-off-by: Ira Rice --- src/gui/widgets/dropdown.cpp | 5 +++-- src/gui/widgets/dropdown.h | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src/gui') diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp index b829db1c..ed4d260b 100644 --- a/src/gui/widgets/dropdown.cpp +++ b/src/gui/widgets/dropdown.cpp @@ -1,8 +1,9 @@ /* * Aethyra - * Copyright (C) 2008 Douglas Boffey + * Copyright (C) 2008 The Mana World Development Team * - * This file is part of Aethyra. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h index ef53d930..191740d9 100644 --- a/src/gui/widgets/dropdown.h +++ b/src/gui/widgets/dropdown.h @@ -1,8 +1,9 @@ /* * Aethyra - * Copyright (C) 2008 Douglas Boffey + * Copyright (C) 2008 The Mana World Development Team * - * This file is part of Aethyra. + * This file is part of Aethyra based on original code + * from The Mana World. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by -- cgit v1.2.3-60-g2f50 From 0df9dd8b36cb781f2afa5b288f2f519fab61f80c Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Sun, 15 Feb 2009 13:27:12 -0700 Subject: Deleted some unneeded delete statements. Signed-off-by: Ira Rice --- src/gui/equipmentwindow.cpp | 2 -- src/gui/inventorywindow.cpp | 7 ------- src/gui/login.cpp | 7 ------- src/gui/login.h | 5 ----- src/gui/setup_video.cpp | 38 -------------------------------------- src/gui/setup_video.h | 1 - src/gui/shortcutwindow.cpp | 1 - src/gui/speechbubble.cpp | 7 ------- src/gui/speechbubble.h | 1 - 9 files changed, 69 deletions(-) (limited to 'src/gui') diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp index 10784be8..fae517a9 100644 --- a/src/gui/equipmentwindow.cpp +++ b/src/gui/equipmentwindow.cpp @@ -94,9 +94,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 52aea2d3..ec825ae3 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 1d864a96..159b7f6f 100644 --- a/src/gui/login.cpp +++ b/src/gui/login.cpp @@ -126,13 +126,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 cfe4443b..4d63ec63 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. */ diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp index e1a148d8..34dfde0f 100644 --- a/src/gui/setup_video.cpp +++ b/src/gui/setup_video.cpp @@ -293,44 +293,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 9e4689bc..525e8941 100644 --- a/src/gui/setup_video.h +++ b/src/gui/setup_video.h @@ -33,7 +33,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 cd9bc65f..ee32ca70 100644 --- a/src/gui/shortcutwindow.cpp +++ b/src/gui/shortcutwindow.cpp @@ -70,7 +70,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 c814253c..209f964b 100644 --- a/src/gui/speechbubble.cpp +++ b/src/gui/speechbubble.cpp @@ -60,13 +60,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 d30f5416..dce421ec 100644 --- a/src/gui/speechbubble.h +++ b/src/gui/speechbubble.h @@ -32,7 +32,6 @@ class SpeechBubble : public Window { public: SpeechBubble(); - ~SpeechBubble(); void setCaption(const std::string &name, const gcn::Color &color = 0x000000); -- cgit v1.2.3-60-g2f50