summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-12-31 20:25:43 +0300
committerAndrei Karas <akaras@inbox.ru>2013-12-31 20:25:43 +0300
commit7e5386bc62f1f61d3409219292e1ec0d71cbd28e (patch)
tree3e4233abac1d52ff1103bdd8b4747a4e91b5f575 /src/gui
parent62879acf891f1939e16fa32d2426b56f08f1609b (diff)
downloadplus-7e5386bc62f1f61d3409219292e1ec0d71cbd28e.tar.gz
plus-7e5386bc62f1f61d3409219292e1ec0d71cbd28e.tar.bz2
plus-7e5386bc62f1f61d3409219292e1ec0d71cbd28e.tar.xz
plus-7e5386bc62f1f61d3409219292e1ec0d71cbd28e.zip
fix code style.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/popups/speechbubble.cpp1
-rw-r--r--src/gui/sdlfont.cpp6
-rw-r--r--src/gui/widgets/progressbar.cpp1
-rw-r--r--src/gui/widgets/progressbar.h2
-rw-r--r--src/gui/widgets/windowcontainer.cpp2
5 files changed, 4 insertions, 8 deletions
diff --git a/src/gui/popups/speechbubble.cpp b/src/gui/popups/speechbubble.cpp
index f1c7c0b9c..3b7a52e34 100644
--- a/src/gui/popups/speechbubble.cpp
+++ b/src/gui/popups/speechbubble.cpp
@@ -29,7 +29,6 @@
#include "gui/widgets/browserbox.h"
#include "gui/widgets/label.h"
#include "gui/widgets/textbox.h"
-#include "gui/widgets/windowcontainer.h"
#include <guichan/font.hpp>
diff --git a/src/gui/sdlfont.cpp b/src/gui/sdlfont.cpp
index 742f3d9aa..c1b090171 100644
--- a/src/gui/sdlfont.cpp
+++ b/src/gui/sdlfont.cpp
@@ -398,15 +398,15 @@ SDLFont::~SDLFont()
TTF_Font *SDLFont::openFont(const char *const name, const int size)
{
// disabled for now because some systems like gentoo cant use it
-//#ifdef USE_SDL2
+// #ifdef USE_SDL2
// SDL_RWops *const rw = MPHYSFSRWOPS_openRead(name);
// if (!rw)
// return nullptr;
// return TTF_OpenFontIndexRW(rw, 1, size, 0);
-//#else
+// #else
return TTF_OpenFontIndex(ResourceManager::getInstance()->getPath(
name).c_str(), size, 0);
-//#endif
+// #endif
}
void SDLFont::loadFont(std::string filename,
diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp
index eddbfe2db..35c270084 100644
--- a/src/gui/widgets/progressbar.cpp
+++ b/src/gui/widgets/progressbar.cpp
@@ -44,7 +44,6 @@ ProgressBar::ProgressBar(const Widget2 *const widget, float progress,
gcn::WidgetListener(),
mFillRect(),
mSkin(nullptr),
- mSkinFill(nullptr),
mProgress(progress),
mProgressToGo(progress),
mBackgroundColor(Theme::getProgressColor(backColor >= 0
diff --git a/src/gui/widgets/progressbar.h b/src/gui/widgets/progressbar.h
index 9b2ab353a..10ebbbd01 100644
--- a/src/gui/widgets/progressbar.h
+++ b/src/gui/widgets/progressbar.h
@@ -32,7 +32,6 @@
#include "localconsts.h"
-class Graphics;
class ImageCollection;
class Skin;
@@ -142,7 +141,6 @@ class ProgressBar final : public gcn::Widget,
private:
ImageRect mFillRect;
Skin *mSkin;
- Skin *mSkinFill;
float mProgress;
float mProgressToGo;
diff --git a/src/gui/widgets/windowcontainer.cpp b/src/gui/widgets/windowcontainer.cpp
index d420e1183..723746ab9 100644
--- a/src/gui/widgets/windowcontainer.cpp
+++ b/src/gui/widgets/windowcontainer.cpp
@@ -61,7 +61,7 @@ void WindowContainer::adjustAfterResize(const int oldScreenWidth,
void WindowContainer::moveWidgetAfter(gcn::Widget *const after,
gcn::Widget *const widget)
{
- WidgetListIterator widgetIter = std::find(
+ const WidgetListIterator widgetIter = std::find(
mWidgets.begin(), mWidgets.end(), widget);
if (widgetIter == mWidgets.end())