diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-08-15 19:46:48 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-08-15 23:35:48 +0300 |
| commit | 243932ef169949917f17d3107e00f97886da0a14 (patch) | |
| tree | 8f11d6e99b250ff480a32b04ea3bbb0ce9bc7f14 /src/gui | |
| parent | 3658d5a5564db6f0854ec9378c485aef8acc8992 (diff) | |
| download | mv-243932ef169949917f17d3107e00f97886da0a14.tar.gz mv-243932ef169949917f17d3107e00f97886da0a14.tar.bz2 mv-243932ef169949917f17d3107e00f97886da0a14.tar.xz mv-243932ef169949917f17d3107e00f97886da0a14.zip | |
Fix code style.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/widgets/avatarlistbox.cpp | 13 | ||||
| -rw-r--r-- | src/gui/widgets/setupbuttonitem.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/setupbuttonitem.h | 12 | ||||
| -rw-r--r-- | src/gui/widgets/tabs/setup_other.cpp | 1 |
4 files changed, 13 insertions, 15 deletions
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp index 36c6592fd..4968393b2 100644 --- a/src/gui/widgets/avatarlistbox.cpp +++ b/src/gui/widgets/avatarlistbox.cpp @@ -425,6 +425,19 @@ void AvatarListBox::mousePressed(MouseEvent &event) popupManager->showPickupItemPopup(name); break; } + case MapItemType::HOME: + case MapItemType::ROAD: + case MapItemType::CROSS: + case MapItemType::ARROW_UP: + case MapItemType::ARROW_DOWN: + case MapItemType::ARROW_LEFT: + case MapItemType::ARROW_RIGHT: + case MapItemType::PORTAL: + case MapItemType::MUSIC: + case MapItemType::SEPARATOR: + { + break; + } default: { const Map *const map = viewport->getMap(); diff --git a/src/gui/widgets/setupbuttonitem.cpp b/src/gui/widgets/setupbuttonitem.cpp index ad2c6548b..7551adaf6 100644 --- a/src/gui/widgets/setupbuttonitem.cpp +++ b/src/gui/widgets/setupbuttonitem.cpp @@ -26,8 +26,6 @@ #include "gui/widgets/tabs/setuptabscroll.h" -#include "utils/mathutils.h" - #include "debug.h" SetupButtonItem::SetupButtonItem(const std::string &restrict text, diff --git a/src/gui/widgets/setupbuttonitem.h b/src/gui/widgets/setupbuttonitem.h index 9e9a7837b..0909f4056 100644 --- a/src/gui/widgets/setupbuttonitem.h +++ b/src/gui/widgets/setupbuttonitem.h @@ -23,21 +23,9 @@ #include "gui/widgets/setupitem.h" -#include "listeners/actionlistener.h" - class Button; -class CheckBox; -class Configuration; -class DropDown; -class EditDialog; class HorizontContainer; -class IntTextField; -class Label; -class ListModel; class SetupTabScroll; -class Slider; -class SliderList; -class TextField; class SetupButtonItem final : public SetupItem { diff --git a/src/gui/widgets/tabs/setup_other.cpp b/src/gui/widgets/tabs/setup_other.cpp index a3a939489..2c62e179c 100644 --- a/src/gui/widgets/tabs/setup_other.cpp +++ b/src/gui/widgets/tabs/setup_other.cpp @@ -27,7 +27,6 @@ #include "gui/widgets/containerplacer.h" #include "gui/widgets/layouthelper.h" #include "gui/widgets/setupbuttonitem.h" -#include "gui/widgets/setupitem.h" #include "gui/widgets/scrollarea.h" #include "listeners/uploadlistener.h" |