diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-08-22 07:57:56 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-08-22 07:57:56 +0000 |
| commit | a444a76ed37a52ba0004298f2512bee1c75273bc (patch) | |
| tree | 13bfcb7b35f2db0edba86790dc6222546dbc0109 /src | |
| parent | 7ed4bc1e9a7d6b3a01a7305f92a3d6eeb58550f6 (diff) | |
| download | mana-a444a76ed37a52ba0004298f2512bee1c75273bc.tar.gz mana-a444a76ed37a52ba0004298f2512bee1c75273bc.tar.bz2 mana-a444a76ed37a52ba0004298f2512bee1c75273bc.tar.xz mana-a444a76ed37a52ba0004298f2512bee1c75273bc.zip | |
Fixed a compiler warning and updated source lists.
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 6 | ||||
| -rw-r--r-- | src/gui/itemshortcutcontainer.h | 3 |
3 files changed, 13 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b1342e8c..6bdaeb68 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -94,6 +94,10 @@ SET(SRCS gui/inventorywindow.h gui/itemcontainer.cpp gui/itemcontainer.h + gui/itemshortcutcontainer.cpp + gui/itemshortcutcontainer.h + gui/itemshortcutwindow.cpp + gui/itemshortcutwindow.h gui/item_amount.cpp gui/item_amount.h gui/linkhandler.h @@ -293,6 +297,8 @@ SET(SRCS inventory.h item.cpp item.h + itemshortcut.cpp + itemshortcut.h joystick.cpp joystick.h keyboardconfig.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 3d801721..9189e973 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -43,6 +43,10 @@ tmw_SOURCES = gui/widgets/resizegrip.cpp \ gui/inventorywindow.h \ gui/itemcontainer.cpp \ gui/itemcontainer.h \ + gui/itemshortcutcontainer.cpp \ + gui/itemshortcutcontainer.h \ + gui/itemshortcutwindow.cpp \ + gui/itemshortcutwindow.h \ gui/item_amount.cpp \ gui/item_amount.h \ gui/linkhandler.h \ @@ -242,6 +246,8 @@ tmw_SOURCES = gui/widgets/resizegrip.cpp \ inventory.h \ item.cpp \ item.h \ + itemshortcut.cpp \ + itemshortcut.h \ joystick.cpp \ joystick.h \ keyboardconfig.cpp \ diff --git a/src/gui/itemshortcutcontainer.h b/src/gui/itemshortcutcontainer.h index a1ad53b7..4b154cbb 100644 --- a/src/gui/itemshortcutcontainer.h +++ b/src/gui/itemshortcutcontainer.h @@ -98,8 +98,7 @@ class ItemShortcutContainer : public gcn::Widget, public gcn::MouseListener * @param pointY Y coordinate of the point. * @return index on success, -1 on failure. */ - int ItemShortcutContainer::getIndexFromGrid( - int pointX, int pointY) const; + int getIndexFromGrid(int pointX, int pointY) const; Image *mBackgroundImg; |