summaryrefslogtreecommitdiff
path: root/src/gui/windows
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/windows')
-rw-r--r--src/gui/windows/buydialog.cpp4
-rw-r--r--src/gui/windows/changeemaildialog.cpp2
-rw-r--r--src/gui/windows/changepassworddialog.cpp2
-rw-r--r--src/gui/windows/charcreatedialog.cpp2
-rw-r--r--src/gui/windows/chatwindow.cpp8
-rw-r--r--src/gui/windows/clanwindow.cpp8
-rw-r--r--src/gui/windows/cutinwindow.cpp6
-rw-r--r--src/gui/windows/debugwindow.cpp8
-rw-r--r--src/gui/windows/didyouknowwindow.cpp2
-rw-r--r--src/gui/windows/emotewindow.cpp20
-rw-r--r--src/gui/windows/equipmentwindow.cpp6
-rw-r--r--src/gui/windows/inventorywindow.cpp8
-rw-r--r--src/gui/windows/itemamountwindow.cpp2
-rw-r--r--src/gui/windows/logindialog.cpp4
-rw-r--r--src/gui/windows/maileditwindow.cpp2
-rw-r--r--src/gui/windows/mailviewwindow.cpp6
-rw-r--r--src/gui/windows/mailwindow.cpp6
-rw-r--r--src/gui/windows/ministatuswindow.cpp2
-rw-r--r--src/gui/windows/npcdialog.cpp38
-rw-r--r--src/gui/windows/questswindow.cpp4
-rw-r--r--src/gui/windows/quitdialog.cpp8
-rw-r--r--src/gui/windows/registerdialog.cpp2
-rw-r--r--src/gui/windows/serverdialog.cpp2
-rw-r--r--src/gui/windows/setupwindow.cpp4
-rw-r--r--src/gui/windows/shopwindow.cpp14
-rw-r--r--src/gui/windows/shortcutwindow.cpp4
-rw-r--r--src/gui/windows/skilldialog.cpp10
-rw-r--r--src/gui/windows/socialwindow.cpp10
-rw-r--r--src/gui/windows/statuswindow.cpp2
-rw-r--r--src/gui/windows/textcommandeditor.cpp6
-rw-r--r--src/gui/windows/textselectdialog.cpp2
-rw-r--r--src/gui/windows/tradewindow.cpp4
-rw-r--r--src/gui/windows/updaterwindow.cpp2
-rw-r--r--src/gui/windows/worldselectdialog.cpp2
34 files changed, 106 insertions, 106 deletions
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)