summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/CMakeLists.txt4
-rw-r--r--src/gui/itemcontainer.cpp4
-rw-r--r--src/net/adminhandler.h4
3 files changed, 7 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f6049b1c..b210ba6d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -85,6 +85,8 @@ SET(SRCS
gui/button.h
gui/buy.cpp
gui/buy.h
+ gui/buysell.cpp
+ gui/buysell.h
gui/char_select.cpp
gui/char_select.h
gui/chat.cpp
@@ -407,8 +409,6 @@ SET(SRCS
)
SET(SRCS_EA
- gui/buysell.cpp
- gui/buysell.h
gui/char_server.cpp
gui/char_server.h
gui/skill.cpp
diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp
index 7420cc18..40f4ae28 100644
--- a/src/gui/itemcontainer.cpp
+++ b/src/gui/itemcontainer.cpp
@@ -58,9 +58,9 @@ ItemContainer::ItemContainer(Inventory *inventory,
mSelectedItem(NULL),
mHighlightedItem(NULL),
mSelectionStatus(SEL_NONE),
+ mForceQuantity(forceQuantity),
mSwapItems(false),
- mDescItems(false),
- mForceQuantity(forceQuantity)
+ mDescItems(false)
{
mItemPopup = new ItemPopup;
setFocusable(true);
diff --git a/src/net/adminhandler.h b/src/net/adminhandler.h
index ee046323..26ef59ba 100644
--- a/src/net/adminhandler.h
+++ b/src/net/adminhandler.h
@@ -25,6 +25,7 @@
#include <iosfwd>
namespace Net {
+
class AdminHandler
{
public:
@@ -50,6 +51,7 @@ class AdminHandler
// TODO
};
-}
+
+} // namespace Net
#endif // ADMINHANDLER_H