diff options
Diffstat (limited to 'src/gui/widgets')
37 files changed, 83 insertions, 83 deletions
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)) } } |