diff options
Diffstat (limited to 'src/gui/windows')
45 files changed, 252 insertions, 321 deletions
diff --git a/src/gui/windows/buydialog.cpp b/src/gui/windows/buydialog.cpp index 86e819121..8bece77ef 100644 --- a/src/gui/windows/buydialog.cpp +++ b/src/gui/windows/buydialog.cpp @@ -47,6 +47,7 @@ #include "resources/iteminfo.h" +#include "utils/delete2.h" #include "utils/gettext.h" #include <algorithm> @@ -302,9 +303,7 @@ void BuyDialog::init() BuyDialog::~BuyDialog() { - delete mShopItems; - mShopItems = nullptr; - + delete2(mShopItems); instances.remove(this); } diff --git a/src/gui/windows/changeemaildialog.cpp b/src/gui/windows/changeemaildialog.cpp index b8f9c1fd2..ce9ec84e8 100644 --- a/src/gui/windows/changeemaildialog.cpp +++ b/src/gui/windows/changeemaildialog.cpp @@ -35,6 +35,7 @@ #include "net/loginhandler.h" #include "net/net.h" +#include "utils/delete2.h" #include "utils/gettext.h" #include <string> @@ -105,8 +106,7 @@ ChangeEmailDialog::ChangeEmailDialog(LoginData *const data): ChangeEmailDialog::~ChangeEmailDialog() { - delete mWrongDataNoticeListener; - mWrongDataNoticeListener = nullptr; + delete2(mWrongDataNoticeListener); } void ChangeEmailDialog::action(const ActionEvent &event) diff --git a/src/gui/windows/changepassworddialog.cpp b/src/gui/windows/changepassworddialog.cpp index 05c7a9309..051fa6434 100644 --- a/src/gui/windows/changepassworddialog.cpp +++ b/src/gui/windows/changepassworddialog.cpp @@ -36,6 +36,7 @@ #include "net/loginhandler.h" #include "net/net.h" +#include "utils/delete2.h" #include "utils/gettext.h" #include <string> @@ -84,8 +85,7 @@ ChangePasswordDialog::ChangePasswordDialog(LoginData *const data): ChangePasswordDialog::~ChangePasswordDialog() { - delete mWrongDataNoticeListener; - mWrongDataNoticeListener = nullptr; + delete2(mWrongDataNoticeListener); } void ChangePasswordDialog::action(const ActionEvent &event) diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp index 1df282189..42bbb4b88 100644 --- a/src/gui/windows/charcreatedialog.cpp +++ b/src/gui/windows/charcreatedialog.cpp @@ -313,8 +313,7 @@ CharCreateDialog::CharCreateDialog(CharSelectDialog *const parent, CharCreateDialog::~CharCreateDialog() { - delete mPlayer; - mPlayer = nullptr; + delete2(mPlayer); if (Net::getCharServerHandler()) Net::getCharServerHandler()->setCharCreateDialog(nullptr); @@ -491,14 +490,11 @@ void CharCreateDialog::setAttributes(const StringVect &labels, for (unsigned i = 0; i < mAttributeLabel.size(); i++) { remove(mAttributeLabel[i]); - delete mAttributeLabel[i]; - mAttributeLabel[i] = nullptr; + delete2(mAttributeLabel[i]) remove(mAttributeSlider[i]); - delete mAttributeSlider[i]; - mAttributeSlider[i] = nullptr; + delete2(mAttributeSlider[i]) remove(mAttributeValue[i]); - delete mAttributeValue[i]; - mAttributeValue[i] = nullptr; + delete2(mAttributeValue[i]) } mAttributeLabel.resize(labels.size()); @@ -655,13 +651,13 @@ void CharCreateDialog::updatePlayer() } } -void CharCreateDialog::keyPressed(KeyEvent &keyEvent) +void CharCreateDialog::keyPressed(KeyEvent &event) { - const int actionId = keyEvent.getActionId(); + const int actionId = event.getActionId(); switch (actionId) { case Input::KEY_GUI_CANCEL: - keyEvent.consume(); + event.consume(); action(ActionEvent(mCancelButton, mCancelButton->getActionEventId())); break; diff --git a/src/gui/windows/charcreatedialog.h b/src/gui/windows/charcreatedialog.h index 6342450ec..652254776 100644 --- a/src/gui/windows/charcreatedialog.h +++ b/src/gui/windows/charcreatedialog.h @@ -78,7 +78,7 @@ class CharCreateDialog final : public Window, void updatePlayer(); - void keyPressed(KeyEvent &keyEvent) override final; + void keyPressed(KeyEvent &event) override final; private: int getDistributedPoints() const A_WARN_UNUSED; diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp index 4480f06af..887937232 100644 --- a/src/gui/windows/charselectdialog.cpp +++ b/src/gui/windows/charselectdialog.cpp @@ -317,20 +317,20 @@ void CharSelectDialog::use(const int selected) } } -void CharSelectDialog::keyPressed(KeyEvent &keyEvent) +void CharSelectDialog::keyPressed(KeyEvent &event) { - const int actionId = keyEvent.getActionId(); + const int actionId = event.getActionId(); switch (actionId) { case Input::KEY_GUI_CANCEL: - keyEvent.consume(); + event.consume(); action(ActionEvent(mSwitchLoginButton, mSwitchLoginButton->getActionEventId())); break; case Input::KEY_GUI_RIGHT: { - keyEvent.consume(); + event.consume(); int idx = mCharacterView->getSelected(); if (idx >= 0) { @@ -345,7 +345,7 @@ void CharSelectDialog::keyPressed(KeyEvent &keyEvent) case Input::KEY_GUI_LEFT: { - keyEvent.consume(); + event.consume(); int idx = mCharacterView->getSelected(); if (idx >= 0) { @@ -360,7 +360,7 @@ void CharSelectDialog::keyPressed(KeyEvent &keyEvent) case Input::KEY_GUI_UP: { - keyEvent.consume(); + event.consume(); int idx = mCharacterView->getSelected(); if (idx >= 0) { @@ -375,7 +375,7 @@ void CharSelectDialog::keyPressed(KeyEvent &keyEvent) case Input::KEY_GUI_DOWN: { - keyEvent.consume(); + event.consume(); int idx = mCharacterView->getSelected(); if (idx >= 0) { @@ -390,7 +390,7 @@ void CharSelectDialog::keyPressed(KeyEvent &keyEvent) case Input::KEY_GUI_DELETE: { - keyEvent.consume(); + event.consume(); const int idx = mCharacterView->getSelected(); if (idx >= 0 && mCharacterEntries[idx] && mCharacterEntries[idx]->getCharacter()) @@ -402,7 +402,7 @@ void CharSelectDialog::keyPressed(KeyEvent &keyEvent) case Input::KEY_GUI_SELECT: { - keyEvent.consume(); + event.consume(); use(mCharacterView->getSelected()); break; } diff --git a/src/gui/windows/charselectdialog.h b/src/gui/windows/charselectdialog.h index 38c307f30..cf44f30b9 100644 --- a/src/gui/windows/charselectdialog.h +++ b/src/gui/windows/charselectdialog.h @@ -62,7 +62,7 @@ class CharSelectDialog final : public Window, void action(const ActionEvent &event) override final; - void keyPressed(KeyEvent &keyEvent) override final; + void keyPressed(KeyEvent &event) override final; enum SelectAction { diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index 5698973f3..8d1d3e046 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -67,6 +67,7 @@ #include "net/net.h" #include "utils/copynpaste.h" +#include "utils/delete2.h" #include "utils/gettext.h" #include "resources/resourcemanager.h" @@ -266,12 +267,9 @@ ChatWindow::~ChatWindow() saveState(); config.setValue("ReturnToggles", mReturnToggles); removeAllWhispers(); - delete mItemLinkHandler; - mItemLinkHandler = nullptr; - delete mColorPicker; - mColorPicker = nullptr; - delete mColorListModel; - mColorListModel = nullptr; + delete2(mItemLinkHandler); + delete2(mColorPicker); + delete2(mColorListModel); } void ChatWindow::postInit() @@ -646,8 +644,7 @@ void ChatWindow::ignoreAllWhispers() PlayerRelation::IGNORED); } - delete (iter->second); - iter->second = nullptr; + delete2(iter->second) } } @@ -732,6 +729,7 @@ void ChatWindow::mousePressed(MouseEvent &event) Tab *const tab = mChatTabs->getSelectedTab(); if (tab) { + event.consume(); if (inputManager.isActionActive(static_cast<int>( Input::KEY_CHAT_MOD))) { @@ -1857,16 +1855,16 @@ void ChatWindow::mouseMoved(MouseEvent &event) Window::mouseMoved(event); } -void ChatWindow::mouseEntered(MouseEvent& mouseEvent) +void ChatWindow::mouseEntered(MouseEvent& event) { mHaveMouse = true; - Window::mouseEntered(mouseEvent); + Window::mouseEntered(event); } -void ChatWindow::mouseExited(MouseEvent& mouseEvent) +void ChatWindow::mouseExited(MouseEvent& event) { updateVisibility(); - Window::mouseExited(mouseEvent); + Window::mouseExited(event); } void ChatWindow::draw(Graphics* graphics) diff --git a/src/gui/windows/chatwindow.h b/src/gui/windows/chatwindow.h index bd5374c56..e755e43f2 100644 --- a/src/gui/windows/chatwindow.h +++ b/src/gui/windows/chatwindow.h @@ -274,11 +274,11 @@ class ChatWindow final : public Window, void optionChanged(const std::string &name) override final; - void mouseEntered(MouseEvent& mouseEvent) override final; + void mouseEntered(MouseEvent& event) override final; void mouseMoved(MouseEvent &event) override final; - void mouseExited(MouseEvent& mouseEvent A_UNUSED) override final; + void mouseExited(MouseEvent& event A_UNUSED) override final; void draw(Graphics* graphics) override final; diff --git a/src/gui/windows/debugwindow.cpp b/src/gui/windows/debugwindow.cpp index 50dc5dbe5..438103f0a 100644 --- a/src/gui/windows/debugwindow.cpp +++ b/src/gui/windows/debugwindow.cpp @@ -42,6 +42,7 @@ #include "net/packetcounters.h" +#include "utils/delete2.h" #include "utils/gettext.h" #include "utils/stringutils.h" #include "utils/timer.h" @@ -88,12 +89,9 @@ DebugWindow::DebugWindow() : DebugWindow::~DebugWindow() { - delete mMapWidget; - mMapWidget = nullptr; - delete mTargetWidget; - mTargetWidget = nullptr; - delete mNetWidget; - mNetWidget = nullptr; + delete2(mMapWidget); + delete2(mTargetWidget); + delete2(mNetWidget); } void DebugWindow::postInit() diff --git a/src/gui/windows/editserverdialog.cpp b/src/gui/windows/editserverdialog.cpp index 316a7051b..6a25a2d77 100644 --- a/src/gui/windows/editserverdialog.cpp +++ b/src/gui/windows/editserverdialog.cpp @@ -242,12 +242,12 @@ void EditServerDialog::action(const ActionEvent &event) } } -void EditServerDialog::keyPressed(KeyEvent &keyEvent) +void EditServerDialog::keyPressed(KeyEvent &event) { - if (keyEvent.isConsumed()) + if (event.isConsumed()) return; - const int actionId = keyEvent.getActionId(); + const int actionId = event.getActionId(); if (actionId == static_cast<int>(Input::KEY_GUI_CANCEL)) { diff --git a/src/gui/windows/editserverdialog.h b/src/gui/windows/editserverdialog.h index b70d1031b..98f5e07fd 100644 --- a/src/gui/windows/editserverdialog.h +++ b/src/gui/windows/editserverdialog.h @@ -59,7 +59,7 @@ class EditServerDialog final : public Window, */ void action(const ActionEvent &event) override final; - void keyPressed(KeyEvent &keyEvent) override final; + void keyPressed(KeyEvent &event) override final; private: TextField *mServerAddressField; diff --git a/src/gui/windows/emotewindow.cpp b/src/gui/windows/emotewindow.cpp index 3a7141533..0f286b145 100644 --- a/src/gui/windows/emotewindow.cpp +++ b/src/gui/windows/emotewindow.cpp @@ -28,6 +28,7 @@ #include "gui/widgets/scrollarea.h" #include "gui/widgets/tabbedarea.h" +#include "utils/delete2.h" #include "utils/gettext.h" #include "resources/image.h" @@ -121,20 +122,13 @@ EmoteWindow::~EmoteWindow() { mTabs->removeAll(false); mTabs->removeTab(mTabs->getTabByIndex(0)); - delete mEmotePage; - mEmotePage = nullptr; - delete mColorPage; - mColorPage = nullptr; - delete mColorModel; - mColorModel = nullptr; - delete mScrollColorPage; - mScrollColorPage = nullptr; - delete mFontPage; - mFontPage = nullptr; - delete mFontModel; - mFontModel = nullptr; - delete mScrollFontPage; - mScrollFontPage = nullptr; + delete2(mEmotePage); + delete2(mColorPage); + delete2(mColorModel); + delete2(mScrollColorPage); + delete2(mFontPage); + delete2(mFontModel); + delete2(mScrollFontPage); if (mImageSet) { mImageSet->decRef(); diff --git a/src/gui/windows/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp index c45595dff..4c026281b 100644 --- a/src/gui/windows/equipmentwindow.cpp +++ b/src/gui/windows/equipmentwindow.cpp @@ -44,6 +44,7 @@ #include "resources/imageset.h" +#include "utils/delete2.h" #include "utils/dtor.h" #include "utils/gettext.h" @@ -122,7 +123,7 @@ void EquipmentWindow::postInit() mUnequip->setEnabled(false); ImageRect rect; - Theme::instance()->loadRect(rect, "equipment_background.xml", "", 0, 1); + theme->loadRect(rect, "equipment_background.xml", "", 0, 1); mSlotBackground = rect.grid[0]; mSlotHighlightedBackground = rect.grid[1]; add(mPlayerBox); @@ -132,14 +133,12 @@ void EquipmentWindow::postInit() EquipmentWindow::~EquipmentWindow() { - delete mItemPopup; - mItemPopup = nullptr; + delete2(mItemPopup); if (this == beingEquipmentWindow) { if (mEquipment) delete mEquipment->getBackend(); - delete mEquipment; - mEquipment = nullptr; + delete2(mEquipment) } delete_all(mBoxes); mBoxes.clear(); @@ -152,8 +151,7 @@ EquipmentWindow::~EquipmentWindow() mSlotBackground->decRef(); if (mSlotHighlightedBackground) mSlotHighlightedBackground->decRef(); - delete mVertexes; - mVertexes = nullptr; + delete2(mVertexes); } void EquipmentWindow::draw(Graphics *graphics) @@ -295,22 +293,22 @@ Item *EquipmentWindow::getItem(const int x, const int y) const return nullptr; } -void EquipmentWindow::mousePressed(MouseEvent& mouseEvent) +void EquipmentWindow::mousePressed(MouseEvent& event) { if (!mEquipment) { - Window::mousePressed(mouseEvent); + Window::mousePressed(event); return; } - const int x = mouseEvent.getX(); - const int y = mouseEvent.getY(); + const int x = event.getX(); + const int y = event.getY(); - if (mouseEvent.getButton() == MouseEvent::LEFT) + if (event.getButton() == MouseEvent::LEFT) { if (mForing) { - Window::mousePressed(mouseEvent); + Window::mousePressed(event); return; } // Checks if any of the presses were in the equip boxes. @@ -332,6 +330,7 @@ void EquipmentWindow::mousePressed(MouseEvent& mouseEvent) inBox = true; if (item) { + event.consume(); setSelected(i); dragDrop.dragItem(item, DRAGDROP_SOURCE_EQUIPMENT); return; @@ -341,7 +340,7 @@ void EquipmentWindow::mousePressed(MouseEvent& mouseEvent) return; } } - else if (mouseEvent.getButton() == MouseEvent::RIGHT) + else if (event.getButton() == MouseEvent::RIGHT) { if (Item *const item = getItem(x, y)) { @@ -355,6 +354,7 @@ void EquipmentWindow::mousePressed(MouseEvent& mouseEvent) const int my = y + getY(); if (viewport) { + event.consume(); if (mForing) viewport->showUndressPopup(mx, my, mBeing, item); else @@ -363,12 +363,12 @@ void EquipmentWindow::mousePressed(MouseEvent& mouseEvent) } } } - Window::mousePressed(mouseEvent); + Window::mousePressed(event); } -void EquipmentWindow::mouseReleased(MouseEvent &mouseEvent) +void EquipmentWindow::mouseReleased(MouseEvent &event) { - Window::mouseReleased(mouseEvent); + Window::mouseReleased(event); const DragDropSource src = dragDrop.getSource(); if (dragDrop.isEmpty() || (src != DRAGDROP_SOURCE_INVENTORY && src != DRAGDROP_SOURCE_EQUIPMENT)) @@ -397,8 +397,8 @@ void EquipmentWindow::mouseReleased(MouseEvent &mouseEvent) { if (item->isEquipment()) { - const int x = mouseEvent.getX(); - const int y = mouseEvent.getY(); + const int x = event.getX(); + const int y = event.getY(); for (std::vector<EquipmentBox*>::const_iterator it = mBoxes.begin(), it_end = mBoxes.end(); it != it_end; ++ it) diff --git a/src/gui/windows/equipmentwindow.h b/src/gui/windows/equipmentwindow.h index 245328b8e..45d4246e3 100644 --- a/src/gui/windows/equipmentwindow.h +++ b/src/gui/windows/equipmentwindow.h @@ -86,7 +86,7 @@ class EquipmentWindow final : public Window, void action(const ActionEvent &event) override final; - void mousePressed(MouseEvent& mouseEvent) override final; + void mousePressed(MouseEvent& event) override final; const Item* getEquipment(const int i) const A_WARN_UNUSED { return mEquipment ? mEquipment->getEquipment(i) : nullptr; } diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp index 92b21dfd1..c2a4b4636 100644 --- a/src/gui/windows/inventorywindow.cpp +++ b/src/gui/windows/inventorywindow.cpp @@ -59,6 +59,8 @@ #include "net/inventoryhandler.h" #include "net/net.h" +#include "utils/delete2.h" + #include <string> #include "debug.h" @@ -98,8 +100,8 @@ InventoryWindow::InventoryWindow(Inventory *const inventory): mCompactMode(false) { mTextPopup->postInit(); - mSlotsBar->setColor(Theme::getThemeColor(Theme::SLOTS_BAR), - Theme::getThemeColor(Theme::SLOTS_BAR_OUTLINE)); + mSlotsBar->setColor(getThemeColor(Theme::SLOTS_BAR), + getThemeColor(Theme::SLOTS_BAR_OUTLINE)); if (inventory) { @@ -194,8 +196,8 @@ InventoryWindow::InventoryWindow(Inventory *const inventory): mEquipmentButton = new Button(this, _("Equipment"), "equipment", this); mWeightBar = new ProgressBar(this, 0.0F, 100, 0, Theme::PROG_WEIGHT, "weightprogressbar.xml", "weightprogressbar_fill.xml"); - mWeightBar->setColor(Theme::getThemeColor(Theme::WEIGHT_BAR), - Theme::getThemeColor(Theme::WEIGHT_BAR_OUTLINE)); + mWeightBar->setColor(getThemeColor(Theme::WEIGHT_BAR), + getThemeColor(Theme::WEIGHT_BAR_OUTLINE)); place(0, 0, mWeightBar, 4); mSlotsBarCell = &place(4, 0, mSlotsBar, 5); @@ -274,8 +276,7 @@ InventoryWindow::~InventoryWindow() invInstances.front()->updateDropButton(); mSortDropDown->hideDrop(false); - delete mSortModel; - mSortModel = nullptr; + delete2(mSortModel); mTextPopup = nullptr; } diff --git a/src/gui/windows/itemamountwindow.cpp b/src/gui/windows/itemamountwindow.cpp index ec581a96e..472057060 100644 --- a/src/gui/windows/itemamountwindow.cpp +++ b/src/gui/windows/itemamountwindow.cpp @@ -48,6 +48,7 @@ #include "gui/widgets/label.h" #include "gui/widgets/slider.h" +#include "utils/delete2.h" #include "utils/gettext.h" #include "debug.h" @@ -261,8 +262,7 @@ void ItemAmountWindow::postInit() ItemAmountWindow::~ItemAmountWindow() { - delete mItemPopup; - mItemPopup = nullptr; + delete2(mItemPopup); } // Show ItemTooltip @@ -388,7 +388,7 @@ void ItemAmountWindow::close() scheduleDelete(); } -void ItemAmountWindow::keyReleased(KeyEvent &keyEvent A_UNUSED) +void ItemAmountWindow::keyReleased(KeyEvent &event A_UNUSED) { mItemAmountSlide->setValue(mItemAmountTextField->getValue()); } diff --git a/src/gui/windows/itemamountwindow.h b/src/gui/windows/itemamountwindow.h index 2a414bb24..d2dca064e 100644 --- a/src/gui/windows/itemamountwindow.h +++ b/src/gui/windows/itemamountwindow.h @@ -82,7 +82,7 @@ class ItemAmountWindow final : public Window, */ void close(); - void keyReleased(KeyEvent &keyEvent) override final; + void keyReleased(KeyEvent &event) override final; /** * Creates the dialog, or bypass it if there aren't enough items. diff --git a/src/gui/windows/logindialog.cpp b/src/gui/windows/logindialog.cpp index 71abf153a..b2242d3f6 100644 --- a/src/gui/windows/logindialog.cpp +++ b/src/gui/windows/logindialog.cpp @@ -208,10 +208,8 @@ void LoginDialog::postInit() LoginDialog::~LoginDialog() { - delete mUpdateTypeModel; - mUpdateTypeModel = nullptr; - delete mUpdateListModel; - mUpdateListModel = nullptr; + delete2(mUpdateTypeModel); + delete2(mUpdateListModel); } void LoginDialog::action(const ActionEvent &event) @@ -256,15 +254,15 @@ void LoginDialog::action(const ActionEvent &event) } } -void LoginDialog::keyPressed(KeyEvent &keyEvent) +void LoginDialog::keyPressed(KeyEvent &event) { - if (keyEvent.isConsumed()) + if (event.isConsumed()) { mLoginButton->setEnabled(canSubmit()); return; } - const int actionId = keyEvent.getActionId(); + const int actionId = event.getActionId(); if (actionId == static_cast<int>(Input::KEY_GUI_CANCEL)) { action(ActionEvent(nullptr, mServerButton->getActionEventId())); diff --git a/src/gui/windows/logindialog.h b/src/gui/windows/logindialog.h index 7150b62c1..1813e1817 100644 --- a/src/gui/windows/logindialog.h +++ b/src/gui/windows/logindialog.h @@ -71,7 +71,7 @@ class LoginDialog final : public Window, /** * Called when a key is pressed in one of the text fields. */ - void keyPressed(KeyEvent &keyEvent) override final; + void keyPressed(KeyEvent &event) override final; void close() override final; diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp index 583a37746..9be6d7304 100644 --- a/src/gui/windows/minimap.cpp +++ b/src/gui/windows/minimap.cpp @@ -39,6 +39,7 @@ #include "resources/imagehelper.h" #include "resources/resourcemanager.h" +#include "utils/delete2.h" #include "utils/gettext.h" #include "utils/sdlcheckutils.h" @@ -97,8 +98,7 @@ Minimap::~Minimap() mMapImage->decRef(); mMapImage = nullptr; } - delete mTextPopup; - mTextPopup = nullptr; + delete2(mTextPopup); } void Minimap::setMap(const Map *const map) diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp index 226132652..885ea619b 100644 --- a/src/gui/windows/ministatuswindow.cpp +++ b/src/gui/windows/ministatuswindow.cpp @@ -42,6 +42,7 @@ #include "net/playerhandler.h" #include "net/gamehandler.h" +#include "utils/delete2.h" #include "utils/dtor.h" #include "utils/gettext.h" @@ -52,7 +53,7 @@ extern volatile int tick_time; typedef std::vector <ProgressBar*>::const_iterator ProgressBarVectorCIter; MiniStatusWindow::MiniStatusWindow() : - Popup("MiniStatus", "ministatus.xml"), + Window("MiniStatus", false, nullptr, "ministatus.xml"), InventoryListener(), mBars(), mBarNames(), @@ -114,8 +115,8 @@ MiniStatusWindow::MiniStatusWindow() : StatusWindow::updateHPBar(mHpBar); - if (Net::getGameHandler()->canUseMagicBar()) - StatusWindow::updateMPBar(mMpBar); + if (Net::getGameHandler()->canUseMagicBar() && statusWindow) + statusWindow->updateMPBar(mMpBar); const int job = Net::getPlayerHandler()->getJobLocation() && serverConfig.getValueBool("showJob", true); @@ -134,7 +135,7 @@ MiniStatusWindow::MiniStatusWindow() : loadBars(); updateBars(); - setVisible(config.getValueBool(getPopupName() + "Visible", true)); + setVisible(true); addMouseListener(this); Inventory *const inv = PlayerInfo::getInventory(); if (inv) @@ -147,10 +148,8 @@ MiniStatusWindow::MiniStatusWindow() : MiniStatusWindow::~MiniStatusWindow() { - delete mTextPopup; - mTextPopup = nullptr; - delete mStatusPopup; - mStatusPopup = nullptr; + delete2(mTextPopup); + delete2(mStatusPopup); delete_all(mIcons); mIcons.clear(); @@ -183,8 +182,7 @@ ProgressBar *MiniStatusWindow::createBar(const float progress, progress, width, height, backColor, skin, skinFill); bar->setActionEventId(name); bar->setId(description); - bar->setColor(Theme::getThemeColor(textColor), - Theme::getThemeColor(textColor + 1)); + bar->setColor(getThemeColor(textColor), getThemeColor(textColor + 1)); mBars.push_back(bar); mBarNames[name] = bar; return bar; @@ -195,7 +193,7 @@ void MiniStatusWindow::updateBars() int x = 0; const ProgressBar *lastBar = nullptr; FOR_EACH (ProgressBarVectorCIter, it, mBars) - safeRemove(*it); + remove(*it); FOR_EACH (ProgressBarVectorCIter, it, mBars) { @@ -264,7 +262,7 @@ void MiniStatusWindow::processEvent(const Channels channel A_UNUSED, } else if (id == PlayerInfo::MP || id == PlayerInfo::MAX_MP) { - StatusWindow::updateMPBar(mMpBar); + statusWindow->updateMPBar(mMpBar); } else if (id == PlayerInfo::EXP || id == PlayerInfo::EXP_NEEDED) { @@ -282,14 +280,14 @@ void MiniStatusWindow::processEvent(const Channels channel A_UNUSED, } else if (event.getName() == EVENT_UPDATESTAT) { - StatusWindow::updateMPBar(mMpBar); + statusWindow->updateMPBar(mMpBar); StatusWindow::updateJobBar(mJobBar); } } void MiniStatusWindow::updateStatus() { - StatusWindow::updateStatusBar(mStatusBar); + statusWindow->updateStatusBar(mStatusBar); if (mStatusPopup && mStatusPopup->isPopupVisible()) mStatusPopup->update(); } @@ -297,7 +295,7 @@ void MiniStatusWindow::updateStatus() void MiniStatusWindow::logic() { BLOCK_START("MiniStatusWindow::logic") - Popup::logic(); + Window::logic(); for (size_t i = 0, sz = mIcons.size(); i < sz; i++) { @@ -317,7 +315,7 @@ void MiniStatusWindow::draw(Graphics *graphics) void MiniStatusWindow::mouseMoved(MouseEvent &event) { - Popup::mouseMoved(event); + Window::mouseMoved(event); const int x = event.getX(); const int y = event.getY(); @@ -444,6 +442,7 @@ void MiniStatusWindow::mousePressed(MouseEvent &event) event.getSource()); if (!bar) return; + event.consume(); if (viewport) { viewport->showPopup(getX() + event.getX(), @@ -454,7 +453,7 @@ void MiniStatusWindow::mousePressed(MouseEvent &event) void MiniStatusWindow::mouseExited(MouseEvent &event) { - Popup::mouseExited(event); + Window::mouseExited(event); mTextPopup->hide(); mStatusPopup->hide(); diff --git a/src/gui/windows/ministatuswindow.h b/src/gui/windows/ministatuswindow.h index ee20ef69b..6939f8f54 100644 --- a/src/gui/windows/ministatuswindow.h +++ b/src/gui/windows/ministatuswindow.h @@ -27,7 +27,7 @@ #include "listeners/depricatedlistener.h" -#include "gui/widgets/popup.h" +#include "gui/widgets/window.h" #include <vector> @@ -42,7 +42,7 @@ class TextPopup; * * \ingroup Interface */ -class MiniStatusWindow final : public Popup, +class MiniStatusWindow final : public Window, public InventoryListener, public DepricatedListener { @@ -71,7 +71,7 @@ class MiniStatusWindow final : public Popup, void draw(Graphics *graphics) override final; - void mouseMoved(MouseEvent &mouseEvent) override final; + void mouseMoved(MouseEvent &event) override final; void mousePressed(MouseEvent &event) override final; diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp index 17454b6ab..56306a90f 100644 --- a/src/gui/windows/npcdialog.cpp +++ b/src/gui/windows/npcdialog.cpp @@ -57,6 +57,7 @@ #include "net/npchandler.h" #include "utils/copynpaste.h" +#include "utils/delete2.h" #include "utils/gettext.h" #include "debug.h" @@ -216,44 +217,23 @@ NpcDialog::~NpcDialog() delete mPlayerBox; } - delete mTextBox; - mTextBox = nullptr; - delete mClearButton; - mClearButton = nullptr; - delete mButton; - mButton = nullptr; - delete mButton2; - mButton2 = nullptr; - delete mButton3; - mButton3 = nullptr; - - // These might not actually be in the layout, so lets be safe - delete mScrollArea; - mScrollArea = nullptr; - delete mItemList; - mItemList = nullptr; - delete mTextField; - mTextField = nullptr; - delete mIntField; - mIntField = nullptr; - delete mResetButton; - mResetButton = nullptr; - delete mPlusButton; - mPlusButton = nullptr; - delete mMinusButton; - mMinusButton = nullptr; - delete mItemLinkHandler; - mItemLinkHandler = nullptr; - - delete mItemContainer; - mItemContainer = nullptr; - delete mInventory; - mInventory = nullptr; - delete mItemScrollArea; - mItemScrollArea = nullptr; - - delete mListScrollArea; - mListScrollArea = nullptr; + delete2(mTextBox); + delete2(mClearButton); + delete2(mButton); + delete2(mButton2); + delete2(mButton3); + delete2(mScrollArea); + delete2(mItemList); + delete2(mTextField); + delete2(mIntField); + delete2(mResetButton); + delete2(mPlusButton); + delete2(mMinusButton); + delete2(mItemLinkHandler); + delete2(mItemContainer); + delete2(mInventory); + delete2(mItemScrollArea); + delete2(mListScrollArea); FOR_EACH (ImageVectorIter, it, mImages) { @@ -896,8 +876,7 @@ void NpcDialog::showAvatar(const uint16_t avatarId) } else { - delete mAvatarBeing; - mAvatarBeing = nullptr; + delete2(mAvatarBeing) mPlayerBox->setPlayer(nullptr); } if (needShow != mShowAvatar) @@ -969,6 +948,7 @@ void NpcDialog::mousePressed(MouseEvent &event) if (event.getButton() == MouseEvent::RIGHT && event.getSource() == mTextBox) { + event.consume(); if (viewport) viewport->showNpcDialogPopup(mNpcId); } diff --git a/src/gui/windows/questswindow.cpp b/src/gui/windows/questswindow.cpp index 8d4eae9c8..b57ed9bd7 100644 --- a/src/gui/windows/questswindow.cpp +++ b/src/gui/windows/questswindow.cpp @@ -38,6 +38,7 @@ #include "gui/widgets/itemlinkhandler.h" #include "gui/widgets/scrollarea.h" +#include "utils/delete2.h" #include "utils/dtor.h" #include "utils/gettext.h" @@ -178,8 +179,7 @@ QuestsWindow::QuestsWindow() : QuestsWindow::~QuestsWindow() { - delete mQuestsModel; - mQuestsModel = nullptr; + delete2(mQuestsModel); for (std::map<int, std::vector<QuestItem*> >::iterator it = mQuests.begin(), it_end = mQuests.end(); it != it_end; ++ it) @@ -194,8 +194,7 @@ QuestsWindow::~QuestsWindow() delete_all(mAllEffects); mAllEffects.clear(); - delete mItemLinkHandler; - mItemLinkHandler = nullptr; + delete2(mItemLinkHandler); mQuests.clear(); mQuestLinks.clear(); if (mCompleteIcon) diff --git a/src/gui/windows/quitdialog.cpp b/src/gui/windows/quitdialog.cpp index 98aa70c70..a1add2711 100644 --- a/src/gui/windows/quitdialog.cpp +++ b/src/gui/windows/quitdialog.cpp @@ -131,14 +131,10 @@ QuitDialog::~QuitDialog() { if (mMyPointer) *mMyPointer = nullptr; - delete mForceQuit; - mForceQuit = nullptr; - delete mLogoutQuit; - mLogoutQuit = nullptr; - delete mSwitchAccountServer; - mSwitchAccountServer = nullptr; - delete mSwitchCharacter; - mSwitchCharacter = nullptr; + delete2(mForceQuit); + delete2(mLogoutQuit); + delete2(mSwitchAccountServer); + delete2(mSwitchCharacter); } void QuitDialog::placeOption(ContainerPlacer &placer, @@ -203,9 +199,9 @@ void QuitDialog::action(const ActionEvent &event) scheduleDelete(); } -void QuitDialog::keyPressed(KeyEvent &keyEvent) +void QuitDialog::keyPressed(KeyEvent &event) { - const int actionId = keyEvent.getActionId(); + const int actionId = event.getActionId(); int dir = 0; switch (actionId) diff --git a/src/gui/windows/quitdialog.h b/src/gui/windows/quitdialog.h index 8ce60d06c..ffcea4122 100644 --- a/src/gui/windows/quitdialog.h +++ b/src/gui/windows/quitdialog.h @@ -64,7 +64,7 @@ class QuitDialog final : public Window, */ void action(const ActionEvent &event) override final; - void keyPressed(KeyEvent &keyEvent) override final; + void keyPressed(KeyEvent &event) override final; private: void placeOption(ContainerPlacer &placer, diff --git a/src/gui/windows/registerdialog.cpp b/src/gui/windows/registerdialog.cpp index 50344f223..55a328fa8 100644 --- a/src/gui/windows/registerdialog.cpp +++ b/src/gui/windows/registerdialog.cpp @@ -40,6 +40,7 @@ #include "net/loginhandler.h" #include "net/net.h" +#include "utils/delete2.h" #include "utils/gettext.h" #include "debug.h" @@ -169,8 +170,7 @@ void RegisterDialog::postInit() RegisterDialog::~RegisterDialog() { - delete mWrongDataNoticeListener; - mWrongDataNoticeListener = nullptr; + delete2(mWrongDataNoticeListener); } void RegisterDialog::action(const ActionEvent &event) @@ -282,14 +282,14 @@ void RegisterDialog::action(const ActionEvent &event) } } -void RegisterDialog::keyPressed(KeyEvent &keyEvent) +void RegisterDialog::keyPressed(KeyEvent &event) { - if (keyEvent.isConsumed()) + if (event.isConsumed()) { mRegisterButton->setEnabled(canSubmit()); return; } - const int actionId = keyEvent.getActionId(); + const int actionId = event.getActionId(); if (actionId == static_cast<int>(Input::KEY_GUI_CANCEL)) { action(ActionEvent(nullptr, mCancelButton->getActionEventId())); diff --git a/src/gui/windows/registerdialog.h b/src/gui/windows/registerdialog.h index 1d5b5e48b..90087b5e2 100644 --- a/src/gui/windows/registerdialog.h +++ b/src/gui/windows/registerdialog.h @@ -87,7 +87,7 @@ class RegisterDialog final : public Window, /** * Called when a key is pressed in one of the text fields. */ - void keyPressed(KeyEvent &keyEvent) override; + void keyPressed(KeyEvent &event) override; void close() override; diff --git a/src/gui/windows/selldialog.cpp b/src/gui/windows/selldialog.cpp index ebee65d1e..604caa72e 100644 --- a/src/gui/windows/selldialog.cpp +++ b/src/gui/windows/selldialog.cpp @@ -45,6 +45,7 @@ #include "resources/iteminfo.h" +#include "utils/delete2.h" #include "utils/gettext.h" #include "debug.h" @@ -162,8 +163,7 @@ void SellDialog::init() SellDialog::~SellDialog() { - delete mShopItems; - mShopItems = nullptr; + delete2(mShopItems); instances.remove(this); } diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp index 112d1588d..9e85f5c89 100644 --- a/src/gui/windows/serverdialog.cpp +++ b/src/gui/windows/serverdialog.cpp @@ -46,6 +46,7 @@ #include "gui/widgets/listbox.h" #include "gui/widgets/scrollarea.h" +#include "utils/delete2.h" #include "utils/gettext.h" #include "utils/langs.h" @@ -295,11 +296,9 @@ ServerDialog::~ServerDialog() if (mDownload) { mDownload->cancel(); - delete mDownload; - mDownload = nullptr; + delete2(mDownload) } - delete mServersListModel; - mServersListModel = nullptr; + delete2(mServersListModel); } void ServerDialog::connectToSelectedServer() @@ -389,18 +388,18 @@ void ServerDialog::action(const ActionEvent &event) } } -void ServerDialog::keyPressed(KeyEvent &keyEvent) +void ServerDialog::keyPressed(KeyEvent &event) { - switch (keyEvent.getActionId()) + switch (event.getActionId()) { case Input::KEY_GUI_CANCEL: - keyEvent.consume(); + event.consume(); client->setState(STATE_EXIT); return; case Input::KEY_GUI_SELECT: case Input::KEY_GUI_SELECT2: - keyEvent.consume(); + event.consume(); action(ActionEvent(nullptr, mConnectButton->getActionEventId())); return; @@ -435,8 +434,8 @@ void ServerDialog::keyPressed(KeyEvent &keyEvent) default: break; } - if (!keyEvent.isConsumed()) - mServersList->keyPressed(keyEvent); + if (!event.isConsumed()) + mServersList->keyPressed(event); } void ServerDialog::valueChanged(const SelectionEvent &) @@ -450,13 +449,17 @@ void ServerDialog::valueChanged(const SelectionEvent &) mDeleteButton->setEnabled(true); } -void ServerDialog::mouseClicked(MouseEvent &mouseEvent) +void ServerDialog::mouseClicked(MouseEvent &event) { - if (mouseEvent.getClickCount() == 2 && - mouseEvent.getSource() == mServersList) + if (event.getButton() == MouseEvent::LEFT) { - action(ActionEvent(mConnectButton, - mConnectButton->getActionEventId())); + event.consume(); + if (event.getClickCount() == 2 && + event.getSource() == mServersList) + { + action(ActionEvent(mConnectButton, + mConnectButton->getActionEventId())); + } } } @@ -513,8 +516,7 @@ void ServerDialog::downloadServerList() if (mDownload) { mDownload->cancel(); - delete mDownload; - mDownload = nullptr; + delete2(mDownload) } mDownload = new Net::Download(this, listFile, diff --git a/src/gui/windows/serverdialog.h b/src/gui/windows/serverdialog.h index 7c3a05ab3..88b6a7caf 100644 --- a/src/gui/windows/serverdialog.h +++ b/src/gui/windows/serverdialog.h @@ -74,14 +74,14 @@ class ServerDialog final : public Window, */ void action(const ActionEvent &event) override final; - void keyPressed(KeyEvent &keyEvent) override final; + void keyPressed(KeyEvent &event) override final; /** * Called when the selected value changed in the servers list box. */ void valueChanged(const SelectionEvent &event) override final; - void mouseClicked(MouseEvent &mouseEvent) override final; + void mouseClicked(MouseEvent &event) override final; void logic() override final; diff --git a/src/gui/windows/setupwindow.cpp b/src/gui/windows/setupwindow.cpp index 1760d00bd..7239061ff 100644 --- a/src/gui/windows/setupwindow.cpp +++ b/src/gui/windows/setupwindow.cpp @@ -48,6 +48,7 @@ #include "gui/widgets/label.h" #include "gui/widgets/tabbedarea.h" +#include "utils/delete2.h" #include "utils/dtor.h" #include "utils/gettext.h" @@ -223,8 +224,7 @@ void SetupWindow::unloadModTab() mTabs.remove(mModsTab); Tab *const tab = mPanel->getTab(mModsTab->getName()); mPanel->removeTab(tab); - delete mModsTab; - mModsTab = nullptr; + delete2(mModsTab) } } diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp index 923511baa..b44dcc19e 100644 --- a/src/gui/windows/shopwindow.cpp +++ b/src/gui/windows/shopwindow.cpp @@ -58,6 +58,7 @@ #include "resources/iteminfo.h" +#include "utils/delete2.h" #include "utils/gettext.h" #include <sstream> @@ -197,11 +198,8 @@ ShopWindow::~ShopWindow() { saveList(); - delete mBuyShopItems; - mBuyShopItems = nullptr; - - delete mSellShopItems; - mSellShopItems = nullptr; + delete2(mBuyShopItems); + delete2(mSellShopItems); instances.remove(this); } diff --git a/src/gui/windows/shortcutwindow.cpp b/src/gui/windows/shortcutwindow.cpp index 6ec442cd5..8387d7e91 100644 --- a/src/gui/windows/shortcutwindow.cpp +++ b/src/gui/windows/shortcutwindow.cpp @@ -30,6 +30,8 @@ #include "gui/widgets/shortcutcontainer.h" #include "gui/widgets/tabs/tab.h" +#include "utils/delete2.h" + #include "debug.h" static const int SCROLL_PADDING = 0; @@ -152,10 +154,8 @@ ShortcutWindow::~ShortcutWindow() { if (mTabs) mTabs->removeAll(); - delete mTabs; - mTabs = nullptr; - delete mItems; - mItems = nullptr; + delete2(mTabs); + delete2(mItems); } void ShortcutWindow::addTab(const std::string &name, diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp index 21cc009bc..f077341bf 100644 --- a/src/gui/windows/skilldialog.cpp +++ b/src/gui/windows/skilldialog.cpp @@ -50,6 +50,7 @@ #include "net/playerhandler.h" #include "net/skillhandler.h" +#include "utils/delete2.h" #include "utils/dtor.h" #include "utils/gettext.h" @@ -83,10 +84,8 @@ class SkillListBox final : public ListBox ~SkillListBox() { - delete mModel; - mModel = nullptr; - delete mPopup; - mPopup = nullptr; + delete2(mModel) + delete2(mPopup) } SkillInfo *getSelectedInfo() const @@ -215,6 +214,7 @@ class SkillListBox final : public ListBox const SkillInfo *const skill = getSkillByEvent(event); if (!skill) return; + event.consume(); mSkillClicked = true; } } @@ -255,8 +255,7 @@ class SkillTab final : public Tab ~SkillTab() { - delete mListBox; - mListBox = nullptr; + delete2(mListBox) } SkillInfo *getSelectedInfo() const diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp index 8e6becca1..3f6fe663d 100644 --- a/src/gui/windows/socialwindow.cpp +++ b/src/gui/windows/socialwindow.cpp @@ -57,6 +57,7 @@ #include "net/guildhandler.h" #include "net/partyhandler.h" +#include "utils/delete2.h" #include "utils/gettext.h" #include "debug.h" @@ -206,10 +207,8 @@ public: ~SocialGuildTab() { - delete mList; - mList = nullptr; - delete mScroll; - mScroll = nullptr; + delete2(mList) + delete2(mScroll) } void action(const ActionEvent &event) override final @@ -342,10 +341,8 @@ public: ~SocialGuildTab2() { - delete mList; - mList = nullptr; - delete mScroll; - mScroll = nullptr; + delete2(mList) + delete2(mScroll) } void action(const ActionEvent &event A_UNUSED) override final @@ -411,10 +408,8 @@ public: ~SocialPartyTab() { - delete mList; - mList = nullptr; - delete mScroll; - mScroll = nullptr; + delete2(mList) + delete2(mScroll) } void action(const ActionEvent &event) override final @@ -530,12 +525,9 @@ public: ~SocialPlayersTab() { - delete mList; - mList = nullptr; - delete mScroll; - mScroll = nullptr; - delete mBeings; - mBeings = nullptr; + delete2(mList) + delete2(mScroll) + delete2(mBeings) } void updateList() override final @@ -568,6 +560,7 @@ public: avatar->setLevel(being->getLevel()); avatar->setGender(being->getGender()); avatar->setIp(being->getIp()); + avatar->setPoison(being->getPoison()); } } @@ -696,12 +689,9 @@ public: ~SocialNavigationTab() { - delete mList; - mList = nullptr; - delete mScroll; - mScroll = nullptr; - delete mBeings; - mBeings = nullptr; + delete2(mList) + delete2(mScroll) + delete2(mBeings) } void updateList() override final @@ -1025,12 +1015,9 @@ public: ~SocialAttackTab() { - delete mList; - mList = nullptr; - delete mScroll; - mScroll = nullptr; - delete mBeings; - mBeings = nullptr; + delete2(mList) + delete2(mScroll) + delete2(mBeings) } void updateList() override final @@ -1072,12 +1059,9 @@ public: ~SocialPickupTab() { - delete mList; - mList = nullptr; - delete mScroll; - mScroll = nullptr; - delete mBeings; - mBeings = nullptr; + delete2(mList) + delete2(mScroll) + delete2(mBeings) } void updateList() override final @@ -1119,12 +1103,9 @@ public: ~SocialFriendsTab() { - delete mList; - mList = nullptr; - delete mScroll; - mScroll = nullptr; - delete mBeings; - mBeings = nullptr; + delete2(mList) + delete2(mScroll) + delete2(mBeings) } void updateList() override final @@ -1370,18 +1351,12 @@ SocialWindow::~SocialWindow() mPartyInviter.clear(); } - delete mCreatePopup; - mCreatePopup = nullptr; - delete mPlayers; - mPlayers = nullptr; - delete mNavigation; - mNavigation = nullptr; - delete mAttackFilter; - mAttackFilter = nullptr; - delete mPickupFilter; - mPickupFilter = nullptr; - delete mFriends; - mFriends = nullptr; + delete2(mCreatePopup); + delete2(mPlayers); + delete2(mNavigation); + delete2(mAttackFilter); + delete2(mPickupFilter); + delete2(mFriends); } bool SocialWindow::addTab(Guild *const guild) diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp index 05172c9b3..98d3ea82e 100644 --- a/src/gui/windows/statuswindow.cpp +++ b/src/gui/windows/statuswindow.cpp @@ -49,6 +49,7 @@ #include "net/playerhandler.h" #include "net/gamehandler.h" +#include "utils/delete2.h" #include "utils/gettext.h" #include <SDL_timer.h> @@ -193,16 +194,16 @@ StatusWindow::StatusWindow() : mHpBar = new ProgressBar(this, static_cast<float>(PlayerInfo::getAttribute( PlayerInfo::HP)) / static_cast<float>(max), 80, 0, Theme::PROG_HP, "hpprogressbar.xml", "hpprogressbar_fill.xml"); - mHpBar->setColor(Theme::getThemeColor(Theme::HP_BAR), - Theme::getThemeColor(Theme::HP_BAR_OUTLINE)); + mHpBar->setColor(getThemeColor(Theme::HP_BAR), + getThemeColor(Theme::HP_BAR_OUTLINE)); max = PlayerInfo::getAttribute(PlayerInfo::EXP_NEEDED); mXpBar = new ProgressBar(this, max ? static_cast<float>(PlayerInfo::getAttribute(PlayerInfo::EXP)) / static_cast<float>(max) : static_cast<float>(0), 80, 0, Theme::PROG_EXP, "xpprogressbar.xml", "xpprogressbar_fill.xml"); - mXpBar->setColor(Theme::getThemeColor(Theme::XP_BAR), - Theme::getThemeColor(Theme::XP_BAR_OUTLINE)); + mXpBar->setColor(getThemeColor(Theme::XP_BAR), + getThemeColor(Theme::XP_BAR_OUTLINE)); const bool magicBar = Net::getGameHandler()->canUseMagicBar(); const int job = Net::getPlayerHandler()->getJobLocation() @@ -222,13 +223,13 @@ StatusWindow::StatusWindow() : useMagic ? "mpprogressbar_fill.xml" : "nompprogressbar_fill.xml"); if (useMagic) { - mMpBar->setColor(Theme::getThemeColor(Theme::MP_BAR), - Theme::getThemeColor(Theme::MP_BAR_OUTLINE)); + mMpBar->setColor(getThemeColor(Theme::MP_BAR), + getThemeColor(Theme::MP_BAR_OUTLINE)); } else { - mMpBar->setColor(Theme::getThemeColor(Theme::NO_MP_BAR), - Theme::getThemeColor(Theme::NO_MP_BAR_OUTLINE)); + mMpBar->setColor(getThemeColor(Theme::NO_MP_BAR), + getThemeColor(Theme::NO_MP_BAR_OUTLINE)); } } else @@ -260,8 +261,8 @@ StatusWindow::StatusWindow() : mJobLabel = new Label(this, _("Job:")); mJobBar = new ProgressBar(this, 0.0F, 80, 0, Theme::PROG_JOB, "jobprogressbar.xml", "jobprogressbar_fill.xml"); - mJobBar->setColor(Theme::getThemeColor(Theme::JOB_BAR), - Theme::getThemeColor(Theme::JOB_BAR_OUTLINE)); + mJobBar->setColor(getThemeColor(Theme::JOB_BAR), + getThemeColor(Theme::JOB_BAR_OUTLINE)); place(3, 0, mJobLvlLabel, 3); place(5, 2, mJobLabel).setPadding(3); @@ -524,7 +525,8 @@ void StatusWindow::updateHPBar(ProgressBar *const bar, const bool showMax) bar->setProgress(prog); } -void StatusWindow::updateMPBar(ProgressBar *const bar, const bool showMax) +void StatusWindow::updateMPBar(ProgressBar *const bar, + const bool showMax) const { if (!bar) return; @@ -542,14 +544,14 @@ void StatusWindow::updateMPBar(ProgressBar *const bar, const bool showMax) if (Net::getPlayerHandler()->canUseMagic()) { - bar->setColor(Theme::getThemeColor(Theme::MP_BAR), - Theme::getThemeColor(Theme::MP_BAR_OUTLINE)); + bar->setColor(getThemeColor(Theme::MP_BAR), + getThemeColor(Theme::MP_BAR_OUTLINE)); bar->setProgressPalette(Theme::PROG_MP); } else { - bar->setColor(Theme::getThemeColor(Theme::NO_MP_BAR), - Theme::getThemeColor(Theme::NO_MP_BAR_OUTLINE)); + bar->setColor(getThemeColor(Theme::NO_MP_BAR), + getThemeColor(Theme::NO_MP_BAR_OUTLINE)); bar->setProgressPalette(Theme::PROG_NO_MP); } @@ -715,7 +717,7 @@ std::string StatusWindow::translateLetter2(std::string letters) } void StatusWindow::updateStatusBar(ProgressBar *const bar, - const bool percent A_UNUSED) + const bool percent A_UNUSED) const { if (!player_node || !viewport) return; @@ -741,9 +743,9 @@ void StatusWindow::updateStatusBar(ProgressBar *const bar, bar->setProgress(50); if (player_node->getDisableGameModifiers()) - bar->setBackgroundColor(Theme::getThemeColor(Theme::STATUSBAR_ON)); + bar->setBackgroundColor(getThemeColor(Theme::STATUSBAR_ON)); else - bar->setBackgroundColor(Theme::getThemeColor(Theme::STATUSBAR_OFF)); + bar->setBackgroundColor(getThemeColor(Theme::STATUSBAR_OFF)); } void StatusWindow::action(const ActionEvent &event) @@ -790,8 +792,7 @@ AttrDisplay::AttrDisplay(const Widget2 *const widget, AttrDisplay::~AttrDisplay() { - delete mLayout; - mLayout = nullptr; + delete2(mLayout); } std::string AttrDisplay::update() diff --git a/src/gui/windows/statuswindow.h b/src/gui/windows/statuswindow.h index 3b171a25e..35bba74cd 100644 --- a/src/gui/windows/statuswindow.h +++ b/src/gui/windows/statuswindow.h @@ -66,7 +66,7 @@ class StatusWindow final : public Window, static void updateHPBar(ProgressBar *const bar, const bool showMax = false); - static void updateMPBar(ProgressBar *bar, const bool showMax = false); + void updateMPBar(ProgressBar *bar, const bool showMax = false) const; static void updateJobBar(ProgressBar *const bar, const bool percent = true); static void updateXPBar(ProgressBar *const bar, @@ -75,8 +75,8 @@ class StatusWindow final : public Window, static void updateInvSlotsBar(ProgressBar *const bar); static void updateMoneyBar(ProgressBar *const bar); static void updateArrowsBar(ProgressBar *const bar); - static void updateStatusBar(ProgressBar *const bar, - const bool percent = true); + void updateStatusBar(ProgressBar *const bar, + const bool percent = true) const; static void updateProgressBar(ProgressBar *const bar, const int value, const int max, const bool percent); static void updateProgressBar(ProgressBar *const bar, diff --git a/src/gui/windows/textcommandeditor.cpp b/src/gui/windows/textcommandeditor.cpp index dead469bc..2eccb255d 100644 --- a/src/gui/windows/textcommandeditor.cpp +++ b/src/gui/windows/textcommandeditor.cpp @@ -38,6 +38,7 @@ #include "gui/widgets/layout.h" #include "gui/widgets/radiobutton.h" +#include "utils/delete2.h" #include "utils/gettext.h" #include "debug.h" @@ -191,12 +192,9 @@ void TextCommandEditor::postInit() TextCommandEditor::~TextCommandEditor() { - delete mIconsModel; - mIconsModel = nullptr; - delete mTargetTypeModel; - mTargetTypeModel = nullptr; - delete mMagicSchoolModel; - mMagicSchoolModel = nullptr; + delete2(mIconsModel); + delete2(mTargetTypeModel); + delete2(mMagicSchoolModel); } void TextCommandEditor::action(const ActionEvent &event) diff --git a/src/gui/windows/unregisterdialog.cpp b/src/gui/windows/unregisterdialog.cpp index 3326ca2bb..bb309c6f1 100644 --- a/src/gui/windows/unregisterdialog.cpp +++ b/src/gui/windows/unregisterdialog.cpp @@ -35,6 +35,7 @@ #include "net/loginhandler.h" #include "net/net.h" +#include "utils/delete2.h" #include "utils/gettext.h" #include <string> @@ -97,8 +98,7 @@ void UnRegisterDialog::postInit() UnRegisterDialog::~UnRegisterDialog() { - delete mWrongDataNoticeListener; - mWrongDataNoticeListener = nullptr; + delete2(mWrongDataNoticeListener); } void UnRegisterDialog::action(const ActionEvent &event) diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp index 247ef8707..cd0e7e0d8 100644 --- a/src/gui/windows/updaterwindow.cpp +++ b/src/gui/windows/updaterwindow.cpp @@ -42,6 +42,7 @@ #include "resources/db/moddb.h" +#include "utils/delete2.h" #include "utils/gettext.h" #include "utils/mkdir.h" #include "utils/paths.h" @@ -242,8 +243,7 @@ UpdaterWindow::~UpdaterWindow() { mDownload->cancel(); - delete mDownload; - mDownload = nullptr; + delete2(mDownload) } free(mMemoryBuffer); } @@ -292,9 +292,9 @@ void UpdaterWindow::action(const ActionEvent &event) } } -void UpdaterWindow::keyPressed(KeyEvent &keyEvent) +void UpdaterWindow::keyPressed(KeyEvent &event) { - const int actionId = keyEvent.getActionId(); + const int actionId = event.getActionId(); if (actionId == static_cast<int>(Input::KEY_GUI_CANCEL)) { action(ActionEvent(nullptr, mCancelButton->getActionEventId())); diff --git a/src/gui/windows/updaterwindow.h b/src/gui/windows/updaterwindow.h index 39e1e84f3..4874ba8ba 100644 --- a/src/gui/windows/updaterwindow.h +++ b/src/gui/windows/updaterwindow.h @@ -121,7 +121,7 @@ class UpdaterWindow final : public Window, void action(const ActionEvent &event) override final; - void keyPressed(KeyEvent &keyEvent) override final; + void keyPressed(KeyEvent &event) override final; void logic() override final; diff --git a/src/gui/windows/worldselectdialog.cpp b/src/gui/windows/worldselectdialog.cpp index 58c1aaee8..5cd0a3b2f 100644 --- a/src/gui/windows/worldselectdialog.cpp +++ b/src/gui/windows/worldselectdialog.cpp @@ -38,6 +38,7 @@ #include "net/loginhandler.h" #include "net/net.h" +#include "utils/delete2.h" #include "utils/gettext.h" #include "debug.h" @@ -95,8 +96,7 @@ void WorldSelectDialog::postInit() WorldSelectDialog::~WorldSelectDialog() { - delete mWorldListModel; - mWorldListModel = nullptr; + delete2(mWorldListModel); } void WorldSelectDialog::action(const ActionEvent &event) @@ -118,9 +118,9 @@ void WorldSelectDialog::action(const ActionEvent &event) } } -void WorldSelectDialog::keyPressed(KeyEvent &keyEvent) +void WorldSelectDialog::keyPressed(KeyEvent &event) { - const int actionId = keyEvent.getActionId(); + const int actionId = event.getActionId(); if (actionId == static_cast<int>(Input::KEY_GUI_CANCEL)) { diff --git a/src/gui/windows/worldselectdialog.h b/src/gui/windows/worldselectdialog.h index 9d06ac25e..b91beeece 100644 --- a/src/gui/windows/worldselectdialog.h +++ b/src/gui/windows/worldselectdialog.h @@ -65,7 +65,7 @@ class WorldSelectDialog final : public Window, */ void action(const ActionEvent &event) override final; - void keyPressed(KeyEvent &keyEvent) override final; + void keyPressed(KeyEvent &event) override final; private: WorldListModel *mWorldListModel; |