Rename clanInfo into localClan.

6 files changed, 24 insertions, 24 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2cc8313d8..84f22491b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1053,8 +1053,8 @@ SET(SRCS
     being/beingspeech.h
     being/castingeffect.cpp
     being/castingeffect.h
-    being/claninfo.cpp
-    being/claninfo.h
+    being/localclan.cpp
+    being/localclan.h
     beingequipbackend.cpp
     beingequipbackend.h
     spellmanager.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 972892ceb..95168fdb1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1022,8 +1022,8 @@ SRC = ${BASE_SRC} \
 	      being/beingspeech.h \
 	      being/castingeffect.cpp \
 	      being/castingeffect.h \
-	      being/claninfo.cpp \
-	      being/claninfo.h \
+	      being/localclan.cpp \
+	      being/localclan.h \
 	      being/localplayer.cpp \
 	      being/localplayer.h \
 	      being/mercenaryinfo.h \
diff --git a/src/being/claninfo.cpp b/src/being/localclan.cpp
index bba4fcd5e..b01c2e85e 100644
--- a/src/being/claninfo.cpp
+++ b/src/being/localclan.cpp
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "being/claninfo.h"
+#include "being/localclan.h"
 
 #include "debug.h"
 
-ClanInfo clanInfo;
+LocalClan localClan;
diff --git a/src/being/claninfo.h b/src/being/localclan.h
index 307044cb3..e8292136f 100644
--- a/src/being/claninfo.h
+++ b/src/being/localclan.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef BEING_CLANINFO_H
-#define BEING_CLANINFO_H
+#ifndef BEING_LOCALCLAN_H
+#define BEING_LOCALCLAN_H
 
 #include "enums/simpletypes/beingid.h"
 
@@ -29,9 +29,9 @@
 
 #include "localconsts.h"
 
-struct ClanInfo final
+struct LocalClan final
 {
-    ClanInfo() :
+    LocalClan() :
         allyClans(),
         antagonistClans(),
         name(),
@@ -43,7 +43,7 @@ struct ClanInfo final
     {
     }
 
-    A_DELETE_COPY(ClanInfo)
+    A_DELETE_COPY(LocalClan)
 
     void clear()
     {
@@ -67,6 +67,6 @@ struct ClanInfo final
     int totalMembers;
 };
 
-extern ClanInfo clanInfo;
+extern LocalClan localClan;
 
-#endif  // BEING_CLANINFO_H
+#endif  // BEING_LOCALCLAN_H
diff --git a/src/net/eathena/clanrecv.cpp b/src/net/eathena/clanrecv.cpp
index d70d7d876..1eebb1581 100644
--- a/src/net/eathena/clanrecv.cpp
+++ b/src/net/eathena/clanrecv.cpp
@@ -23,7 +23,7 @@
 #include "configuration.h"
 #include "logger.h"
 
-#include "being/claninfo.h"
+#include "being/localclan.h"
 
 #include "gui/widgets/tabs/chat/clantab.h"
 
@@ -42,20 +42,20 @@ namespace EAthena
 void ClanRecv::processClanInfo(Net::MessageIn &msg)
 {
     msg.readInt16("len");
-    clanInfo.id = msg.readInt32("clan id");
-    clanInfo.name = msg.readString(24, "clan name");
-    clanInfo.masterName = msg.readString(24, "master name");
-    clanInfo.mapName = msg.readString(16, "map name");
+    localClan.id = msg.readInt32("clan id");
+    localClan.name = msg.readString(24, "clan name");
+    localClan.masterName = msg.readString(24, "master name");
+    localClan.mapName = msg.readString(16, "map name");
     const int allyCount = msg.readUInt8("ally clans count");
     const int antagonistCount = msg.readUInt8("antagonist clans count");
     for (int f = 0; f < allyCount; f ++)
     {
-        clanInfo.allyClans.push_back(
+        localClan.allyClans.push_back(
             msg.readString(24, "ally clan name"));
     }
     for (int f = 0; f < antagonistCount; f ++)
     {
-        clanInfo.antagonistClans.push_back(
+        localClan.antagonistClans.push_back(
             msg.readString(24, "antagonist clan name"));
     }
     createTab();
@@ -63,8 +63,8 @@ void ClanRecv::processClanInfo(Net::MessageIn &msg)
 
 void ClanRecv::processClanOnlineCount(Net::MessageIn &msg)
 {
-    clanInfo.onlineMembers = msg.readInt16("online members count");
-    clanInfo.totalMembers = msg.readInt16("total members count");
+    localClan.onlineMembers = msg.readInt16("online members count");
+    localClan.totalMembers = msg.readInt16("total members count");
 }
 
 void ClanRecv::processClanLeave(Net::MessageIn &msg A_UNUSED)
diff --git a/src/progs/manaplus/client.cpp b/src/progs/manaplus/client.cpp
index f1273c7a1..04956381f 100644
--- a/src/progs/manaplus/client.cpp
+++ b/src/progs/manaplus/client.cpp
@@ -34,7 +34,7 @@
 #include "soundmanager.h"
 #include "spellmanager.h"
 
-#include "being/claninfo.h"
+#include "being/localclan.h"
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
 #include "being/playerrelations.h"
@@ -1986,7 +1986,7 @@ void Client::unloadData()
     ResourceManager::clearCache();
 
     loginData.clearUpdateHost();
-    clanInfo.clear();
+    localClan.clear();
     serverVersion = 0;
     packetVersion = 0;
     tmwServerVersion = 0;