summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-07 17:56:08 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-07 17:56:08 +0300
commit82a4015692e630f36f94a55590c1b59b958c5a17 (patch)
tree72e7cbd31b45e13d252a38d5fcad4620b48ec6b5 /src/gui
parentafc6bb37100fd110512cd1119920719376e87ecf (diff)
downloadmanaplus-82a4015692e630f36f94a55590c1b59b958c5a17.tar.gz
manaplus-82a4015692e630f36f94a55590c1b59b958c5a17.tar.bz2
manaplus-82a4015692e630f36f94a55590c1b59b958c5a17.tar.xz
manaplus-82a4015692e630f36f94a55590c1b59b958c5a17.zip
add missing const and static keywords.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/popups/statuspopup.cpp4
-rw-r--r--src/gui/widgets/namesmodel.h2
-rw-r--r--src/gui/windows/statuswindow.cpp4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/popups/statuspopup.cpp b/src/gui/popups/statuspopup.cpp
index 7944d1400..1d696fe82 100644
--- a/src/gui/popups/statuspopup.cpp
+++ b/src/gui/popups/statuspopup.cpp
@@ -154,7 +154,7 @@ void StatusPopup::updateLabels() const
Input::KEY_SWITCH_QUICK_DROP);
setLabelText(7, player_node->getPickUpTypeString(),
Input::KEY_CHANGE_PICKUP_TYPE);
- setLabelText(8, player_node->getDebugPathString(),
+ setLabelText(8, LocalPlayer::getDebugPathString(),
Input::KEY_PATHFIND);
setLabelText(9, player_node->getMagicAttackString(),
Input::KEY_SWITCH_MAGIC_ATTACK);
@@ -166,6 +166,6 @@ void StatusPopup::updateLabels() const
Input::KEY_CHANGE_IMITATION_MODE);
setLabelText(13, player_node->getAwayModeString(),
Input::KEY_AWAY);
- setLabelText(14, player_node->getCameraModeString(),
+ setLabelText(14, LocalPlayer::getCameraModeString(),
Input::KEY_CAMERA);
}
diff --git a/src/gui/widgets/namesmodel.h b/src/gui/widgets/namesmodel.h
index c64c6ea26..f70dd2571 100644
--- a/src/gui/widgets/namesmodel.h
+++ b/src/gui/widgets/namesmodel.h
@@ -43,7 +43,7 @@ class NamesModel : public gcn::ListModel
StringVect &getNames() A_WARN_UNUSED
{ return mNames; }
- size_t size() A_WARN_UNUSED
+ size_t size() const A_WARN_UNUSED
{ return mNames.size(); }
void clear()
diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp
index 62c5c38ba..80e86e66f 100644
--- a/src/gui/windows/statuswindow.cpp
+++ b/src/gui/windows/statuswindow.cpp
@@ -733,10 +733,10 @@ void StatusWindow::updateStatusBar(ProgressBar *const bar,
player_node->getQuickDropCounterString()))
.append(translateLetter2(player_node->getPickUpTypeString()))
.append(" ").append(translateLetter2(
- player_node->getDebugPathString()))
+ LocalPlayer::getDebugPathString()))
.append(" ").append(translateLetter2(
player_node->getImitationModeString()))
- .append(translateLetter2(player_node->getCameraModeString()))
+ .append(translateLetter2(LocalPlayer::getCameraModeString()))
.append(translateLetter2(player_node->getAwayModeString())));
bar->setProgress(50);