diff options
author | Reid <reidyaro@gmail.com> | 2012-03-01 22:03:01 +0100 |
---|---|---|
committer | Reid <reidyaro@gmail.com> | 2012-03-01 22:03:01 +0100 |
commit | 490862919d79369112c75955a9c36ff8a081efd3 (patch) | |
tree | 6fe89466b9c53ba811f298174e6d787bbae71e09 /src/gui/setup_relations.cpp | |
parent | dff814619d63496acd3c4e8730b828b5d4d931fb (diff) | |
parent | d873da3e8e57480016596f714845c1bc7e712e68 (diff) | |
download | manaverse-490862919d79369112c75955a9c36ff8a081efd3.tar.gz manaverse-490862919d79369112c75955a9c36ff8a081efd3.tar.bz2 manaverse-490862919d79369112c75955a9c36ff8a081efd3.tar.xz manaverse-490862919d79369112c75955a9c36ff8a081efd3.zip |
Merge branch 'master' of gitorious.org:manaplus/manaplus
Diffstat (limited to 'src/gui/setup_relations.cpp')
-rw-r--r-- | src/gui/setup_relations.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/gui/setup_relations.cpp b/src/gui/setup_relations.cpp index 47d53620c..d9f7a362d 100644 --- a/src/gui/setup_relations.cpp +++ b/src/gui/setup_relations.cpp @@ -80,7 +80,8 @@ static const char *RELATION_NAMES[PlayerRelation::RELATIONS_NR] = class PlayerRelationListModel : public gcn::ListModel { public: - virtual ~PlayerRelationListModel() { } + virtual ~PlayerRelationListModel() + { } virtual int getNumberOfElements() { @@ -194,7 +195,7 @@ public: std::string getPlayerAt(int index) const { - if (index < 0 || index >= (signed)mPlayers->size()) + if (index < 0 || index >= static_cast<signed>(mPlayers->size())) return ""; return (*mPlayers)[index]; } @@ -211,7 +212,8 @@ protected: class IgnoreChoicesListModel : public gcn::ListModel { public: - virtual ~IgnoreChoicesListModel() { } + virtual ~IgnoreChoicesListModel() + { } virtual int getNumberOfElements() { |