From 2f768a34f72560ee8b2934228f548a4909533887 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 11 Jun 2017 01:00:01 +0300 Subject: Rename player_relations into playerRelations. --- src/gui/models/ignorechoiceslistmodel.h | 4 ++-- src/gui/models/playertablemodel.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/gui/models') diff --git a/src/gui/models/ignorechoiceslistmodel.h b/src/gui/models/ignorechoiceslistmodel.h index b0010df31..ef537a5c7 100644 --- a/src/gui/models/ignorechoiceslistmodel.h +++ b/src/gui/models/ignorechoiceslistmodel.h @@ -45,7 +45,7 @@ class IgnoreChoicesListModel final : public ListModel int getNumberOfElements() override final { - return CAST_S32(player_relations. + return CAST_S32(playerRelations. getPlayerIgnoreStrategies()->size()); } @@ -54,7 +54,7 @@ class IgnoreChoicesListModel final : public ListModel if (i >= getNumberOfElements() || i < 0) return "???"; - return (*player_relations.getPlayerIgnoreStrategies()) + return (*playerRelations.getPlayerIgnoreStrategies()) [i]->mDescription; } }; diff --git a/src/gui/models/playertablemodel.cpp b/src/gui/models/playertablemodel.cpp index 9c8526e0d..417fafcbc 100644 --- a/src/gui/models/playertablemodel.cpp +++ b/src/gui/models/playertablemodel.cpp @@ -95,7 +95,7 @@ void PlayerTableModel::playerRelationsUpdated() signalBeforeUpdate(); freeWidgets(); - StringVect *const player_names = player_relations.getPlayers(); + StringVect *const player_names = playerRelations.getPlayers(); delete mPlayers; mPlayers = player_names; @@ -109,7 +109,7 @@ void PlayerTableModel::playerRelationsUpdated() DropDown *const choicebox = new DropDown(this, mListModel); choicebox->setSelected(CAST_S32( - player_relations.getRelation(name))); + playerRelations.getRelation(name))); mWidgets.push_back(choicebox); } @@ -122,7 +122,7 @@ void PlayerTableModel::updateModelInRow(const int row) const getElementAt(row, RELATION_CHOICE_COLUMN)); if (choicebox == nullptr) return; - player_relations.setRelation(getPlayerAt(row), + playerRelations.setRelation(getPlayerAt(row), static_cast( choicebox->getSelected())); } -- cgit v1.2.3-70-g09d2