summaryrefslogtreecommitdiff
path: root/src/gui/widgets
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-04-21 01:37:40 +0300
committerAndrei Karas <akaras@inbox.ru>2016-04-21 01:37:40 +0300
commit05eaa7f08da97a2e6944ec64fbf0b32d0b835e24 (patch)
treed8a4624bd4da59f76921cc923b17a9bbbbf37d66 /src/gui/widgets
parent711007a87da954004ee9fae60c1fa2a64555a3b1 (diff)
downloadmv-05eaa7f08da97a2e6944ec64fbf0b32d0b835e24.tar.gz
mv-05eaa7f08da97a2e6944ec64fbf0b32d0b835e24.tar.bz2
mv-05eaa7f08da97a2e6944ec64fbf0b32d0b835e24.tar.xz
mv-05eaa7f08da97a2e6944ec64fbf0b32d0b835e24.zip
Remove extra spaces at line ends.
Diffstat (limited to 'src/gui/widgets')
-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
9 files changed, 42 insertions, 42 deletions
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;