diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-01-28 20:49:24 +0200 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-01-28 20:49:24 +0200 |
| commit | afece3f6acd9a7a4a009b73883d4c2d27ac1b8ce (patch) | |
| tree | c74d0f6e0a0000274ece2d663ed90a83459191a0 /src/gui/widgets | |
| parent | 8d3b46c492cade8504fafedbd6c00b6a39968388 (diff) | |
| download | manaverse-afece3f6acd9a7a4a009b73883d4c2d27ac1b8ce.tar.gz manaverse-afece3f6acd9a7a4a009b73883d4c2d27ac1b8ce.tar.bz2 manaverse-afece3f6acd9a7a4a009b73883d4c2d27ac1b8ce.tar.xz manaverse-afece3f6acd9a7a4a009b73883d4c2d27ac1b8ce.zip | |
Fix code style and some new compilation warnings.
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/layout.h | 5 | ||||
| -rw-r--r-- | src/gui/widgets/shortcutcontainer.cpp | 6 | ||||
| -rw-r--r-- | src/gui/widgets/textfield.cpp | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/gui/widgets/layout.h b/src/gui/widgets/layout.h index 4c1e40bb9..f6621ee11 100644 --- a/src/gui/widgets/layout.h +++ b/src/gui/widgets/layout.h @@ -170,7 +170,10 @@ class LayoutCell FILL }; - LayoutCell(): mType(NONE) {} + LayoutCell(): + mWidget(0), + mType(NONE) + { } ~LayoutCell(); diff --git a/src/gui/widgets/shortcutcontainer.cpp b/src/gui/widgets/shortcutcontainer.cpp index 8ce252150..0426c8c79 100644 --- a/src/gui/widgets/shortcutcontainer.cpp +++ b/src/gui/widgets/shortcutcontainer.cpp @@ -30,14 +30,14 @@ float ShortcutContainer::mAlpha = 1.0; ShortcutContainer::ShortcutContainer(): - mGridWidth(1), - mGridHeight(1), mBackgroundImg(0), mMaxItems(0), mBoxWidth(1), mBoxHeight(1), mCursorPosX(0), - mCursorPosY(0) + mCursorPosY(0), + mGridWidth(1), + mGridHeight(1) { } diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp index e7c181de2..67339e361 100644 --- a/src/gui/widgets/textfield.cpp +++ b/src/gui/widgets/textfield.cpp @@ -300,7 +300,7 @@ void TextField::handlePaste() std::string text = getText(); std::string::size_type caretPos = getCaretPosition(); - if (RetrieveBuffer(text, caretPos)) + if (retrieveBuffer(text, caretPos)) { setText(text); setCaretPosition(static_cast<unsigned>(caretPos)); |