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

2 files changed, 11 insertions, 11 deletions

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);