summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-08-04 18:20:40 +0300
committerAndrei Karas <akaras@inbox.ru>2017-08-04 18:22:02 +0300
commit5d84dae3577a9d4112c765636171bd0830932f89 (patch)
treebcf0cc16b45e8c4b31e24d5ad2d2c89be8e44dfb
parentec3c69c15907532f5b1a9a5998dbc7676c6b5f9e (diff)
downloadmv-5d84dae3577a9d4112c765636171bd0830932f89.tar.gz
mv-5d84dae3577a9d4112c765636171bd0830932f89.tar.bz2
mv-5d84dae3577a9d4112c765636171bd0830932f89.tar.xz
mv-5d84dae3577a9d4112c765636171bd0830932f89.zip
Fix code style.
-rw-r--r--src/gui/shortcut/itemshortcut.cpp2
-rw-r--r--src/gui/shortcut/itemshortcut.h6
-rw-r--r--src/net/eathena/maphandler.h5
3 files changed, 4 insertions, 9 deletions
diff --git a/src/gui/shortcut/itemshortcut.cpp b/src/gui/shortcut/itemshortcut.cpp
index f3457547b..526baa265 100644
--- a/src/gui/shortcut/itemshortcut.cpp
+++ b/src/gui/shortcut/itemshortcut.cpp
@@ -246,7 +246,7 @@ void ItemShortcut::setItem(const int index,
save();
}
-void ItemShortcut::setItemFast(const int index,
+void ItemShortcut::setItemFast(const size_t index,
const int item,
const ItemColor color)
{
diff --git a/src/gui/shortcut/itemshortcut.h b/src/gui/shortcut/itemshortcut.h
index 7f351cabc..b7ea160a7 100644
--- a/src/gui/shortcut/itemshortcut.h
+++ b/src/gui/shortcut/itemshortcut.h
@@ -74,11 +74,11 @@ class ItemShortcut final
ItemColor getItemColor(const int index) const A_WARN_UNUSED
{ return mItemColors[index]; }
- void setItemData(const int index,
+ void setItemData(const size_t index,
const std::string &data)
{ mItemData[index] = data; }
- std::string getItemData(const int index) const A_WARN_UNUSED
+ std::string getItemData(const size_t index) const A_WARN_UNUSED
{ return mItemData[index]; }
/**
@@ -104,7 +104,7 @@ class ItemShortcut final
const int item,
const ItemColor color);
- void setItemFast(const int index,
+ void setItemFast(const size_t index,
const int item,
const ItemColor color);
diff --git a/src/net/eathena/maphandler.h b/src/net/eathena/maphandler.h
index d9da12ded..855ec4da7 100644
--- a/src/net/eathena/maphandler.h
+++ b/src/net/eathena/maphandler.h
@@ -23,11 +23,6 @@
#include "net/maphandler.h"
-namespace Net
-{
- class MessageIn;
-} // namespace Net
-
namespace EAthena
{