diff options
Diffstat (limited to 'src/gui')
80 files changed, 245 insertions, 245 deletions
diff --git a/src/gui/fonts/font.cpp b/src/gui/fonts/font.cpp index 9d09d7855..5ce6b88d0 100644 --- a/src/gui/fonts/font.cpp +++ b/src/gui/fonts/font.cpp @@ -124,7 +124,7 @@ Font::Font(std::string filename, { reportAlways("Error: requested load font %s with size %d", filename.c_str(), - size); + size) size = 4; } @@ -151,7 +151,7 @@ Font::Font(std::string filename, { #ifdef UNITTESTS reportAlways("Font load failed %s", - filename.c_str()); + filename.c_str()) #endif // UNITTESTS logger->error("Font::Font: " + std::string(SDL_GetError())); @@ -205,7 +205,7 @@ TTF_Font *Font::openFont(const char *const name, #ifndef UNITTESTS // +++ in future need trigger assert in unit tests here too reportAlways("Font::openFont font not exists: %s", - path.c_str()); + path.c_str()) #endif // UNITTESTS return nullptr; } @@ -489,7 +489,7 @@ void Font::insertChunk(TextChunk *const chunk) chunk->color, chunk->color2)); if (i != search.end()) { - delete2(chunk->img); + delete2(chunk->img) return; } diff --git a/src/gui/fonts/textchunk.cpp b/src/gui/fonts/textchunk.cpp index 9280b9241..75b9c9626 100644 --- a/src/gui/fonts/textchunk.cpp +++ b/src/gui/fonts/textchunk.cpp @@ -81,7 +81,7 @@ TextChunk::TextChunk(const std::string &restrict text0, TextChunk::~TextChunk() { - delete2(img); + delete2(img) #ifdef UNITTESTS textChunkCnt --; #endif // UNITTESTS @@ -198,6 +198,6 @@ void TextChunk::deleteImage() } else { - delete2(img); + delete2(img) } } diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index be516ebe9..4e9133188 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -267,7 +267,7 @@ void Gui::postInit(Graphics *const graphics) Gui::~Gui() { config.removeListeners(mConfigListener); - delete2(mConfigListener); + delete2(mConfigListener) if (mMouseCursors != nullptr) { @@ -283,16 +283,16 @@ Gui::~Gui() Window::setWindowContainer(nullptr); delete top; - delete2(mGuiFont); - delete2(boldFont); - delete2(mHelpFont); - delete2(mSecureFont); - delete2(mInfoParticleFont); - delete2(mNpcFont); - delete2(guiInput); - delete2(theme); + delete2(mGuiFont) + delete2(boldFont) + delete2(mHelpFont) + delete2(mSecureFont) + delete2(mInfoParticleFont) + delete2(mNpcFont) + delete2(guiInput) + delete2(theme) - delete2(mFocusHandler); + delete2(mFocusHandler) Label::finalCleanup(); Tab::finalCleanup(); Widget::cleanGlobalFont(); diff --git a/src/gui/models/colormodel.cpp b/src/gui/models/colormodel.cpp index 694fecff0..e30458750 100644 --- a/src/gui/models/colormodel.cpp +++ b/src/gui/models/colormodel.cpp @@ -66,7 +66,7 @@ void ColorModel::add(const std::string &name, const Color *const color1, #define addColor(name, color) \ model->add(name, &widget->getThemeColor(ThemeColorId::color, 255U), \ - &widget->getThemeColor(ThemeColorId::color##_OUTLINE, 255U)); + &widget->getThemeColor(ThemeColorId::color##_OUTLINE, 255U)) ColorModel *ColorModel::createDefault(const Widget2 *const widget) { diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp index 1d4745110..c795a0384 100644 --- a/src/gui/popups/popupmenu.cpp +++ b/src/gui/popups/popupmenu.cpp @@ -1546,7 +1546,7 @@ void PopupMenu::handleLink(const std::string &link, // Unknown actions else if (link != "cancel") { - reportAlways("PopupMenu: Warning, unknown action '%s'", link.c_str()); + reportAlways("PopupMenu: Warning, unknown action '%s'", link.c_str()) } if (!mAllowCleanMenu) diff --git a/src/gui/popups/statuspopup.cpp b/src/gui/popups/statuspopup.cpp index 863dd38ef..dd2b317ab 100644 --- a/src/gui/popups/statuspopup.cpp +++ b/src/gui/popups/statuspopup.cpp @@ -59,27 +59,27 @@ void StatusPopup::postInit() Popup::postInit(); const int fontHeight = getFont()->getHeight(); int y = 0; - addLabel(0); - addLabel(1); - addLabel(2); - addLabel(3); + addLabel(0) + addLabel(1) + addLabel(2) + addLabel(3) y += 4; - addLabel(4); - addLabel(5); - addLabel(9); - addLabel(10); + addLabel(4) + addLabel(5) + addLabel(9) + addLabel(10) y += 4; - addLabel(6); - addLabel(7); + addLabel(6) + addLabel(7) y += 4; - addLabel(8); + addLabel(8) y += 4; - addLabel(12); - addLabel(13); - addLabel(14); - addLabel(15); + addLabel(12) + addLabel(13) + addLabel(14) + addLabel(15) y += 4; - addLabel(11); + addLabel(11) } StatusPopup::~StatusPopup() diff --git a/src/gui/skin.cpp b/src/gui/skin.cpp index 65f7a1b41..2797ad0d1 100644 --- a/src/gui/skin.cpp +++ b/src/gui/skin.cpp @@ -96,8 +96,8 @@ Skin::~Skin() mStickyImageDown = nullptr; } - delete2(mOptions); - delete2(mBorder); + delete2(mOptions) + delete2(mBorder) } void Skin::updateAlpha(const float minimumOpacityAllowed) diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index c6d1e1bd1..4954e0d8c 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -891,7 +891,7 @@ void Theme::loadRect(ImageRect &image, Theme::getThemePath()); if (skin != nullptr) { - loadGrid(); + loadGrid() unload(skin); } } @@ -907,7 +907,7 @@ Skin *Theme::loadSkinRect(ImageRect &image, true, Theme::getThemePath()); if (skin != nullptr) - loadGrid(); + loadGrid() return skin; } diff --git a/src/gui/widgets/attrs/attrdisplay.cpp b/src/gui/widgets/attrs/attrdisplay.cpp index fe5c1f3e3..5ab26c02b 100644 --- a/src/gui/widgets/attrs/attrdisplay.cpp +++ b/src/gui/widgets/attrs/attrdisplay.cpp @@ -52,7 +52,7 @@ AttrDisplay::AttrDisplay(const Widget2 *const widget, AttrDisplay::~AttrDisplay() { - delete2(mLayout); + delete2(mLayout) } std::string AttrDisplay::update() diff --git a/src/gui/widgets/basiccontainer.cpp b/src/gui/widgets/basiccontainer.cpp index 92611687d..95fe9e1ef 100644 --- a/src/gui/widgets/basiccontainer.cpp +++ b/src/gui/widgets/basiccontainer.cpp @@ -82,7 +82,7 @@ void BasicContainer::moveToTop(Widget *const widget) restrict2 { if (widget == nullptr) { - reportAlways("BasicContainer::moveToTop empty widget."); + reportAlways("BasicContainer::moveToTop empty widget.") return; } @@ -110,7 +110,7 @@ void BasicContainer::moveToBottom(Widget *const widget) restrict2 { if (widget == nullptr) { - reportAlways("BasicContainer::moveToBottom empty widget."); + reportAlways("BasicContainer::moveToBottom empty widget.") return; } const WidgetListIterator iter = std::find(mWidgets.begin(), diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp index 7354dbabf..82039de0c 100644 --- a/src/gui/widgets/browserbox.cpp +++ b/src/gui/widgets/browserbox.cpp @@ -413,7 +413,7 @@ void BrowserBox::draw(Graphics *const graphics) setHeight(mHeight); mUpdateTime = cur_time; if (mDimension.width != mWidth) - reportAlways("browserbox resize in draw"); + reportAlways("browserbox resize in draw") } if (mOpaque == Opaque_true) diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp index 34112e5a5..840171207 100644 --- a/src/gui/widgets/button.cpp +++ b/src/gui/widgets/button.cpp @@ -346,7 +346,7 @@ Button::~Button() for (int mode = 0; mode < BUTTON_COUNT; mode ++) theme->unload(mSkin[mode]); } - delete2(mVertexes2); + delete2(mVertexes2) if (mImageSet != nullptr) { mImageSet->decRef(); diff --git a/src/gui/widgets/emotepage.cpp b/src/gui/widgets/emotepage.cpp index d10acc705..ffd04302d 100644 --- a/src/gui/widgets/emotepage.cpp +++ b/src/gui/widgets/emotepage.cpp @@ -60,7 +60,7 @@ EmotePage::~EmotePage() mEmotes->decRef(); mEmotes = nullptr; } - delete2(mVertexes); + delete2(mVertexes) } void EmotePage::draw(Graphics *const graphics) diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp index 7dc8c288a..2db154dc9 100644 --- a/src/gui/widgets/guitable.cpp +++ b/src/gui/widgets/guitable.cpp @@ -73,7 +73,7 @@ GuiTable::~GuiTable() gui->removeDragged(this); uninstallActionListeners(); - delete2(mModel); + delete2(mModel) } const TableModel *GuiTable::getModel() const diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp index 69c816a68..fba09fddb 100644 --- a/src/gui/widgets/itemcontainer.cpp +++ b/src/gui/widgets/itemcontainer.cpp @@ -297,7 +297,7 @@ ItemContainer::~ItemContainer() theme->unload(mSkin); delete []mShowMatrix; - delete2(mVertexes); + delete2(mVertexes) } void ItemContainer::logic() @@ -745,7 +745,7 @@ void ItemContainer::mouseReleased(MouseEvent &event) case SEL_SELECTED: default: break; - }; + } if (dragDrop.isEmpty()) { diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp index c676de26e..05487b7be 100644 --- a/src/gui/widgets/popup.cpp +++ b/src/gui/widgets/popup.cpp @@ -84,7 +84,7 @@ Popup::~Popup() { logger->log("Popup::~Popup(\"%s\")", mPopupName.c_str()); - delete2(mVertexes); + delete2(mVertexes) if (mSkin != nullptr) { diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp index 46988133b..05933fe89 100644 --- a/src/gui/widgets/progressbar.cpp +++ b/src/gui/widgets/progressbar.cpp @@ -120,7 +120,7 @@ ProgressBar::~ProgressBar() mSkin = nullptr; } Theme::unloadRect(mFillRect, 0, 8); - delete2(mVertexes); + delete2(mVertexes) mTextChunk.deleteImage(); } diff --git a/src/gui/widgets/progressindicator.cpp b/src/gui/widgets/progressindicator.cpp index f87c3cb09..30e7da5e8 100644 --- a/src/gui/widgets/progressindicator.cpp +++ b/src/gui/widgets/progressindicator.cpp @@ -60,7 +60,7 @@ ProgressIndicator::~ProgressIndicator() if (gui != nullptr) gui->removeDragged(this); - delete2(mIndicator); + delete2(mIndicator) } void ProgressIndicator::logic() diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp index cce45deee..f313ee400 100644 --- a/src/gui/widgets/scrollarea.cpp +++ b/src/gui/widgets/scrollarea.cpp @@ -172,8 +172,8 @@ ScrollArea::~ScrollArea() } } - delete2(mVertexes); - delete2(mVertexes2); + delete2(mVertexes) + delete2(mVertexes2) setContent(nullptr); } diff --git a/src/gui/widgets/selldialog.cpp b/src/gui/widgets/selldialog.cpp index dc612c0ac..b1bddd32b 100644 --- a/src/gui/widgets/selldialog.cpp +++ b/src/gui/widgets/selldialog.cpp @@ -221,7 +221,7 @@ void SellDialog::postInit() SellDialog::~SellDialog() { - delete2(mShopItems); + delete2(mShopItems) instances.remove(this); } diff --git a/src/gui/widgets/shortcutcontainer.cpp b/src/gui/widgets/shortcutcontainer.cpp index 5eb4ea46f..14a774bb7 100644 --- a/src/gui/widgets/shortcutcontainer.cpp +++ b/src/gui/widgets/shortcutcontainer.cpp @@ -91,7 +91,7 @@ ShortcutContainer::~ShortcutContainer() if (gui != nullptr) gui->removeDragged(this); - delete2(mVertexes); + delete2(mVertexes) } void ShortcutContainer::widgetResized(const Event &event A_UNUSED) diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp index 2c4c6c212..4caaa6a45 100644 --- a/src/gui/widgets/slider.cpp +++ b/src/gui/widgets/slider.cpp @@ -135,7 +135,7 @@ Slider::~Slider() if (gui != nullptr) gui->removeDragged(this); - delete2(mVertexes); + delete2(mVertexes) mInstances--; if (mInstances == 0) { diff --git a/src/gui/widgets/staticbrowserbox.cpp b/src/gui/widgets/staticbrowserbox.cpp index c4a705aa9..13d3bfb64 100644 --- a/src/gui/widgets/staticbrowserbox.cpp +++ b/src/gui/widgets/staticbrowserbox.cpp @@ -362,7 +362,7 @@ void StaticBrowserBox::draw(Graphics *const graphics) updateHeight(); reportAlways("browserbox resize in draw: %d, %d", mDimension.width, - mWidth); + mWidth) } if (mOpaque == Opaque_true) diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp index 59882966c..693a53e10 100644 --- a/src/gui/widgets/tabbedarea.cpp +++ b/src/gui/widgets/tabbedarea.cpp @@ -136,14 +136,14 @@ TabbedArea::~TabbedArea() remove(mTabContainer); remove(mWidgetContainer); - delete2(mTabContainer); - delete2(mWidgetContainer); + delete2(mTabContainer) + delete2(mWidgetContainer) for (size_t i = 0, sz = mTabsToDelete.size(); i < sz; i++) delete2(mTabsToDelete[i]) - delete2(mArrowButton[0]); - delete2(mArrowButton[1]); + delete2(mArrowButton[0]) + delete2(mArrowButton[1]) } void TabbedArea::enableScrollButtons(const bool enable) diff --git a/src/gui/widgets/tabs/chat/chattab.cpp b/src/gui/widgets/tabs/chat/chattab.cpp index 8d3ccafbb..67761a21c 100644 --- a/src/gui/widgets/tabs/chat/chattab.cpp +++ b/src/gui/widgets/tabs/chat/chattab.cpp @@ -103,8 +103,8 @@ ChatTab::~ChatTab() if (chatWindow != nullptr) chatWindow->removeTab(this); - delete2(mTextOutput); - delete2(mScrollArea); + delete2(mTextOutput) + delete2(mScrollArea) } void ChatTab::chatLog(std::string line, diff --git a/src/gui/widgets/tabs/mapdebugtab.cpp b/src/gui/widgets/tabs/mapdebugtab.cpp index 6b133e4bb..36a96084d 100644 --- a/src/gui/widgets/tabs/mapdebugtab.cpp +++ b/src/gui/widgets/tabs/mapdebugtab.cpp @@ -125,7 +125,7 @@ MapDebugTab::MapDebugTab(const Widget2 *const widget) : // TRANSLATORS: debug window label mFPSText = _("%d FPS (SDL2 default)"); break; - }; + } #else // USE_OPENGL // TRANSLATORS: debug window label diff --git a/src/gui/widgets/tabs/setup_audio.cpp b/src/gui/widgets/tabs/setup_audio.cpp index 2a9d63eba..e9617a178 100644 --- a/src/gui/widgets/tabs/setup_audio.cpp +++ b/src/gui/widgets/tabs/setup_audio.cpp @@ -205,8 +205,8 @@ Setup_Audio::Setup_Audio(const Widget2 *const widget) : Setup_Audio::~Setup_Audio() { - delete2(mSoundModel); - delete2(mChannelsList); + delete2(mSoundModel) + delete2(mChannelsList) } void Setup_Audio::apply() diff --git a/src/gui/widgets/tabs/setup_input.cpp b/src/gui/widgets/tabs/setup_input.cpp index 49b31c5fe..835e6075d 100644 --- a/src/gui/widgets/tabs/setup_input.cpp +++ b/src/gui/widgets/tabs/setup_input.cpp @@ -138,14 +138,14 @@ Setup_Input::Setup_Input(const Widget2 *const widget) : Setup_Input::~Setup_Input() { - delete2(mKeyList); - delete2(mKeyListModel); - delete2(mAssignKeyButton); - delete2(mUnassignKeyButton); - delete2(mResetKeysButton); + delete2(mKeyList) + delete2(mKeyListModel) + delete2(mAssignKeyButton) + delete2(mUnassignKeyButton) + delete2(mResetKeysButton) delete [] mActionDataSize; mActionDataSize = nullptr; - delete2(mScrollArea); + delete2(mScrollArea) } void Setup_Input::apply() diff --git a/src/gui/widgets/tabs/setup_joystick.cpp b/src/gui/widgets/tabs/setup_joystick.cpp index e3dd95caf..b2bf2c3a7 100644 --- a/src/gui/widgets/tabs/setup_joystick.cpp +++ b/src/gui/widgets/tabs/setup_joystick.cpp @@ -105,7 +105,7 @@ Setup_Joystick::Setup_Joystick(const Widget2 *const widget) : Setup_Joystick::~Setup_Joystick() { - delete2(mNamesModel); + delete2(mNamesModel) } void Setup_Joystick::action(const ActionEvent &event) diff --git a/src/gui/widgets/tabs/setup_misc.cpp b/src/gui/widgets/tabs/setup_misc.cpp index 408184311..713ad7db9 100644 --- a/src/gui/widgets/tabs/setup_misc.cpp +++ b/src/gui/widgets/tabs/setup_misc.cpp @@ -572,11 +572,11 @@ Setup_Misc::Setup_Misc(const Widget2 *const widget) : Setup_Misc::~Setup_Misc() { - delete2(mProxyTypeList); - delete2(mShortcutsList); - delete2(mDensityList); + delete2(mProxyTypeList) + delete2(mShortcutsList) + delete2(mDensityList) #ifdef USE_SDL2 - delete2(mSdlLogList); + delete2(mSdlLogList) #endif // USE_SDL2 } diff --git a/src/gui/widgets/tabs/setup_perfomance.cpp b/src/gui/widgets/tabs/setup_perfomance.cpp index 03a4fba45..83dc41503 100644 --- a/src/gui/widgets/tabs/setup_perfomance.cpp +++ b/src/gui/widgets/tabs/setup_perfomance.cpp @@ -229,8 +229,8 @@ Setup_Perfomance::Setup_Perfomance(const Widget2 *const widget) : Setup_Perfomance::~Setup_Perfomance() { - delete2(mTexturesList); + delete2(mTexturesList) #ifdef USE_SDL2 - delete2(mSdlDriversList); + delete2(mSdlDriversList) #endif // USE_SDL2 } diff --git a/src/gui/widgets/tabs/setup_players.cpp b/src/gui/widgets/tabs/setup_players.cpp index 67fe2d459..940c4d9c6 100644 --- a/src/gui/widgets/tabs/setup_players.cpp +++ b/src/gui/widgets/tabs/setup_players.cpp @@ -215,9 +215,9 @@ Setup_Players::Setup_Players(const Widget2 *const widget) : Setup_Players::~Setup_Players() { - delete2(mBadgesList); - delete2(mVisibleNamesList); - delete2(mVisibleNamesPosList); + delete2(mBadgesList) + delete2(mVisibleNamesList) + delete2(mVisibleNamesPosList) } void Setup_Players::externalUpdated() diff --git a/src/gui/widgets/tabs/setup_quick.cpp b/src/gui/widgets/tabs/setup_quick.cpp index f50c1d6a8..18e61d0c0 100644 --- a/src/gui/widgets/tabs/setup_quick.cpp +++ b/src/gui/widgets/tabs/setup_quick.cpp @@ -113,6 +113,6 @@ Setup_Quick::Setup_Quick(const Widget2 *const widget) : Setup_Quick::~Setup_Quick() { - delete2(mMoveTypeList); - delete2(mCrazyMoveTypeList); + delete2(mMoveTypeList) + delete2(mCrazyMoveTypeList) } diff --git a/src/gui/widgets/tabs/setup_relations.cpp b/src/gui/widgets/tabs/setup_relations.cpp index e89c2a3e0..03ee760c9 100644 --- a/src/gui/widgets/tabs/setup_relations.cpp +++ b/src/gui/widgets/tabs/setup_relations.cpp @@ -149,7 +149,7 @@ Setup_Relations::Setup_Relations(const Widget2 *const widget) : Setup_Relations::~Setup_Relations() { playerRelations.removeListener(this); - delete2(mIgnoreActionChoicesModel); + delete2(mIgnoreActionChoicesModel) } diff --git a/src/gui/widgets/tabs/setup_theme.cpp b/src/gui/widgets/tabs/setup_theme.cpp index 080573c3c..22db49b34 100644 --- a/src/gui/widgets/tabs/setup_theme.cpp +++ b/src/gui/widgets/tabs/setup_theme.cpp @@ -236,13 +236,13 @@ Setup_Theme::Setup_Theme(const Widget2 *const widget) : Setup_Theme::~Setup_Theme() { - delete2(mInfo); - delete2(mThemesModel); - delete2(mFontsModel); - delete2(mFontSizeListModel); - delete2(mNpcFontSizeListModel); - delete2(mLangListModel); - delete2(mInfo); + delete2(mInfo) + delete2(mThemesModel) + delete2(mFontsModel) + delete2(mFontSizeListModel) + delete2(mNpcFontSizeListModel) + delete2(mLangListModel) + delete2(mInfo) } void Setup_Theme::updateInfo() @@ -347,7 +347,7 @@ void Setup_Theme::cancel() } #define updateField(name1, name2) if (!mInfo->name1.empty()) \ - name2 = mInfo->name1; + name2 = mInfo->name1 void Setup_Theme::apply() { diff --git a/src/gui/widgets/tabs/setup_touch.cpp b/src/gui/widgets/tabs/setup_touch.cpp index f8247d15d..1b6ce3ed4 100644 --- a/src/gui/widgets/tabs/setup_touch.cpp +++ b/src/gui/widgets/tabs/setup_touch.cpp @@ -137,7 +137,7 @@ Setup_Touch::Setup_Touch(const Widget2 *const widget) : Setup_Touch::~Setup_Touch() { - delete2(mSizeList); - delete2(mFormatList); - delete2(mActionsList); + delete2(mSizeList) + delete2(mFormatList) + delete2(mActionsList) } diff --git a/src/gui/widgets/tabs/setup_video.cpp b/src/gui/widgets/tabs/setup_video.cpp index 557cdffce..0adc55ec6 100644 --- a/src/gui/widgets/tabs/setup_video.cpp +++ b/src/gui/widgets/tabs/setup_video.cpp @@ -217,10 +217,10 @@ Setup_Video::Setup_Video(const Widget2 *const widget) : Setup_Video::~Setup_Video() { - delete2(mModeListModel); - delete2(mModeList); - delete2(mOpenGLListModel); - delete2(mDialog); + delete2(mModeListModel) + delete2(mModeList) + delete2(mOpenGLListModel) + delete2(mDialog) } void Setup_Video::apply() diff --git a/src/gui/widgets/tabs/setup_visual.cpp b/src/gui/widgets/tabs/setup_visual.cpp index 6912ef560..325732467 100644 --- a/src/gui/widgets/tabs/setup_visual.cpp +++ b/src/gui/widgets/tabs/setup_visual.cpp @@ -256,12 +256,12 @@ Setup_Visual::Setup_Visual(const Widget2 *const widget) : Setup_Visual::~Setup_Visual() { - delete2(mSpeachList); - delete2(mAmbientFxList); - delete2(mParticleList); - delete2(mParticleTypeList); - delete2(mVSyncList); - delete2(mScaleList); + delete2(mSpeachList) + delete2(mAmbientFxList) + delete2(mParticleList) + delete2(mParticleTypeList) + delete2(mVSyncList) + delete2(mScaleList) } void Setup_Visual::apply() diff --git a/src/gui/widgets/tabs/setuptabscroll.cpp b/src/gui/widgets/tabs/setuptabscroll.cpp index 1b2096c1f..1f9cceaba 100644 --- a/src/gui/widgets/tabs/setuptabscroll.cpp +++ b/src/gui/widgets/tabs/setuptabscroll.cpp @@ -45,7 +45,7 @@ SetupTabScroll::SetupTabScroll(const Widget2 *const widget) : SetupTabScroll::~SetupTabScroll() { mScroll = nullptr; - delete2(mContainer); + delete2(mContainer) removeItems(); } diff --git a/src/gui/widgets/tabs/socialattacktab.h b/src/gui/widgets/tabs/socialattacktab.h index 0b2e8db41..752a32942 100644 --- a/src/gui/widgets/tabs/socialattacktab.h +++ b/src/gui/widgets/tabs/socialattacktab.h @@ -63,11 +63,11 @@ class SocialAttackTab final : public SocialTab { updateAtkListStart(); // TRANSLATORS: mobs group name in social window - addAvatars(PriorityAttackMob, _("Priority mobs"), PRIORITY); + addAvatars(PriorityAttackMob, _("Priority mobs"), PRIORITY) // TRANSLATORS: mobs group name in social window - addAvatars(AttackMob, _("Attack mobs"), ATTACK); + addAvatars(AttackMob, _("Attack mobs"), ATTACK) // TRANSLATORS: mobs group name in social window - addAvatars(IgnoreAttackMob, _("Ignore mobs"), IGNORE_); + addAvatars(IgnoreAttackMob, _("Ignore mobs"), IGNORE_) } private: diff --git a/src/gui/widgets/tabs/socialpickuptab.h b/src/gui/widgets/tabs/socialpickuptab.h index 54d860664..00dc616f1 100644 --- a/src/gui/widgets/tabs/socialpickuptab.h +++ b/src/gui/widgets/tabs/socialpickuptab.h @@ -63,9 +63,9 @@ class SocialPickupTab final : public SocialTab { updateAtkListStart(); // TRANSLATORS: items group name in social window - addAvatars(PickupItem, _("Pickup items"), PICKUP); + addAvatars(PickupItem, _("Pickup items"), PICKUP) // TRANSLATORS: items group name in social window - addAvatars(IgnorePickupItem, _("Ignore items"), NOPICKUP); + addAvatars(IgnorePickupItem, _("Ignore items"), NOPICKUP) } private: diff --git a/src/gui/widgets/tabs/socialtabbase.h b/src/gui/widgets/tabs/socialtabbase.h index b7cbf5a8f..8c0a7081e 100644 --- a/src/gui/widgets/tabs/socialtabbase.h +++ b/src/gui/widgets/tabs/socialtabbase.h @@ -79,6 +79,6 @@ ENUMS_RESOURCES_MAP_MAPITEMTYPE_H Avatar *ava = nullptr;\ std::list<std::string> mobs;\ std::list<std::string>::const_iterator i;\ - std::list<std::string>::const_iterator i_end; + std::list<std::string>::const_iterator i_end #endif // GUI_WIDGETS_TABS_SOCIALTABBASE_H diff --git a/src/gui/widgets/tabs/tab.cpp b/src/gui/widgets/tabs/tab.cpp index fd4faafa1..e43833fe8 100644 --- a/src/gui/widgets/tabs/tab.cpp +++ b/src/gui/widgets/tabs/tab.cpp @@ -140,14 +140,14 @@ Tab::~Tab() theme->unload(tabImg[mode]); } - delete2(mLabel); + delete2(mLabel) if (mImage != nullptr) { mImage->decRef(); mImage = nullptr; } - delete2(mVertexes); + delete2(mVertexes) } void Tab::init() diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp index f76c5fb9e..be0712315 100644 --- a/src/gui/widgets/window.cpp +++ b/src/gui/widgets/window.cpp @@ -179,7 +179,7 @@ Window::Window(const std::string &caption, if (skin.empty()) { reportAlways("Default skin was used for window: %s", - caption.c_str()); + caption.c_str()) skin = "window.xml"; } @@ -251,7 +251,7 @@ void Window::postInit() { reportAlways("error: Window created with calling postInit() " "more than once: %s", - mWindowName.c_str()); + mWindowName.c_str()) } mInit = true; } @@ -272,7 +272,7 @@ Window::~Window() saveWindowState(); - delete2(mLayout); + delete2(mLayout) while (!mWidgets.empty()) delete mWidgets.front(); @@ -280,7 +280,7 @@ Window::~Window() mWidgets.clear(); removeWidgetListener(this); - delete2(mVertexes); + delete2(mVertexes) windowInstances--; @@ -298,7 +298,7 @@ Window::~Window() if (!mInit) { reportAlways("error: Window created without calling postInit(): %s", - mWindowName.c_str()); + mWindowName.c_str()) } } @@ -1398,7 +1398,7 @@ void Window::reflowLayout(int w, int h) return; mLayout->reflow(w, h); - delete2(mLayout); + delete2(mLayout) setContentSize(w, h); } diff --git a/src/gui/widgets/windowcontainer.cpp b/src/gui/widgets/windowcontainer.cpp index a275b7cb1..cb76223e3 100644 --- a/src/gui/widgets/windowcontainer.cpp +++ b/src/gui/widgets/windowcontainer.cpp @@ -59,7 +59,7 @@ void WindowContainer::scheduleDelete(Widget *const widget) else { reportAlways("double adding pointer %p for deletion in scheduleDelete", - static_cast<void*>(widget)); + static_cast<void*>(widget)) } } diff --git a/src/gui/windowmanager.cpp b/src/gui/windowmanager.cpp index d4923c478..b2adafff8 100644 --- a/src/gui/windowmanager.cpp +++ b/src/gui/windowmanager.cpp @@ -132,7 +132,7 @@ void WindowManager::createWindows() CREATEWIDGETV0(itemPopup, ItemPopup); CREATEWIDGETV0(spellPopup, SpellPopup); CREATEWIDGETV0(skillPopup, SkillPopup); - delete2(debugChatTab); + delete2(debugChatTab) if (chatWindow != nullptr) { chatWindow->scheduleDelete(); @@ -171,34 +171,34 @@ void WindowManager::createValidateWindows() void WindowManager::deleteValidateWindows() { #ifndef DYECMD - delete2(skillDialog); - delete2(beingEquipmentWindow); - delete2(questsWindow); + delete2(skillDialog) + delete2(beingEquipmentWindow) + delete2(questsWindow) #endif // DYECMD } void WindowManager::deleteWindows() { #ifndef DYECMD - delete2(textBoxPopup); - delete2(beingPopup); - delete2(itemPopup); - delete2(spellPopup); - delete2(skillPopup); - delete2(popupMenu); - delete2(didYouKnowWindow); - delete2(helpWindow); - delete2(setupWindow); - delete2(userPalette); + delete2(textBoxPopup) + delete2(beingPopup) + delete2(itemPopup) + delete2(spellPopup) + delete2(skillPopup) + delete2(popupMenu) + delete2(didYouKnowWindow) + delete2(helpWindow) + delete2(setupWindow) + delete2(userPalette) delete2(spellManager) delete2(spellShortcut) - delete2(debugChatTab); - delete2(chatWindow); - delete2(debugWindow); + delete2(debugChatTab) + delete2(chatWindow) + delete2(debugWindow) #endif // DYECMD - delete2(textPopup); + delete2(textPopup) } void WindowManager::initTitle() diff --git a/src/gui/windows/buydialog.cpp b/src/gui/windows/buydialog.cpp index cc4cf4699..0dbcac79c 100644 --- a/src/gui/windows/buydialog.cpp +++ b/src/gui/windows/buydialog.cpp @@ -426,8 +426,8 @@ void BuyDialog::init() BuyDialog::~BuyDialog() { - delete2(mShopItems); - delete2(mSortModel); + delete2(mShopItems) + delete2(mSortModel) instances.remove(this); if (buySellHandler != nullptr) buySellHandler->cleanDialogReference(this); diff --git a/src/gui/windows/changeemaildialog.cpp b/src/gui/windows/changeemaildialog.cpp index 5cd03a887..034ac2463 100644 --- a/src/gui/windows/changeemaildialog.cpp +++ b/src/gui/windows/changeemaildialog.cpp @@ -108,7 +108,7 @@ ChangeEmailDialog::ChangeEmailDialog(LoginData &data) : ChangeEmailDialog::~ChangeEmailDialog() { - delete2(mWrongDataNoticeListener); + delete2(mWrongDataNoticeListener) } void ChangeEmailDialog::action(const ActionEvent &event) diff --git a/src/gui/windows/changepassworddialog.cpp b/src/gui/windows/changepassworddialog.cpp index d302244ba..c0ba5e573 100644 --- a/src/gui/windows/changepassworddialog.cpp +++ b/src/gui/windows/changepassworddialog.cpp @@ -85,7 +85,7 @@ ChangePasswordDialog::ChangePasswordDialog(LoginData &data) : ChangePasswordDialog::~ChangePasswordDialog() { - delete2(mWrongDataNoticeListener); + delete2(mWrongDataNoticeListener) } void ChangePasswordDialog::action(const ActionEvent &event) diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp index 852dbc2cc..5081ed63b 100644 --- a/src/gui/windows/charcreatedialog.cpp +++ b/src/gui/windows/charcreatedialog.cpp @@ -460,7 +460,7 @@ CharCreateDialog::CharCreateDialog(CharSelectDialog *const parent, CharCreateDialog::~CharCreateDialog() { - delete2(mPlayer); + delete2(mPlayer) if (charServerHandler != nullptr) charServerHandler->setCharCreateDialog(nullptr); diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index 560826d79..d981c49b9 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -219,9 +219,9 @@ ChatWindow::~ChatWindow() config.setValue("ReturnToggles", mReturnToggles); removeAllWhispers(); removeAllChannels(); - delete2(mItemLinkHandler); - delete2(mColorPicker); - delete2(mColorListModel); + delete2(mItemLinkHandler) + delete2(mColorPicker) + delete2(mColorListModel) } void ChatWindow::postInit() @@ -1060,7 +1060,7 @@ void ChatWindow::attributeChanged(const AttributesT id, } default: break; - }; + } PRAGMA45(GCC diagnostic pop) } diff --git a/src/gui/windows/clanwindow.cpp b/src/gui/windows/clanwindow.cpp index d2fb1bfd6..7520fdf7f 100644 --- a/src/gui/windows/clanwindow.cpp +++ b/src/gui/windows/clanwindow.cpp @@ -83,10 +83,10 @@ ClanWindow::ClanWindow() : ClanWindow::~ClanWindow() { - delete2(mInfoWidget); - delete2(mStatsWidget); - delete2(mAllyWidget); - delete2(mAntagonistWidget); + delete2(mInfoWidget) + delete2(mStatsWidget) + delete2(mAllyWidget) + delete2(mAntagonistWidget) } void ClanWindow::postInit() diff --git a/src/gui/windows/cutinwindow.cpp b/src/gui/windows/cutinwindow.cpp index 12a54a3b9..9b665b49e 100644 --- a/src/gui/windows/cutinwindow.cpp +++ b/src/gui/windows/cutinwindow.cpp @@ -52,7 +52,7 @@ CutInWindow::CutInWindow() : CutInWindow::~CutInWindow() { - delete2(mImage); + delete2(mImage) } void CutInWindow::draw(Graphics *const graphics) @@ -76,7 +76,7 @@ void CutInWindow::draw2(Graphics *const graphics) void CutInWindow::show(const std::string &name, const CutInT cutin) { - delete2(mImage); + delete2(mImage) if (name.empty()) { setVisible(Visible_false); @@ -138,7 +138,7 @@ void CutInWindow::show(const std::string &name, void CutInWindow::hide() { - delete2(mImage); + delete2(mImage) setVisible(Visible_false); } diff --git a/src/gui/windows/debugwindow.cpp b/src/gui/windows/debugwindow.cpp index 35d114ede..39cccba98 100644 --- a/src/gui/windows/debugwindow.cpp +++ b/src/gui/windows/debugwindow.cpp @@ -87,10 +87,10 @@ DebugWindow::DebugWindow(const std::string &name) : DebugWindow::~DebugWindow() { - delete2(mMapWidget); - delete2(mTargetWidget); - delete2(mNetWidget); - delete2(mStatWidget); + delete2(mMapWidget) + delete2(mTargetWidget) + delete2(mNetWidget) + delete2(mStatWidget) } void DebugWindow::postInit() diff --git a/src/gui/windows/didyouknowwindow.cpp b/src/gui/windows/didyouknowwindow.cpp index 1d53a9a9f..6f44b7c92 100644 --- a/src/gui/windows/didyouknowwindow.cpp +++ b/src/gui/windows/didyouknowwindow.cpp @@ -116,7 +116,7 @@ void DidYouKnowWindow::postInit() DidYouKnowWindow::~DidYouKnowWindow() { - delete2(mItemLinkHandler); + delete2(mItemLinkHandler) } void DidYouKnowWindow::action(const ActionEvent &event) diff --git a/src/gui/windows/emotewindow.cpp b/src/gui/windows/emotewindow.cpp index 537297203..17610da3c 100644 --- a/src/gui/windows/emotewindow.cpp +++ b/src/gui/windows/emotewindow.cpp @@ -146,16 +146,16 @@ EmoteWindow::~EmoteWindow() { mTabs->removeAll(false); mTabs->removeTab(mTabs->getTabByIndex(0)); - delete2(mEmotePage); - delete2(mColorPage); - delete2(mColorModel); - delete2(mScrollColorPage); - delete2(mFontPage); - delete2(mFontModel); - delete2(mScrollFontPage); - delete2(mTextPage); - delete2(mTextModel); - delete2(mScrollTextPage); + delete2(mEmotePage) + delete2(mColorPage) + delete2(mColorModel) + delete2(mScrollColorPage) + delete2(mFontPage) + delete2(mFontModel) + delete2(mScrollFontPage) + delete2(mTextPage) + delete2(mTextModel) + delete2(mScrollTextPage) if (mImageSet != nullptr) { mImageSet->decRef(); diff --git a/src/gui/windows/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp index 7d0284fc1..9a351e4da 100644 --- a/src/gui/windows/equipmentwindow.cpp +++ b/src/gui/windows/equipmentwindow.cpp @@ -175,7 +175,7 @@ EquipmentWindow::~EquipmentWindow() mSlotBackground->decRef(); if (mSlotHighlightedBackground != nullptr) mSlotHighlightedBackground->decRef(); - delete2(mVertexes); + delete2(mVertexes) } void EquipmentWindow::draw(Graphics *const graphics) @@ -751,7 +751,7 @@ void EquipmentWindow::prepareSlotNames() const std::string name = XML::getProperty(slotNode, "name", ""); if (name.empty()) { - reportAlways("Empty slot name detected."); + reportAlways("Empty slot name detected.") continue; } @@ -760,7 +760,7 @@ void EquipmentWindow::prepareSlotNames() { reportAlways("Wrong slot id '%d' for slot with name '%s'", slot, - name.c_str()); + name.c_str()) continue; } mSlotNames[name] = slot; diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp index be036a558..aa4d90258 100644 --- a/src/gui/windows/inventorywindow.cpp +++ b/src/gui/windows/inventorywindow.cpp @@ -146,7 +146,7 @@ InventoryWindow::InventoryWindow(Inventory *const inventory) : mSortDropDown->setSelected(config.getIntValue( "cartSortOrder")); break; - }; + } } else { @@ -374,7 +374,7 @@ InventoryWindow::InventoryWindow(Inventory *const inventory) : case InventoryType::Craft: case InventoryType::TypeEnd: break; - }; + } Layout &layout = getLayout(); layout.setRowHeight(2, LayoutType::SET); @@ -420,7 +420,7 @@ InventoryWindow::~InventoryWindow() invInstances.front()->updateDropButton(); mSortDropDown->hideDrop(false); - delete2(mSortModel); + delete2(mSortModel) } void InventoryWindow::storeSortOrder() const @@ -449,7 +449,7 @@ void InventoryWindow::storeSortOrder() const config.setValue("cartSortOrder", mSortDropDown->getSelected()); break; - }; + } } } diff --git a/src/gui/windows/itemamountwindow.cpp b/src/gui/windows/itemamountwindow.cpp index c30a91780..60b8ea6e4 100644 --- a/src/gui/windows/itemamountwindow.cpp +++ b/src/gui/windows/itemamountwindow.cpp @@ -351,7 +351,7 @@ void ItemAmountWindow::postInit() ItemAmountWindow::~ItemAmountWindow() { - delete2(mItemsModal); + delete2(mItemsModal) } // Show ItemTooltip diff --git a/src/gui/windows/logindialog.cpp b/src/gui/windows/logindialog.cpp index 53a50d4d5..855ebbde9 100644 --- a/src/gui/windows/logindialog.cpp +++ b/src/gui/windows/logindialog.cpp @@ -224,8 +224,8 @@ LoginDialog::~LoginDialog() if (mUpdateHostDropDown != nullptr) mUpdateHostDropDown->hideDrop(false); - delete2(mUpdateTypeModel); - delete2(mUpdateListModel); + delete2(mUpdateTypeModel) + delete2(mUpdateListModel) } void LoginDialog::action(const ActionEvent &event) diff --git a/src/gui/windows/maileditwindow.cpp b/src/gui/windows/maileditwindow.cpp index c241d97f8..473e78ef4 100644 --- a/src/gui/windows/maileditwindow.cpp +++ b/src/gui/windows/maileditwindow.cpp @@ -133,7 +133,7 @@ MailEditWindow::MailEditWindow() : MailEditWindow::~MailEditWindow() { mailEditWindow = nullptr; - delete2(mInventory); + delete2(mInventory) } void MailEditWindow::action(const ActionEvent &event) diff --git a/src/gui/windows/mailviewwindow.cpp b/src/gui/windows/mailviewwindow.cpp index ea0aa9a91..61ed8faa2 100644 --- a/src/gui/windows/mailviewwindow.cpp +++ b/src/gui/windows/mailviewwindow.cpp @@ -152,10 +152,10 @@ MailViewWindow::~MailViewWindow() } else { - delete2(mMessage); - delete2(mGetMoneyButton); + delete2(mMessage) + delete2(mGetMoneyButton) } - delete2(mInventory); + delete2(mInventory) mailViewWindow = nullptr; } diff --git a/src/gui/windows/mailwindow.cpp b/src/gui/windows/mailwindow.cpp index 6240792b4..c0f55c1b1 100644 --- a/src/gui/windows/mailwindow.cpp +++ b/src/gui/windows/mailwindow.cpp @@ -118,9 +118,9 @@ MailWindow::MailWindow() : MailWindow::~MailWindow() { delete_all(mMessages); - delete2(mMailModel); - delete2(mailViewWindow); - delete2(mailEditWindow); + delete2(mMailModel) + delete2(mailViewWindow) + delete2(mailEditWindow) } void MailWindow::action(const ActionEvent &event) diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp index 69dbcbf45..82facde3d 100644 --- a/src/gui/windows/ministatuswindow.cpp +++ b/src/gui/windows/ministatuswindow.cpp @@ -162,7 +162,7 @@ MiniStatusWindow::MiniStatusWindow() : MiniStatusWindow::~MiniStatusWindow() { - delete2(mStatusPopup); + delete2(mStatusPopup) delete_all(mIcons); mIcons.clear(); diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp index 7a671c987..49f0f3919 100644 --- a/src/gui/windows/npcdialog.cpp +++ b/src/gui/windows/npcdialog.cpp @@ -256,25 +256,25 @@ NpcDialog::~NpcDialog() deleteSkinControls(); - 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(mComplexInventory); - delete2(mItemScrollArea); - delete2(mListScrollArea); - delete2(mSkinScrollArea); + 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(mComplexInventory) + delete2(mItemScrollArea) + delete2(mListScrollArea) + delete2(mSkinScrollArea) FOR_EACH (ImageVectorIter, it, mImages) { diff --git a/src/gui/windows/questswindow.cpp b/src/gui/windows/questswindow.cpp index 69243ab1d..9948cf03f 100644 --- a/src/gui/windows/questswindow.cpp +++ b/src/gui/windows/questswindow.cpp @@ -137,11 +137,11 @@ QuestsWindow::QuestsWindow() : QuestsWindow::~QuestsWindow() { - delete2(mQuestsModel); + delete2(mQuestsModel) QuestDb::unload(); - delete2(mItemLinkHandler); + delete2(mItemLinkHandler) mQuestLinks.clear(); mQuestReverseLinks.clear(); if (mCompleteIcon != nullptr) diff --git a/src/gui/windows/quitdialog.cpp b/src/gui/windows/quitdialog.cpp index 3484f9a48..2bddaa84b 100644 --- a/src/gui/windows/quitdialog.cpp +++ b/src/gui/windows/quitdialog.cpp @@ -133,10 +133,10 @@ QuitDialog::~QuitDialog() { if (mMyPointer != nullptr) *mMyPointer = nullptr; - delete2(mForceQuit); - delete2(mLogoutQuit); - delete2(mSwitchAccountServer); - delete2(mSwitchCharacter); + delete2(mForceQuit) + delete2(mLogoutQuit) + delete2(mSwitchAccountServer) + delete2(mSwitchCharacter) } void QuitDialog::placeOption(ContainerPlacer &placer, diff --git a/src/gui/windows/registerdialog.cpp b/src/gui/windows/registerdialog.cpp index 695fd58e2..5fb970f49 100644 --- a/src/gui/windows/registerdialog.cpp +++ b/src/gui/windows/registerdialog.cpp @@ -153,7 +153,7 @@ void RegisterDialog::postInit() RegisterDialog::~RegisterDialog() { - delete2(mWrongDataNoticeListener); + delete2(mWrongDataNoticeListener) } void RegisterDialog::action(const ActionEvent &event) diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp index 9656d0c1c..f59f75ce2 100644 --- a/src/gui/windows/serverdialog.cpp +++ b/src/gui/windows/serverdialog.cpp @@ -219,7 +219,7 @@ ServerDialog::~ServerDialog() mDownload->cancel(); delete2(mDownload) } - delete2(mServersListModel); + delete2(mServersListModel) } void ServerDialog::connectToSelectedServer() diff --git a/src/gui/windows/setupwindow.cpp b/src/gui/windows/setupwindow.cpp index 46ac33da7..8b63a6a16 100644 --- a/src/gui/windows/setupwindow.cpp +++ b/src/gui/windows/setupwindow.cpp @@ -252,8 +252,8 @@ void SetupWindow::unloadAdditionalTabs() { unloadTab(mModsTab); unloadTab(mQuickTab); - delete2(mModsTab); - delete2(mQuickTab); + delete2(mModsTab) + delete2(mQuickTab) } void SetupWindow::externalUnload() diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp index 91c7063de..e0306503d 100644 --- a/src/gui/windows/shopwindow.cpp +++ b/src/gui/windows/shopwindow.cpp @@ -248,11 +248,11 @@ ShopWindow::~ShopWindow() { saveList(); - delete2(mBuyShopItemList); - delete2(mSellShopItemList); - delete2(mBuyShopItems); - delete2(mSellShopItems); - delete2(mTradeItem); + delete2(mBuyShopItemList) + delete2(mSellShopItemList) + delete2(mBuyShopItems) + delete2(mSellShopItems) + delete2(mTradeItem) instances.remove(this); } @@ -560,7 +560,7 @@ void ShopWindow::loadList() if (!shopFile.is_open()) { reportAlways("Error opening file for reading: %s", - shopListName.c_str()); + shopListName.c_str()) shopFile.close(); return; } @@ -616,7 +616,7 @@ void ShopWindow::saveList() const if (!shopFile.is_open()) { reportAlways("Error opening file writing: %s", - shopListName.c_str()); + shopListName.c_str()) return; } diff --git a/src/gui/windows/shortcutwindow.cpp b/src/gui/windows/shortcutwindow.cpp index 6d431c37c..40ddf6930 100644 --- a/src/gui/windows/shortcutwindow.cpp +++ b/src/gui/windows/shortcutwindow.cpp @@ -154,8 +154,8 @@ ShortcutWindow::~ShortcutWindow() { if (mTabs != nullptr) mTabs->removeAll(true); - delete2(mTabs); - delete2(mItems); + delete2(mTabs) + delete2(mItems) } void ShortcutWindow::addButton(const std::string &text, diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp index 39235c570..2dd536c29 100644 --- a/src/gui/windows/skilldialog.cpp +++ b/src/gui/windows/skilldialog.cpp @@ -360,7 +360,7 @@ void SkillDialog::loadSkills() if (mSkills.empty()) loadXmlFile(paths.getStringValue("skillsFile2"), SkipError_false); loadXmlFile(paths.getStringValue("skillsPatchFile"), SkipError_true); - loadXmlDir("skillsPatchDir", loadXmlFile); + loadXmlDir("skillsPatchDir", loadXmlFile) addDefaultTab(); update(); @@ -452,7 +452,7 @@ void SkillDialog::loadXmlFile(const std::string &fileName, } default: reportAlways("Unsupported skillset type: %s", - setTypeStr.c_str()); + setTypeStr.c_str()) return; } if (mDefaultModel == nullptr) @@ -1191,7 +1191,7 @@ void SkillDialog::useSkillTarget(const SkillInfo *const info, } else { - reportAlways("Unsupported skill type: %d", type); + reportAlways("Unsupported skill type: %d", type) } } @@ -1276,7 +1276,7 @@ void SkillDialog::useSkillPosition(const SkillInfo *const info, } else { - reportAlways("Unsupported skill type: %d", type); + reportAlways("Unsupported skill type: %d", type) } } @@ -1378,7 +1378,7 @@ void SkillDialog::useSkillDefault(const SkillInfo *const info, } else { - reportAlways("Unsupported skill type: %d", type); + reportAlways("Unsupported skill type: %d", type) } } diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp index ab469cada..8cf7419a1 100644 --- a/src/gui/windows/socialwindow.cpp +++ b/src/gui/windows/socialwindow.cpp @@ -166,11 +166,11 @@ SocialWindow::~SocialWindow() mPartyInviter.clear(); } - delete2(mPlayers); - delete2(mNavigation); - delete2(mAttackFilter); - delete2(mPickupFilter); - delete2(mFriends); + delete2(mPlayers) + delete2(mNavigation) + delete2(mAttackFilter) + delete2(mPickupFilter) + delete2(mFriends) FOR_EACH (GuildMap::iterator, it, mGuilds) { delete (*it).second; diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp index 3403e1b4c..4795ddb53 100644 --- a/src/gui/windows/statuswindow.cpp +++ b/src/gui/windows/statuswindow.cpp @@ -231,7 +231,7 @@ StatusWindow::StatusWindow() : StatusWindow::~StatusWindow() { - delete2(mBasicStatsPage); + delete2(mBasicStatsPage) delete_all(mPages); } diff --git a/src/gui/windows/textcommandeditor.cpp b/src/gui/windows/textcommandeditor.cpp index c9d48f21c..f22551864 100644 --- a/src/gui/windows/textcommandeditor.cpp +++ b/src/gui/windows/textcommandeditor.cpp @@ -245,10 +245,10 @@ void TextCommandEditor::postInit() TextCommandEditor::~TextCommandEditor() { - delete2(mIconsModel); - delete2(mTargetTypeModel); + delete2(mIconsModel) + delete2(mTargetTypeModel) #ifdef TMWA_SUPPORT - delete2(mMagicSchoolModel); + delete2(mMagicSchoolModel) #endif // TMWA_SUPPORT } diff --git a/src/gui/windows/textselectdialog.cpp b/src/gui/windows/textselectdialog.cpp index 9991a5754..7049c478b 100644 --- a/src/gui/windows/textselectdialog.cpp +++ b/src/gui/windows/textselectdialog.cpp @@ -132,7 +132,7 @@ void TextSelectDialog::postInit() TextSelectDialog::~TextSelectDialog() { - delete2(mModel); + delete2(mModel) } void TextSelectDialog::action(const ActionEvent &event) diff --git a/src/gui/windows/tradewindow.cpp b/src/gui/windows/tradewindow.cpp index 606d2a380..8e7842a69 100644 --- a/src/gui/windows/tradewindow.cpp +++ b/src/gui/windows/tradewindow.cpp @@ -166,8 +166,8 @@ TradeWindow::TradeWindow() : TradeWindow::~TradeWindow() { - delete2(mMyInventory); - delete2(mPartnerInventory); + delete2(mMyInventory) + delete2(mPartnerInventory) } void TradeWindow::setMoney(const int amount) diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp index 5b810b38e..f8951b308 100644 --- a/src/gui/windows/updaterwindow.cpp +++ b/src/gui/windows/updaterwindow.cpp @@ -275,7 +275,7 @@ UpdaterWindow::~UpdaterWindow() delete2(mDownload) } free(mMemoryBuffer); - delete2(mItemLinkHandler); + delete2(mItemLinkHandler) } void UpdaterWindow::setProgress(const float p) diff --git a/src/gui/windows/worldselectdialog.cpp b/src/gui/windows/worldselectdialog.cpp index 86e6a0e87..ed40b6269 100644 --- a/src/gui/windows/worldselectdialog.cpp +++ b/src/gui/windows/worldselectdialog.cpp @@ -96,7 +96,7 @@ void WorldSelectDialog::postInit() WorldSelectDialog::~WorldSelectDialog() { - delete2(mWorldListModel); + delete2(mWorldListModel) } void WorldSelectDialog::action(const ActionEvent &event) |