diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-10-12 12:12:21 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-10-12 12:12:21 +0300 |
| commit | 1b989262bdce0080c83aefc258cdbdaa38648b7d (patch) | |
| tree | 4a749259b2ed021473a8b759b79b6d2bc1579413 | |
| parent | de8e1e4b7ad775aee03f9faf137194e38d19574b (diff) | |
| download | manaplus-1b989262bdce0080c83aefc258cdbdaa38648b7d.tar.gz manaplus-1b989262bdce0080c83aefc258cdbdaa38648b7d.tar.bz2 manaplus-1b989262bdce0080c83aefc258cdbdaa38648b7d.tar.xz manaplus-1b989262bdce0080c83aefc258cdbdaa38648b7d.zip | |
Move GmTab into chat subdir.
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/being/localplayer.cpp | 2 | ||||
| -rw-r--r-- | src/game.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/tabs/chat/gmtab.cpp (renamed from src/gui/widgets/tabs/gmtab.cpp) | 2 | ||||
| -rw-r--r-- | src/gui/widgets/tabs/chat/gmtab.h (renamed from src/gui/widgets/tabs/gmtab.h) | 6 | ||||
| -rw-r--r-- | src/net/ea/chathandler.cpp | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d44db537d..b99f99387 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -170,8 +170,8 @@ SET(SRCS gui/models/langlistmodel.h gui/widgets/flowcontainer.cpp gui/widgets/flowcontainer.h - gui/widgets/tabs/gmtab.cpp - gui/widgets/tabs/gmtab.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/horizontcontainer.cpp diff --git a/src/Makefile.am b/src/Makefile.am index b0d1cce89..21ac9406b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -292,8 +292,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ gui/models/langlistmodel.h \ gui/widgets/flowcontainer.cpp \ gui/widgets/flowcontainer.h \ - gui/widgets/tabs/gmtab.cpp \ - gui/widgets/tabs/gmtab.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/guitable.cpp \ diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp index e8cceadae..48be4c5bc 100644 --- a/src/being/localplayer.cpp +++ b/src/being/localplayer.cpp @@ -57,7 +57,7 @@ #include "gui/windows/socialwindow.h" #include "gui/windows/updaterwindow.h" -#include "gui/widgets/tabs/gmtab.h" +#include "gui/widgets/tabs/chat/gmtab.h" #include "gui/widgets/tabs/whispertab.h" #include "net/beinghandler.h" diff --git a/src/game.cpp b/src/game.cpp index dee43777c..5a67595b2 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -88,7 +88,7 @@ #include "gui/widgets/spellshortcutcontainer.h" #include "gui/widgets/virtshortcutcontainer.h" -#include "gui/widgets/tabs/gmtab.h" +#include "gui/widgets/tabs/chat/gmtab.h" #include "gui/widgets/tabs/langtab.h" #include "gui/widgets/tabs/tradetab.h" diff --git a/src/gui/widgets/tabs/gmtab.cpp b/src/gui/widgets/tabs/chat/gmtab.cpp index a4a4a9022..2a80b4fd3 100644 --- a/src/gui/widgets/tabs/gmtab.cpp +++ b/src/gui/widgets/tabs/chat/gmtab.cpp @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/widgets/tabs/gmtab.h" +#include "gui/widgets/tabs/chat/gmtab.h" #include "chatlogger.h" diff --git a/src/gui/widgets/tabs/gmtab.h b/src/gui/widgets/tabs/chat/gmtab.h index ebd171a5e..f71f7e14f 100644 --- a/src/gui/widgets/tabs/gmtab.h +++ b/src/gui/widgets/tabs/chat/gmtab.h @@ -18,8 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef GUI_WIDGETS_TABS_GMTAB_H -#define GUI_WIDGETS_TABS_GMTAB_H +#ifndef GUI_WIDGETS_TABS_CHAT_GMTAB_H +#define GUI_WIDGETS_TABS_CHAT_GMTAB_H #include "gui/widgets/tabs/chat/chattab.h" #include "gui/widgets/tabs/chat/chattabtype.h" @@ -51,4 +51,4 @@ class GmTab final : public ChatTab extern GmTab *gmChatTab; -#endif // GUI_WIDGETS_TABS_GMTAB_H +#endif // GUI_WIDGETS_TABS_CHAT_GMTAB_H diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp index 8ac0ce6f5..0f5ae0f36 100644 --- a/src/net/ea/chathandler.cpp +++ b/src/net/ea/chathandler.cpp @@ -33,7 +33,7 @@ #include "gui/windows/chatwindow.h" #include "gui/windows/shopwindow.h" -#include "gui/widgets/tabs/gmtab.h" +#include "gui/widgets/tabs/chat/gmtab.h" #include "net/messagein.h" #include "net/serverfeatures.h" |