summaryrefslogtreecommitdiff
path: root/src/guichan
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-04-20 16:38:52 +0300
committerAndrei Karas <akaras@inbox.ru>2013-04-20 16:38:52 +0300
commit73fac88b0263962c90d2d649938e6a4a5b11a246 (patch)
tree2f058980977cf73a9b8fb7ccbdb727a6bfd5bb16 /src/guichan
parent747dc30f256606e28fd932a9626da7c328114036 (diff)
downloadManaVerse-73fac88b0263962c90d2d649938e6a4a5b11a246.tar.gz
ManaVerse-73fac88b0263962c90d2d649938e6a4a5b11a246.tar.bz2
ManaVerse-73fac88b0263962c90d2d649938e6a4a5b11a246.tar.xz
ManaVerse-73fac88b0263962c90d2d649938e6a4a5b11a246.zip
fix style in guichan directory.
Diffstat (limited to 'src/guichan')
-rw-r--r--src/guichan/focushandler.cpp1
-rw-r--r--src/guichan/graphics.cpp1
-rw-r--r--src/guichan/gui.cpp4
-rw-r--r--src/guichan/include/guichan/basiccontainer.hpp3
-rw-r--r--src/guichan/include/guichan/keyinput.hpp1
-rw-r--r--src/guichan/keyinput.cpp4
-rw-r--r--src/guichan/sdl/sdlgraphics.cpp1
-rw-r--r--src/guichan/widget.cpp9
-rw-r--r--src/guichan/widgets/button.cpp1
-rw-r--r--src/guichan/widgets/checkbox.cpp6
-rw-r--r--src/guichan/widgets/label.cpp1
-rw-r--r--src/guichan/widgets/listbox.cpp6
-rw-r--r--src/guichan/widgets/radiobutton.cpp7
-rw-r--r--src/guichan/widgets/slider.cpp20
-rw-r--r--src/guichan/widgets/textbox.cpp2
-rw-r--r--src/guichan/widgets/textfield.cpp1
-rw-r--r--src/guichan/widgets/window.cpp1
17 files changed, 48 insertions, 21 deletions
diff --git a/src/guichan/focushandler.cpp b/src/guichan/focushandler.cpp
index 93d6ec9d4..2b8079eb7 100644
--- a/src/guichan/focushandler.cpp
+++ b/src/guichan/focushandler.cpp
@@ -57,6 +57,7 @@
namespace gcn
{
FocusHandler::FocusHandler() :
+ mWidgets(),
mFocusedWidget(nullptr),
mModalFocusedWidget(nullptr),
mModalMouseInputFocusedWidget(nullptr),
diff --git a/src/guichan/graphics.cpp b/src/guichan/graphics.cpp
index 201f5d300..0f4af464b 100644
--- a/src/guichan/graphics.cpp
+++ b/src/guichan/graphics.cpp
@@ -58,6 +58,7 @@ namespace gcn
{
Graphics::Graphics() :
+ mClipStack(),
mFont(nullptr)
{
}
diff --git a/src/guichan/gui.cpp b/src/guichan/gui.cpp
index d91ac7ee0..d363bdc9b 100644
--- a/src/guichan/gui.cpp
+++ b/src/guichan/gui.cpp
@@ -69,6 +69,7 @@ namespace gcn
mInput(nullptr),
mFocusHandler(new FocusHandler),
mTabbing(true),
+ mKeyListeners(),
mShiftPressed(false),
mMetaPressed(false),
mControlPressed(false),
@@ -78,7 +79,8 @@ namespace gcn
mLastMouseX(0),
mLastMouseY(0),
mClickCount(1),
- mLastMouseDragButton(0)
+ mLastMouseDragButton(0),
+ mWidgetWithMouseQueue()
{
}
diff --git a/src/guichan/include/guichan/basiccontainer.hpp b/src/guichan/include/guichan/basiccontainer.hpp
index 7f2d81382..40140b887 100644
--- a/src/guichan/include/guichan/basiccontainer.hpp
+++ b/src/guichan/include/guichan/basiccontainer.hpp
@@ -66,7 +66,8 @@ namespace gcn
public DeathListener
{
public:
- BasicContainer()
+ BasicContainer() :
+ mWidgets()
{ }
A_DELETE_COPY(BasicContainer)
diff --git a/src/guichan/include/guichan/keyinput.hpp b/src/guichan/include/guichan/keyinput.hpp
index 6b1d8e932..09d46857c 100644
--- a/src/guichan/include/guichan/keyinput.hpp
+++ b/src/guichan/include/guichan/keyinput.hpp
@@ -64,6 +64,7 @@ namespace gcn
* Constructor.
*/
KeyInput() :
+ mKey(0),
mType(0),
mShiftPressed(false),
mControlPressed(false),
diff --git a/src/guichan/keyinput.cpp b/src/guichan/keyinput.cpp
index 906b6effe..2d936f28b 100644
--- a/src/guichan/keyinput.cpp
+++ b/src/guichan/keyinput.cpp
@@ -52,8 +52,8 @@
namespace gcn
{
- KeyInput::KeyInput(const Key& key, unsigned int type)
- :mKey(key),
+ KeyInput::KeyInput(const Key& key, unsigned int type) :
+ mKey(key),
mType(type),
mShiftPressed(false),
mControlPressed(false),
diff --git a/src/guichan/sdl/sdlgraphics.cpp b/src/guichan/sdl/sdlgraphics.cpp
index a44acf458..6fd7a15dc 100644
--- a/src/guichan/sdl/sdlgraphics.cpp
+++ b/src/guichan/sdl/sdlgraphics.cpp
@@ -66,6 +66,7 @@ namespace gcn
SDLGraphics::SDLGraphics() :
Graphics(),
mTarget(nullptr),
+ mColor(),
mAlpha(false)
{
}
diff --git a/src/guichan/widget.cpp b/src/guichan/widget.cpp
index d1150dbf0..e7838e4d9 100644
--- a/src/guichan/widget.cpp
+++ b/src/guichan/widget.cpp
@@ -71,6 +71,12 @@ namespace gcn
std::set<Widget*> Widget::mWidgetsSet;
Widget::Widget() :
+ mMouseListeners(),
+ mKeyListeners(),
+ mActionListeners(),
+ mDeathListeners(),
+ mFocusListeners(),
+ mWidgetListeners(),
mForegroundColor(0x000000),
mBackgroundColor(0xffffff),
mBaseColor(0x808090),
@@ -78,12 +84,15 @@ namespace gcn
mFocusHandler(nullptr),
mInternalFocusHandler(nullptr),
mParent(nullptr),
+ mDimension(),
mFrameSize(0),
+ mActionEventId(),
mFocusable(false),
mVisible(true),
mTabIn(true),
mTabOut(true),
mEnabled(true),
+ mId(),
mCurrentFont(nullptr)
{
mWidgets.push_back(this);
diff --git a/src/guichan/widgets/button.cpp b/src/guichan/widgets/button.cpp
index 6ea6c8f3a..b0627c4bd 100644
--- a/src/guichan/widgets/button.cpp
+++ b/src/guichan/widgets/button.cpp
@@ -64,6 +64,7 @@ namespace gcn
gcn::MouseListener(),
gcn::KeyListener(),
gcn::FocusListener(),
+ mCaption(),
mHasMouse(false),
mKeyPressed(false),
mMousePressed(false),
diff --git a/src/guichan/widgets/checkbox.cpp b/src/guichan/widgets/checkbox.cpp
index 4e76e75d2..da6776d31 100644
--- a/src/guichan/widgets/checkbox.cpp
+++ b/src/guichan/widgets/checkbox.cpp
@@ -62,7 +62,8 @@ namespace gcn
gcn::Widget(),
gcn::MouseListener(),
gcn::KeyListener(),
- mSelected(false)
+ mSelected(false),
+ mCaption()
{
setFocusable(true);
addMouseListener(this);
@@ -73,7 +74,8 @@ namespace gcn
gcn::Widget(),
gcn::MouseListener(),
gcn::KeyListener(),
- mSelected(selected)
+ mSelected(selected),
+ mCaption()
{
setCaption(caption);
diff --git a/src/guichan/widgets/label.cpp b/src/guichan/widgets/label.cpp
index db1ea6e8a..5e7c714f3 100644
--- a/src/guichan/widgets/label.cpp
+++ b/src/guichan/widgets/label.cpp
@@ -58,6 +58,7 @@ namespace gcn
{
Label::Label() :
gcn::Widget(),
+ mCaption(),
mAlignment(Graphics::LEFT)
{
}
diff --git a/src/guichan/widgets/listbox.cpp b/src/guichan/widgets/listbox.cpp
index 938d82721..5dd1509f5 100644
--- a/src/guichan/widgets/listbox.cpp
+++ b/src/guichan/widgets/listbox.cpp
@@ -66,7 +66,8 @@ namespace gcn
gcn::KeyListener(),
mSelected(-1),
mListModel(nullptr),
- mWrappingEnabled(false)
+ mWrappingEnabled(false),
+ mSelectionListeners()
{
setWidth(100);
setFocusable(true);
@@ -81,7 +82,8 @@ namespace gcn
gcn::KeyListener(),
mSelected(-1),
mListModel(listModel),
- mWrappingEnabled(false)
+ mWrappingEnabled(false),
+ mSelectionListeners()
{
setWidth(100);
adjustSize();
diff --git a/src/guichan/widgets/radiobutton.cpp b/src/guichan/widgets/radiobutton.cpp
index 9be0b75c9..55de52a99 100644
--- a/src/guichan/widgets/radiobutton.cpp
+++ b/src/guichan/widgets/radiobutton.cpp
@@ -64,8 +64,8 @@ namespace gcn
gcn::MouseListener(),
gcn::KeyListener(),
mSelected(false),
- mCaption(""),
- mGroup("")
+ mCaption(),
+ mGroup()
{
setSelected(false);
@@ -81,7 +81,8 @@ namespace gcn
gcn::MouseListener(),
gcn::KeyListener(),
mSelected(false),
- mGroup("")
+ mCaption(),
+ mGroup()
{
setCaption(caption);
setGroup(group);
diff --git a/src/guichan/widgets/slider.cpp b/src/guichan/widgets/slider.cpp
index 7611fdfd7..322f2ef76 100644
--- a/src/guichan/widgets/slider.cpp
+++ b/src/guichan/widgets/slider.cpp
@@ -61,15 +61,15 @@ namespace gcn
gcn::MouseListener(),
gcn::KeyListener(),
mDragged(false),
+ mValue(0),
+ mStepLength(scaleEnd / 10),
+ mMarkerLength(10),
mScaleStart(0),
- mScaleEnd(scaleEnd)
+ mScaleEnd(scaleEnd),
+ mOrientation(HORIZONTAL)
{
setFocusable(true);
setFrameSize(1);
- setOrientation(HORIZONTAL);
- setValue(0);
- setStepLength(scaleEnd / 10);
- setMarkerLength(10);
addMouseListener(this);
addKeyListener(this);
@@ -80,15 +80,15 @@ namespace gcn
gcn::MouseListener(),
gcn::KeyListener(),
mDragged(false),
+ mValue(scaleStart),
+ mStepLength((scaleEnd - scaleStart) / 10),
+ mMarkerLength(10),
mScaleStart(scaleStart),
- mScaleEnd(scaleEnd)
+ mScaleEnd(scaleEnd),
+ mOrientation(HORIZONTAL)
{
setFocusable(true);
setFrameSize(1);
- setOrientation(HORIZONTAL);
- setValue(scaleStart);
- setStepLength((scaleEnd - scaleStart) / 10);
- setMarkerLength(10);
addMouseListener(this);
addKeyListener(this);
diff --git a/src/guichan/widgets/textbox.cpp b/src/guichan/widgets/textbox.cpp
index bfb6aff89..3f1c51402 100644
--- a/src/guichan/widgets/textbox.cpp
+++ b/src/guichan/widgets/textbox.cpp
@@ -62,6 +62,7 @@ namespace gcn
gcn::Widget(),
gcn::MouseListener(),
gcn::KeyListener(),
+ mTextRows(),
mCaretColumn(0),
mCaretRow(0),
mEditable(true),
@@ -79,6 +80,7 @@ namespace gcn
gcn::Widget(),
gcn::MouseListener(),
gcn::KeyListener(),
+ mTextRows(),
mCaretColumn(0),
mCaretRow(0),
mEditable(true),
diff --git a/src/guichan/widgets/textfield.cpp b/src/guichan/widgets/textfield.cpp
index 7d9bd87f6..e5ecc172b 100644
--- a/src/guichan/widgets/textfield.cpp
+++ b/src/guichan/widgets/textfield.cpp
@@ -61,6 +61,7 @@ namespace gcn
gcn::Widget(),
gcn::MouseListener(),
gcn::KeyListener(),
+ mText(),
mCaretPosition(0),
mXScroll(0)
{
diff --git a/src/guichan/widgets/window.cpp b/src/guichan/widgets/window.cpp
index f04a47e9e..025021a41 100644
--- a/src/guichan/widgets/window.cpp
+++ b/src/guichan/widgets/window.cpp
@@ -60,6 +60,7 @@ namespace gcn
Window::Window() :
Container(),
gcn::MouseListener(),
+ mCaption(),
mAlignment(Graphics::CENTER),
mPadding(2),
mTitleBarHeight(16),