From ab38f105a42355cbf207bf4da48c0c386892781c Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 8 May 2015 16:29:20 +0300 Subject: Fix code style. --- src/gui/widgets/itemcontainer.cpp | 7 ++++--- src/gui/widgets/tabs/socialplayerstab.h | 2 -- src/gui/windows/tradewindow.h | 2 -- 3 files changed, 4 insertions(+), 7 deletions(-) (limited to 'src/gui') 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" -- cgit v1.2.3-70-g09d2