summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-11-29 15:35:14 +0300
committerAndrei Karas <akaras@inbox.ru>2015-11-29 15:35:14 +0300
commita7e43b872137aabb8b0c92037ae69a4555948fe7 (patch)
treecade6b80a4900ccb3396102ce8e22cd1159158dd /src/gui
parentba2ad8131522e3bba0570580fdee3d5f3e0b7ffa (diff)
downloadmanaverse-a7e43b872137aabb8b0c92037ae69a4555948fe7.tar.gz
manaverse-a7e43b872137aabb8b0c92037ae69a4555948fe7.tar.bz2
manaverse-a7e43b872137aabb8b0c92037ae69a4555948fe7.tar.xz
manaverse-a7e43b872137aabb8b0c92037ae69a4555948fe7.zip
Fix code style.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/popups/popupmenu.cpp2
-rw-r--r--src/gui/windows/textselectdialog.cpp5
-rw-r--r--src/gui/windows/textselectdialog.h11
3 files changed, 6 insertions, 12 deletions
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index a5228e672..10712d354 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -2241,7 +2241,7 @@ void PopupMenu::showSkillPopup(const SkillInfo *const info)
// using mItemId as skill id
mItemId = info->id;
mBrowserBox->clearRows();
- for(int f = 1; f <= info->level; f ++)
+ for (int f = 1; f <= info->level; f ++)
{
mBrowserBox->addRow(strprintf("/selectskilllevel %d %d", mItemId, f),
// TRANSLATORS: popup menu item
diff --git a/src/gui/windows/textselectdialog.cpp b/src/gui/windows/textselectdialog.cpp
index 7f6de8617..9db45d7c7 100644
--- a/src/gui/windows/textselectdialog.cpp
+++ b/src/gui/windows/textselectdialog.cpp
@@ -29,7 +29,6 @@
#include "gui/widgets/button.h"
#include "gui/widgets/containerplacer.h"
#include "gui/widgets/createwidget.h"
-#include "gui/widgets/label.h"
#include "gui/widgets/layout.h"
#include "gui/widgets/layouttype.h"
#include "gui/widgets/listbox.h"
@@ -37,7 +36,6 @@
#include "utils/delete2.h"
#include "utils/gettext.h"
-#include "utils/stringutils.h"
#include "debug.h"
@@ -53,7 +51,8 @@ TextSelectDialog::TextSelectDialog(const std::string &name,
mQuitButton(nullptr),
mItemList(nullptr),
mScrollArea(nullptr),
- mModel(nullptr)
+ mModel(nullptr),
+ mTag(0)
{
}
diff --git a/src/gui/windows/textselectdialog.h b/src/gui/windows/textselectdialog.h
index 86a834d2e..10c49e7b8 100644
--- a/src/gui/windows/textselectdialog.h
+++ b/src/gui/windows/textselectdialog.h
@@ -20,10 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef GUI_WIDGETS_TEXTSELECTDIALOG_H
-#define GUI_WIDGETS_TEXTSELECTDIALOG_H
-
-#include "enums/simpletypes/itemcolor.h"
+#ifndef GUI_WINDOWS_TEXTSELECTDIALOG_H
+#define GUI_WINDOWS_TEXTSELECTDIALOG_H
#include "gui/widgets/window.h"
@@ -31,10 +29,7 @@
#include "listeners/selectionlistener.h"
class Button;
-class Item;
-class Label;
class ScrollArea;
-class ShopItem;
class NamesModel;
class ListBox;
@@ -102,4 +97,4 @@ class TextSelectDialog notfinal : public Window,
int mTag;
};
-#endif // GUI_WIDGETS_TEXTSELECTDIALOG_H
+#endif // GUI_WINDOWS_TEXTSELECTDIALOG_H