summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/actormanager.cpp4
-rw-r--r--src/events/actionevent.h2
-rw-r--r--src/events/inputguievent.h10
-rw-r--r--src/events/keyevent.h2
-rw-r--r--src/events/mouseevent.h8
-rw-r--r--src/gui/cliprect.h2
-rw-r--r--src/gui/color.h4
-rw-r--r--src/gui/gui.h10
-rw-r--r--src/gui/models/listmodel.h8
-rw-r--r--src/gui/models/shopitems.h2
-rw-r--r--src/gui/widgets/basiccontainer.h2
-rw-r--r--src/gui/widgets/basiccontainer2.h4
-rw-r--r--src/gui/widgets/icon.h2
-rw-r--r--src/gui/widgets/label.cpp2
-rw-r--r--src/gui/widgets/label.h2
-rw-r--r--src/gui/widgets/scrollarea.h2
-rw-r--r--src/gui/widgets/textbox.h2
-rw-r--r--src/gui/widgets/widget.h62
-rw-r--r--src/gui/widgets/window.h6
-rw-r--r--src/input/key.h2
-rw-r--r--src/input/mouseinput.h8
-rw-r--r--src/input/touch/multitouchmanager.h1
-rw-r--r--src/listeners/focuslistener.h4
-rw-r--r--src/test/testlauncher.cpp2
24 files changed, 75 insertions, 78 deletions
diff --git a/src/actormanager.cpp b/src/actormanager.cpp
index f02ddd30a..7239aca1e 100644
--- a/src/actormanager.cpp
+++ b/src/actormanager.cpp
@@ -66,10 +66,10 @@
#include "debug.h"
#define for_actors for (ActorSpritesConstIterator it = mActors.begin(), \
- it_fend = mActors.end() ; it != it_fend; ++it)
+ it_fend = mActors.end(); it != it_fend; ++it)
#define for_actorsm for (ActorSpritesIterator it = mActors.begin(), \
- it_fend = mActors.end() ; it != it_fend; ++it)
+ it_fend = mActors.end(); it != it_fend; ++it)
ActorManager *actorManager = nullptr;
diff --git a/src/events/actionevent.h b/src/events/actionevent.h
index df49d6325..3639e6294 100644
--- a/src/events/actionevent.h
+++ b/src/events/actionevent.h
@@ -84,7 +84,7 @@ class Widget;
* Any object can listen for actions from widgets by implementing
* the ActionListener interface.
*
- * If you have implement a widget of your own it's a good idea to
+ * If you have implement a widget of your own it's a good idea to
* let the widget fire action events whenever you feel an action
* has occured so action listeners of the widget can be informed
* of the state of the widget.
diff --git a/src/events/inputguievent.h b/src/events/inputguievent.h
index 282cfbc54..ea5b735b1 100644
--- a/src/events/inputguievent.h
+++ b/src/events/inputguievent.h
@@ -89,9 +89,9 @@ class InputGuiEvent: public Event
/**
* Marks the event as consumed. Input event listeners may discard
* consumed input or act on consumed input. An example of a widget
- * that discards consumed input is the ScrollArea widget that
- * discards consumed mouse wheel events so the ScrollArea will not
- * scroll if for instance a Slider's value inside the ScrollArea was
+ * that discards consumed input is the ScrollArea widget that
+ * discards consumed mouse wheel events so the ScrollArea will not
+ * scroll if for instance a Slider's value inside the ScrollArea was
* changed with the mouse wheel.
*
* @see isConsumed
@@ -102,7 +102,7 @@ class InputGuiEvent: public Event
/**
* Checks if the input event is consumed.
*
- * @return True if the input event is consumed,
+ * @return True if the input event is consumed,
* false otherwise.
* @see consume
*/
@@ -111,7 +111,7 @@ class InputGuiEvent: public Event
protected:
/**
- * True if the input event is consumed,
+ * True if the input event is consumed,
* false otherwise.
*/
bool mIsConsumed;
diff --git a/src/events/keyevent.h b/src/events/keyevent.h
index 1c165d10f..a131a753e 100644
--- a/src/events/keyevent.h
+++ b/src/events/keyevent.h
@@ -139,7 +139,7 @@ class KeyEvent: public InputGuiEvent
#endif
protected:
- /**
+ /**
* Holds the key of the key event.
*/
Key mKey;
diff --git a/src/events/mouseevent.h b/src/events/mouseevent.h
index 9068440ff..c2f1d93cd 100644
--- a/src/events/mouseevent.h
+++ b/src/events/mouseevent.h
@@ -115,7 +115,7 @@ class MouseEvent: public InputGuiEvent
{ return mButton; }
/**
- * Gets the x coordinate of the mouse event.
+ * Gets the x coordinate of the mouse event.
* The coordinate relative to widget the mouse listener
* receiving the events have registered to.
*
@@ -126,7 +126,7 @@ class MouseEvent: public InputGuiEvent
{ return mX; }
/**
- * Gets the y coordinate of the mouse event.
+ * Gets the y coordinate of the mouse event.
* The coordinate relative to widget the mouse listener
* receiving the events have registered to.
*
@@ -191,8 +191,8 @@ class MouseEvent: public InputGuiEvent
* the protected member variables of this class and at the same time
* keep the MouseEvent class as const as possible. Gui needs to
* update the x och y coordinates for the coordinates to be relative
- * to widget the mouse listener receiving the events have registered
- * to.
+ * to widget the mouse listener receiving the events have registered
+ * to.
*/
friend class Gui;
};
diff --git a/src/gui/cliprect.h b/src/gui/cliprect.h
index fac68a933..6642dec22 100644
--- a/src/gui/cliprect.h
+++ b/src/gui/cliprect.h
@@ -70,7 +70,7 @@
/**
* A rectangle used when dealing with clipping. A clip rectangle is
- * a regular rectangle extended with variables for x offsets and y
+ * a regular rectangle extended with variables for x offsets and y
* offsets. The offsets are used for calculations from relative
* screen coordinates to actual screen coordinates.
*/
diff --git a/src/gui/color.h b/src/gui/color.h
index 3c5673487..ffcf93ce6 100644
--- a/src/gui/color.h
+++ b/src/gui/color.h
@@ -78,7 +78,7 @@ class Color final
Color();
/**
- * Constructor. Constructs a color from the bytes in an integer.
+ * Constructor. Constructs a color from the bytes in an integer.
* Call it with a hexadecimal constant for HTML-style color
* representation.
* The alpha component is 255 by default.
@@ -108,7 +108,7 @@ class Color final
/**
* Adds the RGB values of two colors together. The values will be
- * clamped if they go out of range.
+ * clamped if they go out of range.
*
* WARNING: This function will reset the alpha value of the
* returned color to 255.
diff --git a/src/gui/gui.h b/src/gui/gui.h
index deb786b39..c27d7e8a8 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -253,7 +253,7 @@ class Gui final
* Sets the graphics object to use for drawing.
*
* @param graphics The graphics object to use for drawing.
- * @see getGraphics, AllegroGraphics, HGEGraphics,
+ * @see getGraphics, AllegroGraphics, HGEGraphics,
* OpenLayerGraphics, OpenGLGraphics, SDLGraphics
* @since 0.1.0
*/
@@ -264,7 +264,7 @@ class Gui final
*
* @return The graphics object used for drawing. NULL if no
* graphics object has been set.
- * @see setGraphics, AllegroGraphics, HGEGraphics,
+ * @see setGraphics, AllegroGraphics, HGEGraphics,
* OpenLayerGraphics, OpenGLGraphics, SDLGraphics
* @since 0.1.0
*/
@@ -395,8 +395,8 @@ class Gui final
void distributeKeyEventToGlobalKeyListeners(KeyEvent& event);
/**
- * Handles modal mouse input focus. Modal mouse input focus needs
- * to be checked at each logic iteration as it might be necessary to
+ * Handles modal mouse input focus. Modal mouse input focus needs
+ * to be checked at each logic iteration as it might be necessary to
* distribute mouse entered or mouse exited events.
*
* @since 0.8.0
@@ -404,7 +404,7 @@ class Gui final
void handleModalMouseInputFocus();
/**
- * Handles modal focus. Modal focus needs to be checked at
+ * Handles modal focus. Modal focus needs to be checked at
* each logic iteration as it might be necessary to distribute
* mouse entered or mouse exited events.
*
diff --git a/src/gui/models/listmodel.h b/src/gui/models/listmodel.h
index 4b72f7b87..77a2162e7 100644
--- a/src/gui/models/listmodel.h
+++ b/src/gui/models/listmodel.h
@@ -69,10 +69,10 @@
#include "localconsts.h"
/**
- * An interface for a model that represents a list. It is
- * used in certain widgets, like the ListBox, to handle a
- * lists with string elements. If you want to use widgets
- * like ListBox, make a derived class from this class that
+ * An interface for a model that represents a list. It is
+ * used in certain widgets, like the ListBox, to handle a
+ * lists with string elements. If you want to use widgets
+ * like ListBox, make a derived class from this class that
* represents your list.
*/
class ListModel notfinal
diff --git a/src/gui/models/shopitems.h b/src/gui/models/shopitems.h
index 0aedce83f..e9b1a922d 100644
--- a/src/gui/models/shopitems.h
+++ b/src/gui/models/shopitems.h
@@ -145,7 +145,7 @@ class ShopItems final : public ListModel
/**
* Searches the current items in the shop for the specified
* id and returns the item if found, or 0 else.
- *
+ *
* @return the item found or 0
*/
ShopItem *findItem(const int id,
diff --git a/src/gui/widgets/basiccontainer.h b/src/gui/widgets/basiccontainer.h
index a6420db67..f4981f1b7 100644
--- a/src/gui/widgets/basiccontainer.h
+++ b/src/gui/widgets/basiccontainer.h
@@ -70,7 +70,7 @@
/**
* A base class for containers. The class implements the most
- * common things for a container. If you are implementing a
+ * common things for a container. If you are implementing a
* container, consider inheriting from this class.
*
* @see Container
diff --git a/src/gui/widgets/basiccontainer2.h b/src/gui/widgets/basiccontainer2.h
index e7cba01d6..f08592ed3 100644
--- a/src/gui/widgets/basiccontainer2.h
+++ b/src/gui/widgets/basiccontainer2.h
@@ -67,8 +67,8 @@
#include "gui/widgets/basiccontainer.h"
/**
- * An implementation of a container able to contain other widgets. A widget's
- * position in the container is relative to the container itself and not the screen.
+ * An implementation of a container able to contain other widgets. A widget's
+ * position in the container is relative to the container itself and not the screen.
* A container is the most common widget to use as the Gui's top widget as makes the Gui
* able to contain more than one widget.
*
diff --git a/src/gui/widgets/icon.h b/src/gui/widgets/icon.h
index e630339d8..5e7d1564f 100644
--- a/src/gui/widgets/icon.h
+++ b/src/gui/widgets/icon.h
@@ -57,7 +57,7 @@ class Icon final : public Widget
~Icon();
- /**
+ /**
* Gets the current Image.
*/
Image *getImage() const A_WARN_UNUSED
diff --git a/src/gui/widgets/label.cpp b/src/gui/widgets/label.cpp
index 2f3ec268e..249534945 100644
--- a/src/gui/widgets/label.cpp
+++ b/src/gui/widgets/label.cpp
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2009 Aethyra Development Team
+ * Copyright (C) 2009 Aethyra Development Team
* Copyright (C) 2011-2016 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
diff --git a/src/gui/widgets/label.h b/src/gui/widgets/label.h
index 98c7cc6ac..9d6777b3b 100644
--- a/src/gui/widgets/label.h
+++ b/src/gui/widgets/label.h
@@ -1,6 +1,6 @@
/*
* The ManaPlus Client
- * Copyright (C) 2009 Aethyra Development Team
+ * Copyright (C) 2009 Aethyra Development Team
* Copyright (C) 2011-2016 The ManaPlus Developers
*
* This file is part of The ManaPlus Client.
diff --git a/src/gui/widgets/scrollarea.h b/src/gui/widgets/scrollarea.h
index cf02e0317..b33a5a392 100644
--- a/src/gui/widgets/scrollarea.h
+++ b/src/gui/widgets/scrollarea.h
@@ -337,7 +337,7 @@ class ScrollArea final : public BasicContainer,
* Sets the amount to scroll in pixels when the left scroll button is
* pushed.
*
- * @param amount The amount to scroll in pixels.
+ * @param amount The amount to scroll in pixels.
* @see getLeftButtonScrollAmount
*/
void setLeftButtonScrollAmount(const int amount)
diff --git a/src/gui/widgets/textbox.h b/src/gui/widgets/textbox.h
index 10a76c85d..355a2fb47 100644
--- a/src/gui/widgets/textbox.h
+++ b/src/gui/widgets/textbox.h
@@ -220,7 +220,7 @@ class TextBox final : public Widget,
/**
* Scrolls the text to the caret if the text box is in a scroll area.
- *
+ *
* @see ScrollArea
*/
void scrollToCaret();
diff --git a/src/gui/widgets/widget.h b/src/gui/widgets/widget.h
index 707b4dfb9..f4456518a 100644
--- a/src/gui/widgets/widget.h
+++ b/src/gui/widgets/widget.h
@@ -84,7 +84,7 @@ class MouseListener;
class WidgetListener;
/**
- * Abstract class for widgets of Guichan. It contains basic functions
+ * Abstract class for widgets of Guichan. It contains basic functions
* every widget should have.
*
* NOTE: Functions begining with underscore "_" should not
@@ -132,12 +132,12 @@ class Widget notfinal : public Widget2
* The frame is not considered a part of the widget, it only allows a frame
* to be drawn around the widget, thus a frame will never be included when
* calculating if a widget should receive events from user input. Also
- * a widget's frame will never be included when calculating a widget's
+ * a widget's frame will never be included when calculating a widget's
* position.
- *
- * The size of the frame is calculated using the widget's frame size.
- * If a widget has a frame size of 10 pixels than the area the drawFrame
- * function can draw to will be the size of the widget with an additional
+ *
+ * The size of the frame is calculated using the widget's frame size.
+ * If a widget has a frame size of 10 pixels than the area the drawFrame
+ * function can draw to will be the size of the widget with an additional
* extension of 10 pixels in each direction.
*
* An example when drawFrame is a useful function is if a widget needs
@@ -154,9 +154,9 @@ class Widget notfinal : public Widget2
{ }
/**
- * Sets the size of the widget's frame. The frame is not considered a part of
- * the widget, it only allows a frame to be drawn around the widget, thus a frame
- * will never be included when calculating if a widget should receive events
+ * Sets the size of the widget's frame. The frame is not considered a part of
+ * the widget, it only allows a frame to be drawn around the widget, thus a frame
+ * will never be included when calculating if a widget should receive events
* from user input. Also a widget's frame will never be included when calculating
* a widget's position.
*
@@ -171,9 +171,9 @@ class Widget notfinal : public Widget2
{ mFrameSize = frameSize; }
/**
- * Gets the size of the widget's frame. The frame is not considered a part of
- * the widget, it only allows a frame to be drawn around the widget, thus a frame
- * will never be included when calculating if a widget should receive events
+ * Gets the size of the widget's frame. The frame is not considered a part of
+ * the widget, it only allows a frame to be drawn around the widget, thus a frame
+ * will never be included when calculating if a widget should receive events
* from user input. Also a widget's frame will never be included when calculating
* a widget's position.
*
@@ -505,8 +505,8 @@ class Widget notfinal : public Widget2
{ return mFocusHandler; }
/**
- * Adds an action listener to the widget. When an action event
- * is fired by the widget the action listeners of the widget
+ * Adds an action listener to the widget. When an action event
+ * is fired by the widget the action listeners of the widget
* will get notified.
*
* @param actionListener The action listener to add.
@@ -525,8 +525,8 @@ class Widget notfinal : public Widget2
void removeActionListener(ActionListener *const actionListener);
/**
- * Adds a death listener to the widget. When a death event is
- * fired by the widget the death listeners of the widget will
+ * Adds a death listener to the widget. When a death event is
+ * fired by the widget the death listeners of the widget will
* get notified.
*
* @param deathListener The death listener to add.
@@ -545,8 +545,8 @@ class Widget notfinal : public Widget2
void removeDeathListener(WidgetDeathListener *const deathListener);
/**
- * Adds a mouse listener to the widget. When a mouse event is
- * fired by the widget the mouse listeners of the widget will
+ * Adds a mouse listener to the widget. When a mouse event is
+ * fired by the widget the mouse listeners of the widget will
* get notified.
*
* @param mouseListener The mouse listener to add.
@@ -565,8 +565,8 @@ class Widget notfinal : public Widget2
void removeMouseListener(MouseListener *const mouseListener);
/**
- * Adds a key listener to the widget. When a key event is
- * fired by the widget the key listeners of the widget will
+ * Adds a key listener to the widget. When a key event is
+ * fired by the widget the key listeners of the widget will
* get notified.
*
* @param keyListener The key listener to add.
@@ -585,8 +585,8 @@ class Widget notfinal : public Widget2
void removeKeyListener(KeyListener *const keyListener);
/**
- * Adds a focus listener to the widget. When a focus event is
- * fired by the widget the key listeners of the widget will
+ * Adds a focus listener to the widget. When a focus event is
+ * fired by the widget the key listeners of the widget will
* get notified.
*
* @param focusListener The focus listener to add.
@@ -605,8 +605,8 @@ class Widget notfinal : public Widget2
void removeFocusListener(FocusListener *const focusListener);
/**
- * Adds a widget listener to the widget. When a widget event is
- * fired by the widget the key listeners of the widget will
+ * Adds a widget listener to the widget. When a widget event is
+ * fired by the widget the key listeners of the widget will
* get notified.
*
* @param widgetListener The widget listener to add.
@@ -673,8 +673,8 @@ class Widget notfinal : public Widget2
{ mParent = parent; }
/**
- * Gets the font set for the widget. If no font has been set,
- * the global font will be returned. If no global font has been set,
+ * Gets the font set for the widget. If no font has been set,
+ * the global font will be returned. If no global font has been set,
* the default font will be returend.
*
* @return The font set for the widget.
@@ -693,7 +693,7 @@ class Widget notfinal : public Widget2
static void setGlobalFont(Font *const font);
/**
- * Sets the font for the widget. If NULL is passed, the global font
+ * Sets the font for the widget. If NULL is passed, the global font
* will be used.
*
* @param font The font to set for the widget.
@@ -944,7 +944,7 @@ class Widget notfinal : public Widget2
/**
* Focuses the next widget in the widget.
- *
+ *
* @see moveToBottom
* @since 0.1.0
*/
@@ -1110,7 +1110,7 @@ class Widget notfinal : public Widget2
*/
typedef std::list<ActionListener*> ActionListenerList;
- /**
+ /**
* Holds the action listeners of the widget.
*/
ActionListenerList mActionListeners;
@@ -1127,7 +1127,7 @@ class Widget notfinal : public Widget2
/**
* Holds the death listeners of the widget.
- */
+ */
WidgetDeathListenerList mDeathListeners;
/**
@@ -1214,7 +1214,7 @@ class Widget notfinal : public Widget2
*/
Font* mCurrentFont;
- /**
+ /**
* Holds the frame size of the widget.
*/
unsigned int mFrameSize;
diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h
index 06a0d3295..4fc38afa0 100644
--- a/src/gui/widgets/window.h
+++ b/src/gui/widgets/window.h
@@ -606,7 +606,7 @@ class Window notfinal : public BasicContainer2,
/**
* Holds the padding of the window.
- */
+ */
int mPadding;
/**
@@ -621,14 +621,14 @@ class Window notfinal : public BasicContainer2,
/**
* Holds a drag offset as an x coordinate where the drag of the window
- * started if the window is being dragged. It's used to move the window
+ * started if the window is being dragged. It's used to move the window
* correctly when dragged.
*/
int mDragOffsetX;
/**
* Holds a drag offset as an y coordinate where the drag of the window
- * started if the window is being dragged. It's used to move the window
+ * started if the window is being dragged. It's used to move the window
* correctly when dragged.
*/
int mDragOffsetY;
diff --git a/src/input/key.h b/src/input/key.h
index fe4438354..c0cc37b00 100644
--- a/src/input/key.h
+++ b/src/input/key.h
@@ -111,7 +111,7 @@ class Key final
bool isLetter() const A_WARN_UNUSED;
/**
- * Gets the value of the key. If an ascii value exists it
+ * Gets the value of the key. If an ascii value exists it
* will be returned. Otherwise an enum value will be returned.
*
* @return the value of the key.
diff --git a/src/input/mouseinput.h b/src/input/mouseinput.h
index 8470bc00d..7711381fa 100644
--- a/src/input/mouseinput.h
+++ b/src/input/mouseinput.h
@@ -169,18 +169,18 @@ class MouseInput final
*/
MouseButtonT mButton;
- /**
- * Holds the timestamp of the mouse input. Used to
+ /**
+ * Holds the timestamp of the mouse input. Used to
* check for double clicks.
*/
int mTimeStamp;
- /**
+ /**
* Holds the x coordinate of the mouse input.
*/
int mX;
- /**
+ /**
* Holds the y coordinate of the mouse input.
*/
int mY;
diff --git a/src/input/touch/multitouchmanager.h b/src/input/touch/multitouchmanager.h
index c94af3711..25b56d3d8 100644
--- a/src/input/touch/multitouchmanager.h
+++ b/src/input/touch/multitouchmanager.h
@@ -68,4 +68,3 @@ class MultiTouchManager final
extern MultiTouchManager multiTouchManager;
#endif // INPUT_TOUCH_MULTITOUCHMANAGER_H
-
diff --git a/src/listeners/focuslistener.h b/src/listeners/focuslistener.h
index 6b65fd1fa..34fd89033 100644
--- a/src/listeners/focuslistener.h
+++ b/src/listeners/focuslistener.h
@@ -85,7 +85,7 @@ class FocusListener notfinal
{ }
/**
- * Called when a widget gains focus.
+ * Called when a widget gains focus.
*
* @param event Discribes the event.
*/
@@ -93,7 +93,7 @@ class FocusListener notfinal
{ }
/**
- * Called when a widget loses focus.
+ * Called when a widget loses focus.
*
* @param event Discribes the event.
*/
diff --git a/src/test/testlauncher.cpp b/src/test/testlauncher.cpp
index 8909b29ee..d7bb532f2 100644
--- a/src/test/testlauncher.cpp
+++ b/src/test/testlauncher.cpp
@@ -553,8 +553,6 @@ int TestLauncher::testStackSpeed()
printf("debug: %d\n", stack1.top().xOffset);
printf("stl time: %ld\n", diff);
-
-
for (int d = 0; d < 100; d ++)
{
for (int f = 0; f < sz; f ++)