Fix possible conflicts between class names GuildTab, PartyTab and other.

8 files changed, 49 insertions, 49 deletions

diff --git a/manaplus.cbp b/manaplus.cbp
index d05cccd3b..992915467 100644
--- a/manaplus.cbp
+++ b/manaplus.cbp
@@ -310,8 +310,8 @@
 		<Unit filename="src\gui\widgets\emoteshortcutcontainer.h" />

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

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

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

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

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

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

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

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

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7f59135b8..49b41f906 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -137,8 +137,8 @@ SET(SRCS
     gui/widgets/emoteshortcutcontainer.h
     gui/widgets/flowcontainer.cpp
     gui/widgets/flowcontainer.h
-    gui/widgets/guildtab.cpp
-    gui/widgets/guildtab.h
+    gui/widgets/guildchattab.cpp
+    gui/widgets/guildchattab.h
     gui/widgets/horizontcontainer.cpp
     gui/widgets/horizontcontainer.h
     gui/widgets/icon.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 7d0c1634b..ca6dd6bc2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -140,8 +140,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      gui/widgets/emoteshortcutcontainer.h \
 	      gui/widgets/flowcontainer.cpp \
 	      gui/widgets/flowcontainer.h \
-	      gui/widgets/guildtab.cpp \
-	      gui/widgets/guildtab.h \
+	      gui/widgets/guildchattab.cpp \
+	      gui/widgets/guildchattab.h \
 	      gui/widgets/horizontcontainer.cpp \
 	      gui/widgets/horizontcontainer.h \
 	      gui/widgets/icon.cpp \
diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp
index aa26fa051..b517911ba 100644
--- a/src/gui/socialwindow.cpp
+++ b/src/gui/socialwindow.cpp
@@ -108,10 +108,10 @@ protected:
     AvatarListBox *mList;
 };
 
-class GuildTab : public SocialTab, public gcn::ActionListener
+class SocialGuildTab : public SocialTab, public gcn::ActionListener
 {
 public:
-    GuildTab(Guild *guild):
+    SocialGuildTab(Guild *guild):
             mGuild(guild)
     {
         setCaption(_("Guild"));
@@ -125,7 +125,7 @@ public:
         mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS);
     }
 
-    ~GuildTab()
+    ~SocialGuildTab()
     {
         delete mList;
         mList = 0;
@@ -206,10 +206,10 @@ private:
     Guild *mGuild;
 };
 
-class GuildTab2 : public SocialTab, public gcn::ActionListener
+class SocialGuildTab2 : public SocialTab, public gcn::ActionListener
 {
 public:
-    GuildTab2(Guild *guild):
+    SocialGuildTab2(Guild *guild):
               mGuild(guild)
     {
         setCaption(_("Guild"));
@@ -223,7 +223,7 @@ public:
         mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS);
     }
 
-    ~GuildTab2()
+    ~SocialGuildTab2()
     {
         delete mList;
         mList = 0;
@@ -309,10 +309,10 @@ private:
     Guild *mGuild;
 };
 
-class PartyTab : public SocialTab, public gcn::ActionListener
+class SocialPartyTab : public SocialTab, public gcn::ActionListener
 {
 public:
-    PartyTab(Party *party):
+    SocialPartyTab(Party *party):
             mParty(party)
     {
         setCaption(_("Party"));
@@ -326,7 +326,7 @@ public:
         mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS);
     }
 
-    ~PartyTab()
+    ~SocialPartyTab()
     {
         delete mList;
         mList = 0;
@@ -443,10 +443,10 @@ public:
     std::vector<Avatar*> mMembers;
 };
 
