summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-10-12 12:32:31 +0300
committerAndrei Karas <akaras@inbox.ru>2014-10-12 12:32:31 +0300
commit9ea48e35faa02b095cb71f21ba250c4af2f211ab (patch)
treeeed491f2fdf200620efc5688162ba2300884c103 /src
parent1b989262bdce0080c83aefc258cdbdaa38648b7d (diff)
downloadplus-9ea48e35faa02b095cb71f21ba250c4af2f211ab.tar.gz
plus-9ea48e35faa02b095cb71f21ba250c4af2f211ab.tar.bz2
plus-9ea48e35faa02b095cb71f21ba250c4af2f211ab.tar.xz
plus-9ea48e35faa02b095cb71f21ba250c4af2f211ab.zip
Move GuildChatTab into chat subdir.
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt4
-rw-r--r--src/Makefile.am4
-rw-r--r--src/gui/widgets/tabs/chat/guildchattab.cpp (renamed from src/gui/widgets/tabs/guildchattab.cpp)2
-rw-r--r--src/gui/widgets/tabs/chat/guildchattab.h (renamed from src/gui/widgets/tabs/guildchattab.h)6
-rw-r--r--src/guildmanager.cpp2
5 files changed, 9 insertions, 9 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b99f99387..bbbaabc75 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -172,8 +172,8 @@ SET(SRCS
gui/widgets/flowcontainer.h
gui/widgets/tabs/chat/gmtab.cpp
gui/widgets/tabs/chat/gmtab.h
- gui/widgets/tabs/guildchattab.cpp
- gui/widgets/tabs/guildchattab.h
+ gui/widgets/tabs/chat/guildchattab.cpp
+ gui/widgets/tabs/chat/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 21ac9406b..15eee3d5c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -294,8 +294,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
gui/widgets/flowcontainer.h \
gui/widgets/tabs/chat/gmtab.cpp \
gui/widgets/tabs/chat/gmtab.h \
- gui/widgets/tabs/guildchattab.cpp \
- gui/widgets/tabs/guildchattab.h \
+ gui/widgets/tabs/chat/guildchattab.cpp \
+ gui/widgets/tabs/chat/guildchattab.h \
gui/widgets/guitable.cpp \
gui/widgets/guitable.h \
gui/widgets/horizontcontainer.cpp \
diff --git a/src/gui/widgets/tabs/guildchattab.cpp b/src/gui/widgets/tabs/chat/guildchattab.cpp
index 933dc69b5..8a261c6de 100644
--- a/src/gui/widgets/tabs/guildchattab.cpp
+++ b/src/gui/widgets/tabs/chat/guildchattab.cpp
@@ -20,7 +20,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "gui/widgets/tabs/guildchattab.h"
+#include "gui/widgets/tabs/chat/guildchattab.h"
#include "chatlogger.h"
#include "configuration.h"
diff --git a/src/gui/widgets/tabs/guildchattab.h b/src/gui/widgets/tabs/chat/guildchattab.h
index 5a876bcd4..3af652928 100644
--- a/src/gui/widgets/tabs/guildchattab.h
+++ b/src/gui/widgets/tabs/chat/guildchattab.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef GUI_WIDGETS_TABS_GUILDCHATTAB_H
-#define GUI_WIDGETS_TABS_GUILDCHATTAB_H
+#ifndef GUI_WIDGETS_TABS_CHAT_GUILDCHATTAB_H
+#define GUI_WIDGETS_TABS_CHAT_GUILDCHATTAB_H
#include "gui/widgets/tabs/chat/chattab.h"
#include "gui/widgets/tabs/chat/chattabtype.h"
@@ -59,4 +59,4 @@ class GuildChatTab final : public ChatTab,
void getAutoCompleteCommands(StringVect &names) const override final;
};
-#endif // GUI_WIDGETS_TABS_GUILDCHATTAB_H
+#endif // GUI_WIDGETS_TABS_CHAT_GUILDCHATTAB_H
diff --git a/src/guildmanager.cpp b/src/guildmanager.cpp
index bfc6ab1d8..0bde0b5bb 100644
--- a/src/guildmanager.cpp
+++ b/src/guildmanager.cpp
@@ -31,7 +31,7 @@
#include "gui/windows/chatwindow.h"
#include "gui/windows/socialwindow.h"
-#include "gui/widgets/tabs/guildchattab.h"
+#include "gui/widgets/tabs/chat/guildchattab.h"
#include "net/chathandler.h"
#include "net/packetlimiter.h"