diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-08-28 02:48:00 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-08-28 03:26:05 +0300 |
| commit | 2dc730f9aba84fc9fe684fd2af9864df97580502 (patch) | |
| tree | c1baebef66c9f8dbfc74b871c091d62d05085f12 /src/guildmanager.cpp | |
| parent | 106180f42f536f4b898a72f36af1b2be28d1a8ed (diff) | |
| download | mv-2dc730f9aba84fc9fe684fd2af9864df97580502.tar.gz mv-2dc730f9aba84fc9fe684fd2af9864df97580502.tar.bz2 mv-2dc730f9aba84fc9fe684fd2af9864df97580502.tar.xz mv-2dc730f9aba84fc9fe684fd2af9864df97580502.zip | |
Fix possible conflicts between class names GuildTab, PartyTab and other.
Diffstat (limited to 'src/guildmanager.cpp')
| -rw-r--r-- | src/guildmanager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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); |