summaryrefslogtreecommitdiff
path: root/src/gui/widgets/tabs
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2018-11-26 00:51:57 +0300
committerAndrei Karas <akaras@inbox.ru>2018-11-27 20:33:15 +0300
commit0c20db8d108c4123fcc3ecb343759e68567a4d4e (patch)
treef577edeae7b4866d68c084a1eaa229e98c80ea8f /src/gui/widgets/tabs
parent2be4fc5b4eee97938657c9c8be73c4b91c8b9826 (diff)
downloadmanaverse-0c20db8d108c4123fcc3ecb343759e68567a4d4e.tar.gz
manaverse-0c20db8d108c4123fcc3ecb343759e68567a4d4e.tar.bz2
manaverse-0c20db8d108c4123fcc3ecb343759e68567a4d4e.tar.xz
manaverse-0c20db8d108c4123fcc3ecb343759e68567a4d4e.zip
Remove extra ; from different code.
Diffstat (limited to 'src/gui/widgets/tabs')
-rw-r--r--src/gui/widgets/tabs/chat/chattab.cpp4
-rw-r--r--src/gui/widgets/tabs/mapdebugtab.cpp2
-rw-r--r--src/gui/widgets/tabs/setup_audio.cpp4
-rw-r--r--src/gui/widgets/tabs/setup_input.cpp12
-rw-r--r--src/gui/widgets/tabs/setup_joystick.cpp2
-rw-r--r--src/gui/widgets/tabs/setup_misc.cpp8
-rw-r--r--src/gui/widgets/tabs/setup_perfomance.cpp4
-rw-r--r--src/gui/widgets/tabs/setup_players.cpp6
-rw-r--r--src/gui/widgets/tabs/setup_quick.cpp4
-rw-r--r--src/gui/widgets/tabs/setup_relations.cpp2
-rw-r--r--src/gui/widgets/tabs/setup_theme.cpp16
-rw-r--r--src/gui/widgets/tabs/setup_touch.cpp6
-rw-r--r--src/gui/widgets/tabs/setup_video.cpp8
-rw-r--r--src/gui/widgets/tabs/setup_visual.cpp12
-rw-r--r--src/gui/widgets/tabs/setuptabscroll.cpp2
-rw-r--r--src/gui/widgets/tabs/socialattacktab.h6
-rw-r--r--src/gui/widgets/tabs/socialpickuptab.h4
-rw-r--r--src/gui/widgets/tabs/socialtabbase.h2
-rw-r--r--src/gui/widgets/tabs/tab.cpp4
19 files changed, 54 insertions, 54 deletions
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()