summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-10-25 16:33:34 +0300
committerAndrei Karas <akaras@inbox.ru>2013-10-25 16:33:34 +0300
commit5455acfb5204b2407e560db91994c2b283bec025 (patch)
tree02053520543b387bde15b6ced61420751f3e2093
parent81024f23d9bb0329dcf293455405fefa1dcd67a0 (diff)
downloadmanaplus-5455acfb5204b2407e560db91994c2b283bec025.tar.gz
manaplus-5455acfb5204b2407e560db91994c2b283bec025.tar.bz2
manaplus-5455acfb5204b2407e560db91994c2b283bec025.tar.xz
manaplus-5455acfb5204b2407e560db91994c2b283bec025.zip
fix code style.
-rw-r--r--src/gui/windows/editserverdialog.h3
-rw-r--r--src/net/ea/inventoryhandler.h3
-rw-r--r--src/net/ea/loginhandler.h3
-rw-r--r--src/render/normalopenglgraphics.h9
-rw-r--r--src/render/safeopenglgraphics.h9
-rw-r--r--src/render/sdl2graphics.h3
-rw-r--r--src/resources/sdlimagehelper.h3
7 files changed, 22 insertions, 11 deletions
diff --git a/src/gui/windows/editserverdialog.h b/src/gui/windows/editserverdialog.h
index 43a7c20c0..8d519af33 100644
--- a/src/gui/windows/editserverdialog.h
+++ b/src/gui/windows/editserverdialog.h
@@ -65,7 +65,8 @@ class TypeListModel : public gcn::ListModel
/**
* Used to get an element from the list
*/
- std::string getElementAt(int elementIndex) override final A_WARN_UNUSED;
+ std::string getElementAt(int elementIndex)
+ override final A_WARN_UNUSED;
};
/**
diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h
index d2b579301..fa0164c00 100644
--- a/src/net/ea/inventoryhandler.h
+++ b/src/net/ea/inventoryhandler.h
@@ -152,7 +152,8 @@ class InventoryHandler : public Net::InventoryHandler
void clear();
- bool canSplit(const Item *const item) const override final A_WARN_UNUSED;
+ bool canSplit(const Item *const item) const
+ override final A_WARN_UNUSED;
void splitItem(const Item *const item,
const int amount) const override final;
diff --git a/src/net/ea/loginhandler.h b/src/net/ea/loginhandler.h
index a0d6ad288..4659c65c2 100644
--- a/src/net/ea/loginhandler.h
+++ b/src/net/ea/loginhandler.h
@@ -45,7 +45,8 @@ class LoginHandler : public Net::LoginHandler
int supportedOptionalActions() const override A_WARN_UNUSED
{ return SetGenderOnRegister; }
- virtual bool isRegistrationEnabled() const override final A_WARN_UNUSED;
+ virtual bool isRegistrationEnabled() const
+ override final A_WARN_UNUSED;
virtual void getRegistrationDetails() const override final;
diff --git a/src/render/normalopenglgraphics.h b/src/render/normalopenglgraphics.h
index f679a915e..f59e02880 100644
--- a/src/render/normalopenglgraphics.h
+++ b/src/render/normalopenglgraphics.h
@@ -56,9 +56,12 @@ class NormalOpenGLGraphics final : public Graphics
~NormalOpenGLGraphics();
- bool setVideoMode(const int w, const int h, const int bpp,
- const bool fs, const bool hwaccel,
- const bool resize, const bool noFrame) override final;
+ bool setVideoMode(const int w, const int h,
+ const int bpp,
+ const bool fs,
+ const bool hwaccel,
+ const bool resize,
+ const bool noFrame) override final;
/**
diff --git a/src/render/safeopenglgraphics.h b/src/render/safeopenglgraphics.h
index 4e9366bf5..773657261 100644
--- a/src/render/safeopenglgraphics.h
+++ b/src/render/safeopenglgraphics.h
@@ -50,9 +50,12 @@ class SafeOpenGLGraphics final : public Graphics
~SafeOpenGLGraphics();
- bool setVideoMode(const int w, const int h, const int bpp,
- const bool fs, const bool hwaccel,
- const bool resize, const bool noFrame) override final;
+ bool setVideoMode(const int w, const int h,
+ const int bpp,
+ const bool fs,
+ const bool hwaccel,
+ const bool resize,
+ const bool noFrame) override final;
/**
* Draws a resclaled version of the image
diff --git a/src/render/sdl2graphics.h b/src/render/sdl2graphics.h
index c35e1067e..0e1801b0e 100644
--- a/src/render/sdl2graphics.h
+++ b/src/render/sdl2graphics.h
@@ -67,7 +67,8 @@ class SDLGraphics : public Graphics
const int width, const int height,
const int desiredWidth,
const int desiredHeight,
- const bool useColor = false) override final;
+ const bool useColor = false)
+ override final;
virtual void drawImagePattern(const Image *const image,
const int x, const int y,
diff --git a/src/resources/sdlimagehelper.h b/src/resources/sdlimagehelper.h
index f7bd4b3c2..9534f8362 100644
--- a/src/resources/sdlimagehelper.h
+++ b/src/resources/sdlimagehelper.h
@@ -67,7 +67,8 @@ class SDLImageHelper final : public ImageHelper
/**
* Loads an image from an SDL surface.
*/
- Image *load(SDL_Surface *const tmpImage) const override final A_WARN_UNUSED;
+ Image *load(SDL_Surface *const tmpImage) const
+ override final A_WARN_UNUSED;
Image *createTextSurface(SDL_Surface *const tmpImage,
const int width, const int height,