diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-04-12 18:39:00 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-04-12 18:39:00 +0300 |
| commit | 351821c1f18f9285be58df0a05339936311f6490 (patch) | |
| tree | 47a60cad4f61f63c5ac2faf98dcae24760d7fe11 /src/gui/setup_relations.cpp | |
| parent | e50632a83a3c679cffd372656277a304d5d853f8 (diff) | |
| download | manaplus-351821c1f18f9285be58df0a05339936311f6490.tar.gz manaplus-351821c1f18f9285be58df0a05339936311f6490.tar.bz2 manaplus-351821c1f18f9285be58df0a05339936311f6490.tar.xz manaplus-351821c1f18f9285be58df0a05339936311f6490.zip | |
first part of style fixed after cpplint checks.
Diffstat (limited to 'src/gui/setup_relations.cpp')
| -rw-r--r-- | src/gui/setup_relations.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/gui/setup_relations.cpp b/src/gui/setup_relations.cpp index 77aa3b1b9..562e86e6f 100644 --- a/src/gui/setup_relations.cpp +++ b/src/gui/setup_relations.cpp @@ -40,7 +40,7 @@ #include "utils/dtor.h" #include "utils/gettext.h" -static const int COLUMNS_NR = 2; // name plus listbox +static const int COLUMNS_NR = 2; // name plus listbox static const int NAME_COLUMN = 0; static const unsigned int RELATION_CHOICE_COLUMN = 1; @@ -279,7 +279,7 @@ Setup_Relations::Setup_Relations(const Widget2 *const widget) : mIgnoreActionChoicesBox->setActionEventId(ACTION_STRATEGY); mIgnoreActionChoicesBox->addActionListener(this); - int ignore_strategy_index = 0; // safe default + int ignore_strategy_index = 0; // safe default if (player_relations.getPlayerIgnoreStrategy()) { @@ -330,7 +330,6 @@ void Setup_Relations::reset() if ((*player_relations.getPlayerIgnoreStrategies())[i] == player_relations.getPlayerIgnoreStrategy()) { - selection = static_cast<int>(i); break; } @@ -377,7 +376,6 @@ void Setup_Relations::action(const gcn::ActionEvent &event) mPlayerTableModel->updateModelInRow(row); player_relations.addListener(this); - } else if (eventId == ACTION_DELETE) { @@ -417,7 +415,7 @@ void Setup_Relations::updateAll() mPlayerTable->setModel(model); delete mPlayerTableModel; mPlayerTableModel = model; - int ignore_strategy_index = 0; // safe default + int ignore_strategy_index = 0; // safe default if (player_relations.getPlayerIgnoreStrategy()) { |