Merge commit 'a7c21e6f8add37af7412449742ec55c8daa8571a'

Conflicts:
	AUTHORS
	CMakeLists.txt
	ChangeLog
	INSTALL
	README
	aethyra.cbp
	configure.ac
	data/help/changes.txt
	data/help/commands.txt
	data/help/header.txt
	data/help/support.txt
	src/Makefile.am
	src/aethyra.rc
	src/being.cpp
	src/being.h
	src/equipment.cpp
	src/equipment.h
	src/floor_item.h
	src/game.cpp
	src/gui/buddywindow.cpp
	src/gui/char_select.cpp
	src/gui/char_server.cpp
	src/gui/chat.cpp
	src/gui/chat.h
	src/gui/equipmentwindow.cpp
	src/gui/equipmentwindow.h
	src/gui/gui.cpp
	src/gui/inventorywindow.cpp
	src/gui/inventorywindow.h
	src/gui/itemcontainer.cpp
	src/gui/itemcontainer.h
	src/gui/minimap.cpp
	src/gui/ministatus.cpp
	src/gui/newskill.cpp
	src/gui/npc_text.cpp
	src/gui/npclistdialog.h
	src/gui/ok_dialog.cpp
	src/gui/setup_video.cpp
	src/gui/skill.cpp
	src/gui/skill.h
	src/gui/status.h
	src/gui/table_model.h
	src/gui/updatewindow.cpp
	src/gui/viewport.cpp
	src/inventory.cpp
	src/inventory.h
	src/keyboardconfig.cpp
	src/keyboardconfig.h
	src/localplayer.cpp
	src/localplayer.h
	src/logindata.h
	src/main.cpp
	src/map.cpp
	src/monster.cpp
	src/monster.h
	src/net/beinghandler.cpp
	src/net/beinghandler.h
	src/net/buysellhandler.cpp
	src/net/equipmenthandler.cpp
	src/net/loginhandler.cpp
	src/net/loginhandler.h
	src/net/network.h
	src/net/npchandler.cpp
	src/net/playerhandler.cpp
	src/net/protocol.h
	src/net/tradehandler.cpp
	src/npc.cpp
	src/npc.h
	src/particleemitter.cpp
	src/particleemitterprop.h
	src/player.cpp
	src/player.h
	src/player_relations.cpp
	src/resources/imageset.cpp
	src/resources/imageset.h
	src/resources/itemdb.cpp
	src/resources/mapreader.cpp
	src/resources/monsterinfo.h
	src/text.cpp
	src/text.h
	src/textmanager.cpp
	src/textmanager.h
	src/tileset.h
	src/utils/fastsqrt.h
	src/utils/strprintf.cpp
	src/winver.h
	tools/tmxcopy/Makefile
	tools/tmxcopy/base64.cpp
	tools/tmxcopy/base64.h
	tools/tmxcopy/tostring.h

Signed-off-by: Ira Rice <irarice@gmail.com>

1 files changed, 8 insertions, 7 deletions

diff --git a/src/gui/itemcontainer.h b/src/gui/itemcontainer.h
index 5d22b658..8927b001 100644
--- a/src/gui/itemcontainer.h
+++ b/src/gui/itemcontainer.h
@@ -108,29 +108,30 @@ class ItemContainer : public gcn::Widget,
 
     private:
         /**
-         * Find the current item index by the most recently used item ID
+
+         * Sets the currently selected item.  Invalid (e.g., negative) indices set `no item'.
          */
-        void refindSelectedItem(void);
+        void setSelectedItemIndex(int index);
 
         /**
-         * Sets the currently selected item. Invalid (e.g., negative) indices set `no item'.
+         * Find the current item index by the most recently used item ID
          */
-        void setSelectedItemIndex(int index);
+        void refindSelectedItem(void);
 
         /**
          * Determine and set the height of the container.
          */
-        void recalculateHeight();
+        void recalculateHeight(void);
 
         /**
          * Sends out selection events to the list of selection listeners.
          */
-        void distributeValueChangedEvent();
+        void distributeValueChangedEvent(void);
 
         Inventory *mInventory;
         Image *mSelImg;
         int mSelectedItemIndex;
-        int mLastSelectedItemId; // last selected item ID. If we lose the item, find again by ID.
+        int mLastSelectedItemId;  // last selected item ID. If we lose the item, find again by ID.
 
         int mMaxItems;
         int mOffset;