summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-01-11 21:49:16 +0300
committerAndrei Karas <akaras@inbox.ru>2015-01-11 21:49:16 +0300
commit5b4e74ab44a2ae4eab9db71c860885802e2ba28d (patch)
tree065e1c4a5c5639b77789e7cf51ca25efeeb7e86a /src/gui
parentac12efd17d9f719b083d8af1eb5a06853835e8d6 (diff)
downloadmv-5b4e74ab44a2ae4eab9db71c860885802e2ba28d.tar.gz
mv-5b4e74ab44a2ae4eab9db71c860885802e2ba28d.tar.bz2
mv-5b4e74ab44a2ae4eab9db71c860885802e2ba28d.tar.xz
mv-5b4e74ab44a2ae4eab9db71c860885802e2ba28d.zip
Fix code style.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/windows/charcreatedialog.cpp5
-rw-r--r--src/gui/windows/charcreatedialog.h1
-rw-r--r--src/gui/windows/chatwindow.h2
-rw-r--r--src/gui/windows/updaterwindow.cpp3
4 files changed, 5 insertions, 6 deletions
diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp
index fe22b0317..1452433d6 100644
--- a/src/gui/windows/charcreatedialog.cpp
+++ b/src/gui/windows/charcreatedialog.cpp
@@ -35,7 +35,6 @@
#include "gui/windows/charselectdialog.h"
#include "gui/widgets/label.h"
#include "gui/widgets/playerbox.h"
-#include "gui/widgets/radiobutton.h"
#include "gui/widgets/slider.h"
#include "gui/widgets/tabstrip.h"
#include "gui/widgets/textfield.h"
@@ -216,7 +215,9 @@ CharCreateDialog::CharCreateDialog(CharSelectDialog *const parent,
if (serverFeatures->haveCreateCharGender())
{
const int size = config.getIntValue("fontSize");
- mGenderStrip = new TabStrip(this, "gender_" + getWindowName(), size + 16);
+ mGenderStrip = new TabStrip(this,
+ "gender_" + getWindowName(),
+ size + 16);
mGenderStrip->setPressFirst(false);
mGenderStrip->addActionListener(this);
mGenderStrip->setActionEventId("gender_");
diff --git a/src/gui/windows/charcreatedialog.h b/src/gui/windows/charcreatedialog.h
index d179982ad..ed1a8fcf3 100644
--- a/src/gui/windows/charcreatedialog.h
+++ b/src/gui/windows/charcreatedialog.h
@@ -35,7 +35,6 @@ class Button;
class CharSelectDialog;
class Label;
class PlayerBox;
-class RadioButton;
class Slider;
class TabStrip;
class TextField;
diff --git a/src/gui/windows/chatwindow.h b/src/gui/windows/chatwindow.h
index df8ba8b06..d0af5a74c 100644
--- a/src/gui/windows/chatwindow.h
+++ b/src/gui/windows/chatwindow.h
@@ -23,8 +23,6 @@
#ifndef GUI_WINDOWS_CHATWINDOW_H
#define GUI_WINDOWS_CHATWINDOW_H
-#include "enums/being/beingdirection.h"
-
#include "enums/gui/chatmsgtype.h"
#include "gui/widgets/window.h"
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index 37f0f283f..30477821e 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -1045,7 +1045,8 @@ bool UpdaterWindow::validateFile(const std::string &filePath,
unsigned long UpdaterWindow::getFileHash(const std::string &filePath)
{
int size = 0;
- const char *const buf = static_cast<const char*>(PhysFs::loadFile(filePath, size));
+ const char *const buf = static_cast<const char*>(
+ PhysFs::loadFile(filePath, size));
if (!buf)
return 0;
return Net::Download::adlerBuffer(buf, size);