From 2f768a34f72560ee8b2934228f548a4909533887 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 11 Jun 2017 01:00:01 +0300
Subject: Rename player_relations into playerRelations.

---
 src/gui/windows/chatwindow.cpp   | 6 +++---
 src/gui/windows/shopwindow.cpp   | 2 +-
 src/gui/windows/socialwindow.cpp | 4 ++--
 src/gui/windows/tradewindow.cpp  | 2 +-
 src/gui/windows/whoisonline.cpp  | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/gui/windows')

diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index 88d4d3fc5..80c24af0a 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -636,10 +636,10 @@ void ChatWindow::ignoreAllWhispers()
         WhisperTab *const tab = iter->second;
         if (tab != nullptr)
         {
-            if (player_relations.getRelation(tab->getNick())
+            if (playerRelations.getRelation(tab->getNick())
                 != Relation::IGNORED)
             {
-                player_relations.setRelation(tab->getNick(),
+                playerRelations.setRelation(tab->getNick(),
                     Relation::IGNORED);
             }
             tab->handleCommand("close", "");
@@ -1200,7 +1200,7 @@ WhisperTab *ChatWindow::addWhisperTab(const std::string &caption,
     else
     {
         ret = new WhisperTab(this, caption, nick);
-        if ((gui != nullptr) && !player_relations.isGoodName(nick))
+        if ((gui != nullptr) && !playerRelations.isGoodName(nick))
             ret->setLabelFont(gui->getSecureFont());
         mWhispers[tempNick] = ret;
         if (config.getBoolValue("showChatHistory"))
diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp
index 9f4872e62..54656a66b 100644
--- a/src/gui/windows/shopwindow.cpp
+++ b/src/gui/windows/shopwindow.cpp
@@ -260,7 +260,7 @@ void ShopWindow::action(const ActionEvent &event)
     }
     else if (eventId == "ignore")
     {
-        player_relations.ignoreTrade(mTradeNick);
+        playerRelations.ignoreTrade(mTradeNick);
         mTradeNick.clear();
     }
     else if (eventId == "announce")
diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp
index 11207d47f..b3f3317a3 100644
--- a/src/gui/windows/socialwindow.cpp
+++ b/src/gui/windows/socialwindow.cpp
@@ -143,12 +143,12 @@ void SocialWindow::postInit()
 
     enableVisibleSound(true);
     updateButtons();
-    player_relations.addListener(this);
+    playerRelations.addListener(this);
 }
 
 SocialWindow::~SocialWindow()
 {
-    player_relations.removeListener(this);
+    playerRelations.removeListener(this);
     if (mGuildAcceptDialog != nullptr)
     {
         mGuildAcceptDialog->close();
diff --git a/src/gui/windows/tradewindow.cpp b/src/gui/windows/tradewindow.cpp
index 295f60a7d..b86d86aa3 100644
--- a/src/gui/windows/tradewindow.cpp
+++ b/src/gui/windows/tradewindow.cpp
@@ -508,7 +508,7 @@ void TradeWindow::initTrade(const std::string &nick)
         }
     }
     clear();
-    if (!player_relations.isGoodName(nick))
+    if (!playerRelations.isGoodName(nick))
         setCaptionFont(gui->getSecureFont());
 }
 
diff --git a/src/gui/windows/whoisonline.cpp b/src/gui/windows/whoisonline.cpp
index e5040077a..966807e58 100644
--- a/src/gui/windows/whoisonline.cpp
+++ b/src/gui/windows/whoisonline.cpp
@@ -288,7 +288,7 @@ void WhoIsOnline::handlerPlayerRelation(const std::string &nick,
 {
     if (player == nullptr)
         return;
-    switch (player_relations.getRelation(nick))
+    switch (playerRelations.getRelation(nick))
     {
         case Relation::NEUTRAL:
         default:
-- 
cgit v1.2.3-60-g2f50