diff options
author | Andrei Karas <akaras@inbox.ru> | 2012-02-08 00:49:41 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2012-02-08 00:49:41 +0300 |
commit | ff5e17ff14a78af31d9d23cd1dfdb5404f9a8fa9 (patch) | |
tree | 51a99a43eba0b09ca9e5f554b3676d0308685797 /src/guichan | |
parent | 538261b13990ee02bbc62d9704233885b15cee04 (diff) | |
download | manaverse-ff5e17ff14a78af31d9d23cd1dfdb5404f9a8fa9.tar.gz manaverse-ff5e17ff14a78af31d9d23cd1dfdb5404f9a8fa9.tar.bz2 manaverse-ff5e17ff14a78af31d9d23cd1dfdb5404f9a8fa9.tar.xz manaverse-ff5e17ff14a78af31d9d23cd1dfdb5404f9a8fa9.zip |
Fix code style with new tool.
Diffstat (limited to 'src/guichan')
-rw-r--r-- | src/guichan/actionevent.cpp | 1 | ||||
-rw-r--r-- | src/guichan/event.cpp | 1 | ||||
-rw-r--r-- | src/guichan/include/guichan/actionevent.hpp | 1 | ||||
-rw-r--r-- | src/guichan/include/guichan/color.hpp | 2 | ||||
-rw-r--r-- | src/guichan/include/guichan/gui.hpp | 9 | ||||
-rw-r--r-- | src/guichan/include/guichan/sdl/sdlpixel.hpp | 6 | ||||
-rw-r--r-- | src/guichan/keyinput.cpp | 1 | ||||
-rw-r--r-- | src/guichan/sdl/sdlgraphics.cpp | 4 | ||||
-rw-r--r-- | src/guichan/selectionevent.cpp | 1 | ||||
-rw-r--r-- | src/guichan/widgets/checkbox.cpp | 1 | ||||
-rw-r--r-- | src/guichan/widgets/dropdown.cpp | 1 | ||||
-rw-r--r-- | src/guichan/widgets/icon.cpp | 18 | ||||
-rw-r--r-- | src/guichan/widgets/tab.cpp | 1 |
13 files changed, 22 insertions, 25 deletions
diff --git a/src/guichan/actionevent.cpp b/src/guichan/actionevent.cpp index a91c6dec0..7348587d7 100644 --- a/src/guichan/actionevent.cpp +++ b/src/guichan/actionevent.cpp @@ -69,4 +69,3 @@ namespace gcn return mId; } } - diff --git a/src/guichan/event.cpp b/src/guichan/event.cpp index 691240d11..5983af7e7 100644 --- a/src/guichan/event.cpp +++ b/src/guichan/event.cpp @@ -68,4 +68,3 @@ namespace gcn return mSource; } } - diff --git a/src/guichan/include/guichan/actionevent.hpp b/src/guichan/include/guichan/actionevent.hpp index 96a2d1364..a6c54f516 100644 --- a/src/guichan/include/guichan/actionevent.hpp +++ b/src/guichan/include/guichan/actionevent.hpp @@ -112,4 +112,3 @@ namespace gcn } #endif // GCN_ACTIONEVENT_HPP - diff --git a/src/guichan/include/guichan/color.hpp b/src/guichan/include/guichan/color.hpp index a051c3569..6f0cfc1ff 100644 --- a/src/guichan/include/guichan/color.hpp +++ b/src/guichan/include/guichan/color.hpp @@ -139,7 +139,7 @@ namespace gcn */ bool operator!=(const Color& color) const; - /** + /** * Output operator for output. * * @param out The stream to output to. diff --git a/src/guichan/include/guichan/gui.hpp b/src/guichan/include/guichan/gui.hpp index d8c9c7555..b2be75141 100644 --- a/src/guichan/include/guichan/gui.hpp +++ b/src/guichan/include/guichan/gui.hpp @@ -65,10 +65,15 @@ namespace gcn /** * @mainpage * @section Introduction - * This documentation is mostly intended as a reference to the API. If you want to get started with Guichan, we suggest you check out the programs in the examples directory of the Guichan release. + * This documentation is mostly intended as a reference to the API. + * If you want to get started with Guichan, we suggest you check out + * the programs in the examples directory of the Guichan release. * @n * @n - * This documentation is, and will always be, work in progress. If you find any errors, typos or inconsistencies, or if you feel something needs to be explained in more detail - don't hesitate to tell us. + * This documentation is, and will always be, work in progress. + * If you find any errors, typos or inconsistencies, or if you feel + * something needs to be explained in more detail - don't hesitate to + * tell us. */ /** diff --git a/src/guichan/include/guichan/sdl/sdlpixel.hpp b/src/guichan/include/guichan/sdl/sdlpixel.hpp index 663c2059d..a0221ca7c 100644 --- a/src/guichan/include/guichan/sdl/sdlpixel.hpp +++ b/src/guichan/include/guichan/sdl/sdlpixel.hpp @@ -72,7 +72,7 @@ namespace gcn unsigned int color = 0; - switch(bpp) + switch (bpp) { case 1: color = *p; @@ -127,7 +127,7 @@ namespace gcn Uint32 pixel = SDL_MapRGB(surface->format, color.r, color.g, color.b); - switch(bpp) + switch (bpp) { case 1: *p = pixel; @@ -234,7 +234,7 @@ namespace gcn Uint32 pixel = SDL_MapRGB(surface->format, color.r, color.g, color.b); - switch(bpp) + switch (bpp) { case 1: *p = pixel; diff --git a/src/guichan/keyinput.cpp b/src/guichan/keyinput.cpp index 3f5ebc124..35e8b6168 100644 --- a/src/guichan/keyinput.cpp +++ b/src/guichan/keyinput.cpp @@ -134,4 +134,3 @@ namespace gcn mNumericPad = numpad; } } - diff --git a/src/guichan/sdl/sdlgraphics.cpp b/src/guichan/sdl/sdlgraphics.cpp index 79c65da9f..c8cec6370 100644 --- a/src/guichan/sdl/sdlgraphics.cpp +++ b/src/guichan/sdl/sdlgraphics.cpp @@ -289,7 +289,7 @@ namespace gcn mColor.r, mColor.g, mColor.b); - switch(bpp) + switch (bpp) { case 1: for (; x1 <= x2; ++x1) @@ -400,7 +400,7 @@ namespace gcn Uint32 pixel = SDL_MapRGB(mTarget->format, mColor.r, mColor.g, mColor.b); - switch(bpp) + switch (bpp) { case 1: for (; y1 <= y2; ++y1) diff --git a/src/guichan/selectionevent.cpp b/src/guichan/selectionevent.cpp index 784252230..8c8a3f28f 100644 --- a/src/guichan/selectionevent.cpp +++ b/src/guichan/selectionevent.cpp @@ -63,4 +63,3 @@ namespace gcn } } - diff --git a/src/guichan/widgets/checkbox.cpp b/src/guichan/widgets/checkbox.cpp index ab0b19e00..c7ec3e1e0 100644 --- a/src/guichan/widgets/checkbox.cpp +++ b/src/guichan/widgets/checkbox.cpp @@ -138,4 +138,3 @@ namespace gcn distributeActionEvent(); } } - diff --git a/src/guichan/widgets/dropdown.cpp b/src/guichan/widgets/dropdown.cpp index 40abaf41f..ead4e7815 100644 --- a/src/guichan/widgets/dropdown.cpp +++ b/src/guichan/widgets/dropdown.cpp @@ -422,4 +422,3 @@ namespace gcn } } } - diff --git a/src/guichan/widgets/icon.cpp b/src/guichan/widgets/icon.cpp index c85ada7c3..dca3400ba 100644 --- a/src/guichan/widgets/icon.cpp +++ b/src/guichan/widgets/icon.cpp @@ -56,16 +56,16 @@ namespace gcn { - Icon::Icon() - : mImage(nullptr) - , mInternalImage(false) + Icon::Icon() : + mImage(nullptr), + mInternalImage(false) { setSize(0, 0); } - Icon::Icon(const std::string& filename) - : mImage(nullptr), - mInternalImage(false) + Icon::Icon(const std::string& filename) : + mImage(nullptr), + mInternalImage(false) { mImage = Image::load(filename); mInternalImage = true; @@ -73,9 +73,9 @@ namespace gcn mImage->getHeight()); } - Icon::Icon(const Image* image) - : mImage(image), - mInternalImage(false) + Icon::Icon(const Image* image) : + mImage(image), + mInternalImage(false) { setSize(mImage->getWidth(), mImage->getHeight()); diff --git a/src/guichan/widgets/tab.cpp b/src/guichan/widgets/tab.cpp index 96a347607..8afc248c5 100644 --- a/src/guichan/widgets/tab.cpp +++ b/src/guichan/widgets/tab.cpp @@ -116,4 +116,3 @@ namespace gcn mHasMouse = false; } } - |