-class PlayersTab : public SocialTab
+class SocialPlayersTab : public SocialTab
 {
 public:
-    PlayersTab(std::string name)
+    SocialPlayersTab(std::string name)
     {
         mBeings = new BeingsListModal();
 
@@ -461,7 +461,7 @@ public:
         setCaption(name);
     }
 
-    ~PlayersTab()
+    ~SocialPlayersTab()
     {
         delete mList;
         mList = 0;
@@ -608,10 +608,10 @@ private:
 };
 
 
-class NavigationTab : public SocialTab
+class SocialNavigationTab : public SocialTab
 {
 public:
-    NavigationTab()
+    SocialNavigationTab()
     {
         mBeings = new BeingsListModal();
 
@@ -625,7 +625,7 @@ public:
 
     }
 
-    ~NavigationTab()
+    ~SocialNavigationTab()
     {
         delete mList;
         mList = 0;
@@ -886,10 +886,10 @@ protected:
 };
 
 
-class AttackTab : public SocialTab
+class SocialAttackTab : public SocialTab
 {
 public:
-    AttackTab()
+    SocialAttackTab()
     {
         mBeings = new BeingsListModal();
 
@@ -902,7 +902,7 @@ public:
         setCaption(_("Atk"));
     }
 
-    ~AttackTab()
+    ~SocialAttackTab()
     {
         delete mList;
         mList = 0;
@@ -1149,15 +1149,15 @@ SocialWindow::SocialWindow() :
 
     loadWindowState();
 
-    mPlayers = new PlayersTab("P");
+    mPlayers = new SocialPlayersTab("P");
     mTabs->addTab(mPlayers, mPlayers->mScroll);
 
-    mNavigation = new NavigationTab();
+    mNavigation = new SocialNavigationTab();
     mTabs->addTab(mNavigation, mNavigation->mScroll);
 
     if (config.getBoolValue("enableAttackFilter"))
     {
-        mAttackFilter = new AttackTab();
+        mAttackFilter = new SocialAttackTab();
         mTabs->addTab(mAttackFilter, mAttackFilter->mScroll);
     }
     else
@@ -1211,9 +1211,9 @@ bool SocialWindow::addTab(Guild *guild)
 
     SocialTab *tab = 0;
     if (guild->getServerGuild())
-        tab = new GuildTab(guild);
+        tab = new SocialGuildTab(guild);
     else
-        tab = new GuildTab2(guild);
+        tab = new SocialGuildTab2(guild);
 
     mGuilds[guild] = tab;
     mTabs->addTab(tab, tab->mScroll);
@@ -1243,7 +1243,7 @@ bool SocialWindow::addTab(Party *party)
     if (mParties.find(party) != mParties.end())
         return false;
 
-    PartyTab *tab = new PartyTab(party);
+    SocialPartyTab *tab = new SocialPartyTab(party);
     mParties[party] = tab;
 
     mTabs->addTab(tab, tab->mScroll);
@@ -1556,7 +1556,7 @@ void SocialWindow::updatePortals()
 void SocialWindow::updatePortalNames()
 {
     if (mNavigation)
-        static_cast<NavigationTab*>(mNavigation)->updateNames();
+        static_cast<SocialNavigationTab*>(mNavigation)->updateNames();
 }
 
 void SocialWindow::selectPortal(unsigned num)
@@ -1568,7 +1568,7 @@ void SocialWindow::selectPortal(unsigned num)
 int SocialWindow::getPortalIndex(int x, int y)
 {
     if (mNavigation)
-        return static_cast<NavigationTab*>(mNavigation)->getPortalIndex(x, y);
+        return static_cast<SocialNavigationTab*>(mNavigation)->getPortalIndex(x, y);
     else
         return -1;
 }
@@ -1576,13 +1576,13 @@ int SocialWindow::getPortalIndex(int x, int y)
 void SocialWindow::addPortal(int x, int y)
 {
     if (mNavigation)
-        static_cast<NavigationTab*>(mNavigation)->addPortal(x, y);
+        static_cast<SocialNavigationTab*>(mNavigation)->addPortal(x, y);
 }
 
 void SocialWindow::removePortal(int x, int y)
 {
     if (mNavigation)
-        static_cast<NavigationTab*>(mNavigation)->removePortal(x, y);
+        static_cast<SocialNavigationTab*>(mNavigation)->removePortal(x, y);
 }
 
 void SocialWindow::nextTab()
diff --git a/src/gui/widgets/guildtab.cpp b/src/gui/widgets/guildchattab.cpp
index f4288e228..0d40506dd 100644
--- a/src/gui/widgets/guildtab.cpp
+++ b/src/gui/widgets/guildchattab.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/widgets/guildtab.h"
+#include "gui/widgets/guildchattab.h"
 
 #include "chatlogger.h"
 #include "commandhandler.h"
@@ -39,17 +39,17 @@
 
 #include "debug.h"
 
-GuildTab::GuildTab() :
+GuildChatTab::GuildChatTab() :
     ChatTab(_("Guild"))
 {
     setTabColor(&Theme::getThemeColor(Theme::GUILD_CHAT_TAB));
 }
 
-GuildTab::~GuildTab()
+GuildChatTab::~GuildChatTab()
 {
 }
 
-bool GuildTab::handleCommand(const std::string &type, const std::string &args)
+bool GuildChatTab::handleCommand(const std::string &type, const std::string &args)
 {
     if (type == "help")
     {
@@ -92,7 +92,7 @@ bool GuildTab::handleCommand(const std::string &type, const std::string &args)
     return true;
 }
 
-void GuildTab::handleInput(const std::string &msg)
+void GuildChatTab::handleInput(const std::string &msg)
 {
     if (!guildManager)
         return;
@@ -103,7 +103,7 @@ void GuildTab::handleInput(const std::string &msg)
         guildManager->chat(msg);
 }
 
-void GuildTab::showHelp()
+void GuildChatTab::showHelp()
 {
     chatLog(_("/help > Display this help."));
     chatLog(_("/invite > Invite a player to your guild"));
@@ -111,7 +111,7 @@ void GuildTab::showHelp()
     chatLog(_("/kick > Kick some one from the guild you are in"));
 }
 
-void GuildTab::getAutoCompleteList(std::vector<std::string> &names) const
+void GuildChatTab::getAutoCompleteList(std::vector<std::string> &names) const
 {
     if (!guildManager)
         return;
@@ -120,7 +120,7 @@ void GuildTab::getAutoCompleteList(std::vector<std::string> &names) const
     names.push_back("/notice ");
 }
 
-void GuildTab::saveToLogFile(std::string &msg)
+void GuildChatTab::saveToLogFile(std::string &msg)
 {
     if (chatLogger)
         chatLogger->log("#Guild", msg);
diff --git a/src/gui/widgets/guildtab.h b/src/gui/widgets/guildchattab.h
index a7f0aa766..4f5ee3a8e 100644
--- a/src/gui/widgets/guildtab.h
+++ b/src/gui/widgets/guildchattab.h
@@ -28,12 +28,12 @@
 /**
  * A tab for a guild chat channel.
  */
-class GuildTab : public ChatTab
+class GuildChatTab : public ChatTab
 {
     public:
-        GuildTab();
+        GuildChatTab();
 
-        ~GuildTab();
+        ~GuildChatTab();
 
         bool handleCommand(const std::string &type, const std::string &args);
 
diff --git a/src/guildmanager.cpp b/src/guildmanager.cpp
index 22b9de5a1..624193698 100644
--- a/src/guildmanager.cpp
+++ b/src/guildmanager.cpp
@@ -28,7 +28,7 @@
 
 #include "gui/socialwindow.h"
 
-#include "gui/widgets/guildtab.h"
+#include "gui/widgets/guildchattab.h"
 
 #include "net/chathandler.h"
 #include "net/net.h"
@@ -172,7 +172,7 @@ void GuildManager::createTab(Guild *guild)
 {
     if (!mTab)
     {
-        mTab = new GuildTab();
+        mTab = new GuildChatTab();
         mTab->loadFromLogFile("#Guild");
         if (player_node)
             player_node->addGuild(guild);
diff --git a/src/guildmanager.h b/src/guildmanager.h
index 177cec12a..c89cba0a6 100644
--- a/src/guildmanager.h
+++ b/src/guildmanager.h
@@ -28,7 +28,7 @@
 #include <vector>
 
 class Guild;
-class GuildTab;
+class GuildChatTab;
 
 class GuildManager
 {
@@ -81,7 +81,7 @@ class GuildManager
         bool mGotName;
         bool mHavePower;
         std::vector<std::string> mTempList;
-        GuildTab *mTab;
+        GuildChatTab *mTab;
         bool mRequest;
 };