diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-11-01 04:22:50 +0100 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-11-01 04:22:50 +0100 |
| commit | a1e61f8446b7928d854a062f6494e75fe3fec9ab (patch) | |
| tree | 953cba5593a49f818612f38de1149a2763a36aa8 /src/gui/widgets/itemcontainer.h | |
| parent | 79cb8fa1ca81440e21bcb186785d47c50a608e8e (diff) | |
| parent | 8954a7ca0f70bbf167c9119d26c7bca8407e8da6 (diff) | |
| download | Mana-a1e61f8446b7928d854a062f6494e75fe3fec9ab.tar.gz Mana-a1e61f8446b7928d854a062f6494e75fe3fec9ab.tar.bz2 Mana-a1e61f8446b7928d854a062f6494e75fe3fec9ab.tar.xz Mana-a1e61f8446b7928d854a062f6494e75fe3fec9ab.zip | |
Merge github.com:mana/mana
Conflicts:
src/localplayer.cpp
src/net/manaserv/beinghandler.cpp
src/net/manaserv/charhandler.cpp
Diffstat (limited to 'src/gui/widgets/itemcontainer.h')
| -rw-r--r-- | src/gui/widgets/itemcontainer.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h index 4d5afde2..0da894ea 100644 --- a/src/gui/widgets/itemcontainer.h +++ b/src/gui/widgets/itemcontainer.h @@ -54,11 +54,8 @@ class ItemContainer : public gcn::Widget, * Constructor. Initializes the graphic. * * @param inventory - * @param gridColumns Amount of columns in grid. - * @param gridRows Amount of rows in grid. - * @param offset Index offset */ - ItemContainer(Inventory *inventory, bool forceQuantity = false); + ItemContainer(Inventory *inventory); virtual ~ItemContainer(); @@ -184,7 +181,6 @@ class ItemContainer : public gcn::Widget, int mSelectedIndex, mHighlightedIndex; int mLastUsedSlot; SelectionState mSelectionStatus; - bool mForceQuantity; bool mSwapItems; bool mDescItems; int mDragPosX, mDragPosY; @@ -201,4 +197,4 @@ class ItemContainer : public gcn::Widget, SelectionListenerList mSelectionListeners; }; -#endif +#endif // ITEMCONTAINER_H |