Rename setup_players to setup_relations.

6 files changed, 25 insertions, 25 deletions

diff --git a/manaplus.cbp b/manaplus.cbp
index 538555c7b..8c4028aaf 100644
--- a/manaplus.cbp
+++ b/manaplus.cbp
@@ -236,8 +236,8 @@
 		<Unit filename="src\gui\setup_other.h" />

 		<Unit filename="src\gui\setup_perfomance.cpp" />

 		<Unit filename="src\gui\setup_perfomance.h" />

-		<Unit filename="src\gui\setup_players.cpp" />

-		<Unit filename="src\gui\setup_players.h" />

+		<Unit filename="src\gui\setup_relations.cpp" />

+		<Unit filename="src\gui\setup_relations.h" />

 		<Unit filename="src\gui\setup_theme.cpp" />

 		<Unit filename="src\gui\setup_theme.h" />

 		<Unit filename="src\gui\setup_video.cpp" />

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ff9c75770..2e05d5c69 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -317,8 +317,8 @@ SET(SRCS
     gui/setup_keyboard.h
     gui/setup_perfomance.cpp
     gui/setup_perfomance.h
-    gui/setup_players.cpp
-    gui/setup_players.h
+    gui/setup_relations.cpp
+    gui/setup_relations.h
     gui/setup_video.cpp
     gui/setup_video.h
     gui/sdlfont.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index ba04b5f2b..3871825e0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -320,8 +320,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      gui/setup_keyboard.h \
 	      gui/setup_perfomance.cpp \
 	      gui/setup_perfomance.h \
-	      gui/setup_players.cpp \
-	      gui/setup_players.h \
+	      gui/setup_relations.cpp \
+	      gui/setup_relations.h \
 	      gui/setup_video.cpp \
 	      gui/setup_video.h \
 	      gui/sdlfont.cpp \
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index 129914ad8..e45bbb571 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -34,7 +34,7 @@
 #include "gui/setup_theme.h"
 #include "gui/setup_keyboard.h"
 #include "gui/setup_perfomance.h"
-#include "gui/setup_players.h"
+#include "gui/setup_relations.h"
 #include "gui/setup_video.h"
 
 #include "gui/widgets/button.h"
@@ -94,7 +94,7 @@ Setup::Setup():
     mTabs.push_back(new Setup_Keyboard);
     mTabs.push_back(new Setup_Colors);
     mTabs.push_back(new Setup_Chat);
-    mTabs.push_back(new Setup_Players);
+    mTabs.push_back(new Setup_Relations);
     mTabs.push_back(new Setup_Theme);
     mTabs.push_back(new Setup_Other);
 
diff --git a/src/gui/setup_players.cpp b/src/gui/setup_relations.cpp
index 67ec053ea..04bfa2343 100644
--- a/src/gui/setup_players.cpp
+++ b/src/gui/setup_relations.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/setup_players.h"
+#include "gui/setup_relations.h"
 
 #include "actorspritemanager.h"
 #include "configuration.h"
@@ -238,7 +238,7 @@ public:
 #define ACTION_EDIT_UNSECURE "edit unsecure"
 #define ACTION_EDIT_UNSECURE_OK "edit unsecure ok"
 
-Setup_Players::Setup_Players():
+Setup_Relations::Setup_Relations():
     mPlayerTableTitleModel(new StaticTableModel(1, COLUMNS_NR)),
     mPlayerTableModel(new PlayerTableModel),
     mPlayerTable(new GuiTable(mPlayerTableModel)),
@@ -264,7 +264,7 @@ Setup_Players::Setup_Players():
     mShowPlayersStatus(config.getBoolValue("showPlayersStatus")),
     mEditDialog(0)
 {
-    setName(_("Players"));
+    setName(_("Relations"));
 
     mPlayerTable->setOpaque(false);
 
@@ -374,7 +374,7 @@ Setup_Players::Setup_Players():
     setDimension(gcn::Rectangle(0, 0, 500, 350));
 }
 
-Setup_Players::~Setup_Players()
+Setup_Relations::~Setup_Relations()
 {
     player_relations.removeListener(this);
     delete mIgnoreActionChoicesModel;
@@ -382,7 +382,7 @@ Setup_Players::~Setup_Players()
 }
 
 
-void Setup_Players::reset()
+void Setup_Relations::reset()
 {
     // We now have to search through the list of ignore choices to find the
     // current selection. We could use an index into the table of config
@@ -402,7 +402,7 @@ void Setup_Players::reset()
     mIgnoreActionChoicesBox->setSelected(selection);
 }
 
-void Setup_Players::apply()
+void Setup_Relations::apply()
 {
     player_relations.store();
 
@@ -431,7 +431,7 @@ void Setup_Players::apply()
         player_node->setCheckNameSetting(true);
 }
 
-void Setup_Players::cancel()
+void Setup_Relations::cancel()
 {
     mWhisperTab = config.getBoolValue("whispertab");
     mWhisperTabCheckBox->setSelected(mWhisperTab);
@@ -453,7 +453,7 @@ void Setup_Players::cancel()
     mShowPlayersStatusCheckBox->setSelected(mShowPlayersStatus);
 }
 
-void Setup_Players::action(const gcn::ActionEvent &event)
+void Setup_Relations::action(const gcn::ActionEvent &event)
 {
     if (event.getId() == ACTION_TABLE)
     {
@@ -542,7 +542,7 @@ void Setup_Players::action(const gcn::ActionEvent &event)
     }
 }
 
-void Setup_Players::updatedPlayer(const std::string &name A_UNUSED)
+void Setup_Relations::updatedPlayer(const std::string &name A_UNUSED)
 {
     mPlayerTableModel->playerRelationsUpdated();
     mDefaultTrading->setSelected(
@@ -553,7 +553,7 @@ void Setup_Players::updatedPlayer(const std::string &name A_UNUSED)
         player_node->updateName();
 }
 
-void Setup_Players::updateAll()
+void Setup_Relations::updateAll()
 {
     PlayerTableModel *model = new PlayerTableModel();
     mPlayerTable->setModel(model);
@@ -572,10 +572,10 @@ void Setup_Players::updateAll()
     mIgnoreActionChoicesBox->adjustHeight();
     reset();
 }
-void Setup_Players::externalUpdated()
+void Setup_Relations::externalUpdated()
 {
     mDefaultTrading->setSelected(
         player_relations.getDefault() & PlayerRelation::TRADE);
     mDefaultWhisper->setSelected(
         player_relations.getDefault() & PlayerRelation::WHISPER);
-}
\ No newline at end of file
+}
diff --git a/src/gui/setup_players.h b/src/gui/setup_relations.h
index 9f35d1600..eab3c7661 100644
--- a/src/gui/setup_players.h
+++ b/src/gui/setup_relations.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_SETUP_PLAYERS_H
-#define GUI_SETUP_PLAYERS_H
+#ifndef GUI_SETUP_RELATIONS_H
+#define GUI_SETUP_RELATIONS_H
 
 #include "guichanfwd.h"
 #include "playerrelations.h"
@@ -41,12 +41,12 @@ class GuiTable;
 class PlayerTableModel;
 class StaticTableModel;
 
-class Setup_Players : public SetupTab,
+class Setup_Relations : public SetupTab,
                       public PlayerRelationsListener
 {
 public:
-    Setup_Players();
-    virtual ~Setup_Players();
+    Setup_Relations();
+    virtual ~Setup_Relations();
 
     void apply();
     void cancel();