diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-05-08 16:29:20 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-05-08 16:29:20 +0300 |
| commit | ab38f105a42355cbf207bf4da48c0c386892781c (patch) | |
| tree | 713b45108c805241fe5714146dfe0aff2bfd2d13 /src/gui | |
| parent | f8042d0cf07ebb4b10094ac242591d8edf7067ba (diff) | |
| download | manaverse-ab38f105a42355cbf207bf4da48c0c386892781c.tar.gz manaverse-ab38f105a42355cbf207bf4da48c0c386892781c.tar.bz2 manaverse-ab38f105a42355cbf207bf4da48c0c386892781c.tar.xz manaverse-ab38f105a42355cbf207bf4da48c0c386892781c.zip | |
Fix code style.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/widgets/itemcontainer.cpp | 7 | ||||
| -rw-r--r-- | src/gui/widgets/tabs/socialplayerstab.h | 2 | ||||
| -rw-r--r-- | src/gui/windows/tradewindow.h | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp index f7dec4452..4849591a6 100644 --- a/src/gui/widgets/itemcontainer.cpp +++ b/src/gui/widgets/itemcontainer.cpp @@ -595,11 +595,12 @@ void ItemContainer::mouseReleased(MouseEvent &event) inventory = PlayerInfo::getInventory(); } else if (src == DRAGDROP_SOURCE_INVENTORY - && (dst == DRAGDROP_SOURCE_NPC #ifdef EATHENA_SUPPORT - || dst == DRAGDROP_SOURCE_MAIL + && (dst == DRAGDROP_SOURCE_NPC + || dst == DRAGDROP_SOURCE_MAIL)) +#else + && dst == DRAGDROP_SOURCE_NPC) #endif - )) { inventory = PlayerInfo::getInventory(); const Item *const item = inventory->getItem(dragDrop.getTag()); diff --git a/src/gui/widgets/tabs/socialplayerstab.h b/src/gui/widgets/tabs/socialplayerstab.h index 7fee69deb..a7634014b 100644 --- a/src/gui/widgets/tabs/socialplayerstab.h +++ b/src/gui/widgets/tabs/socialplayerstab.h @@ -28,8 +28,6 @@ #include "being/being.h" -#include "enums/simpletypes.h" - #include "gui/models/beingslistmodel.h" #include "utils/gettext.h" diff --git a/src/gui/windows/tradewindow.h b/src/gui/windows/tradewindow.h index b93c53507..6c5745c66 100644 --- a/src/gui/windows/tradewindow.h +++ b/src/gui/windows/tradewindow.h @@ -23,8 +23,6 @@ #ifndef GUI_WINDOWS_TRADEWINDOW_H #define GUI_WINDOWS_TRADEWINDOW_H -#include "enums/simpletypes.h" - #include "gui/widgets/window.h" #include "listeners/actionlistener.h" |