diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-09-09 02:07:50 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-09-09 02:07:50 +0300 |
| commit | 0cec4fa69c575f69015f37686f1e010d09f2ec48 (patch) | |
| tree | 3ee7de7a6e19f3bc952bd9da5d4aaf274a37795d /src/gui | |
| parent | a85d7ad79ce803adc3469a618bfd8dfe188f2cbf (diff) | |
| download | manaverse-0cec4fa69c575f69015f37686f1e010d09f2ec48.tar.gz manaverse-0cec4fa69c575f69015f37686f1e010d09f2ec48.tar.bz2 manaverse-0cec4fa69c575f69015f37686f1e010d09f2ec48.tar.xz manaverse-0cec4fa69c575f69015f37686f1e010d09f2ec48.zip | |
fix code style.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/charselectdialog.cpp | 1 | ||||
| -rw-r--r-- | src/gui/chatwindow.cpp | 2 | ||||
| -rw-r--r-- | src/gui/socialwindow.cpp | 1 | ||||
| -rw-r--r-- | src/gui/statuswindow.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/button.cpp | 1 | ||||
| -rw-r--r-- | src/gui/widgets/guitable.cpp | 3 |
6 files changed, 8 insertions, 2 deletions
diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp index 6a4de9432..e2f8f652c 100644 --- a/src/gui/charselectdialog.cpp +++ b/src/gui/charselectdialog.cpp @@ -552,6 +552,7 @@ bool CharSelectDialog::selectByName(const std::string &name, CharacterDisplay::CharacterDisplay(CharSelectDialog *const charSelectDialog) : + Container(), mCharacter(nullptr), mPlayerBox(new PlayerBox(nullptr)), mName(new Label("wwwwwwwwwwwwwwwwwwwwwwww")), diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp index 7a8c3d63b..9ea0bb383 100644 --- a/src/gui/chatwindow.cpp +++ b/src/gui/chatwindow.cpp @@ -151,7 +151,7 @@ public: } }; -static const char *ACTION_COLOR_PICKER = "color picker"; +static const char *const ACTION_COLOR_PICKER = "color picker"; ChatWindow::ChatWindow(): Window(_("Chat"), false, nullptr, "chat.xml"), diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp index 4bd15f4b0..6a04582b1 100644 --- a/src/gui/socialwindow.cpp +++ b/src/gui/socialwindow.cpp @@ -1193,6 +1193,7 @@ private: }; SocialWindow::SocialWindow() : + ActionListener(), Window(_("Social"), false, nullptr, "social.xml"), mGuildInvited(0), mGuildAcceptDialog(nullptr), diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp index cf88bf7ff..295adcd6e 100644 --- a/src/gui/statuswindow.cpp +++ b/src/gui/statuswindow.cpp @@ -731,7 +731,7 @@ void StatusWindow::action(const gcn::ActionEvent &event) std::string str; while (it != it_end) { - ChangeDisplay *const attr = dynamic_cast<ChangeDisplay*>( + const ChangeDisplay *const attr = dynamic_cast<ChangeDisplay*>( (*it).second); if (attr) str += attr->getValue() + " "; diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp index 5d0a36f32..614ec7313 100644 --- a/src/gui/widgets/button.cpp +++ b/src/gui/widgets/button.cpp @@ -117,6 +117,7 @@ Button::Button(const std::string &caption, const std::string &imageName, const std::string &actionEventId, gcn::ActionListener *const listener) : gcn::Button(caption), + WidgetListener(), mDescription(""), mClickCount(0), mTag(0), diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp index dc158b95f..088b72db3 100644 --- a/src/gui/widgets/guitable.cpp +++ b/src/gui/widgets/guitable.cpp @@ -91,6 +91,9 @@ void GuiTableActionListener::action(const gcn::ActionEvent GuiTable::GuiTable(TableModel *const initial_model, const bool opacity) : + gcn::Widget(), + gcn::MouseListener(), + gcn::KeyListener(), mLinewiseMode(false), mWrappingEnabled(false), mOpaque(opacity), |