summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-03-29 01:36:33 +0300
committerAndrei Karas <akaras@inbox.ru>2013-03-29 01:36:33 +0300
commit50e6f52f9f326d09ee5a2d0f8e8c2235c5e9cd22 (patch)
tree621b805e2fa1f20ccbcbb98e652df784677e63c5 /src
parentffcc519acbc3b4dc4e5d46bc2f70aa0dcf516131 (diff)
downloadplus-50e6f52f9f326d09ee5a2d0f8e8c2235c5e9cd22.tar.gz
plus-50e6f52f9f326d09ee5a2d0f8e8c2235c5e9cd22.tar.bz2
plus-50e6f52f9f326d09ee5a2d0f8e8c2235c5e9cd22.tar.xz
plus-50e6f52f9f326d09ee5a2d0f8e8c2235c5e9cd22.zip
fix some warnings.
Diffstat (limited to 'src')
-rw-r--r--src/commands.cpp4
-rw-r--r--src/gui/setup_touch.cpp8
-rw-r--r--src/gui/skilldialog.cpp4
3 files changed, 8 insertions, 8 deletions
diff --git a/src/commands.cpp b/src/commands.cpp
index 7dbafd0f1..8ddd0f0bf 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -925,14 +925,14 @@ impHandler0(cacheInfo)
if (!cache)
return;
- int all = 0;
+ unsigned int all = 0;
debugChatTab->chatLog(_("font cache size"));
std::string str;
for (int f = 0; f < 256; f ++)
{
if (!cache[f].empty())
{
- const int sz = static_cast<int>(cache[f].size());
+ const unsigned int sz = static_cast<int>(cache[f].size());
all += sz;
str.append(strprintf("%d: %u, ", f, sz));
}
diff --git a/src/gui/setup_touch.cpp b/src/gui/setup_touch.cpp
index 037e2bb20..8fa3c5a7f 100644
--- a/src/gui/setup_touch.cpp
+++ b/src/gui/setup_touch.cpp
@@ -89,19 +89,19 @@ Setup_Touch::Setup_Touch(const Widget2 *const widget) :
new SetupItemDropDown(_("Buttons size"), "", "screenButtonsSize", this,
"screenButtonsSizeEvent", mSizeList, 100);
- new SetupActionDropDown(strprintf(_("Button %u action"), 1), "",
+ new SetupActionDropDown(strprintf(_("Button %u action"), 1u), "",
"screenActionButton0", this, "screenActionButton0Event",
mActionsList, 250);
- new SetupActionDropDown(strprintf(_("Button %u action"), 2), "",
+ new SetupActionDropDown(strprintf(_("Button %u action"), 2u), "",
"screenActionButton1", this, "screenActionButton1Event",
mActionsList, 250);
- new SetupActionDropDown(strprintf(_("Button %u action"), 3), "",
+ new SetupActionDropDown(strprintf(_("Button %u action"), 3u), "",
"screenActionButton2", this, "screenActionButton2Event",
mActionsList, 250);
- new SetupActionDropDown(strprintf(_("Button %u action"), 4), "",
+ new SetupActionDropDown(strprintf(_("Button %u action"), 4u), "",
"screenActionButton3", this, "screenActionButton3Event",
mActionsList, 250);
diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp
index db463f9e6..c89bf5697 100644
--- a/src/gui/skilldialog.cpp
+++ b/src/gui/skilldialog.cpp
@@ -511,12 +511,12 @@ void SkillDialog::loadSkills()
data->setIcon(icon);
if (skill->id < SKILL_VAR_MIN_ID)
{
- data->dispName = strprintf("%s, %d",
+ data->dispName = strprintf("%s, %u",
name.c_str(), skill->id);
}
else
{
- data->dispName = strprintf("%s, (%d)",
+ data->dispName = strprintf("%s, (%u)",
name.c_str(), skill->id - SKILL_VAR_MIN_ID);
}
data->shortName = XML::langProperty(node,