diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-10-12 12:34:36 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-10-12 12:34:36 +0300 |
commit | acad79a3a1c6eeef16625738dd481d9a4d7f9b0a (patch) | |
tree | 03f3fd114d321841e0697fb896b5a06bc02f976e | |
parent | 9ea48e35faa02b095cb71f21ba250c4af2f211ab (diff) | |
download | manaverse-acad79a3a1c6eeef16625738dd481d9a4d7f9b0a.tar.gz manaverse-acad79a3a1c6eeef16625738dd481d9a4d7f9b0a.tar.bz2 manaverse-acad79a3a1c6eeef16625738dd481d9a4d7f9b0a.tar.xz manaverse-acad79a3a1c6eeef16625738dd481d9a4d7f9b0a.zip |
Move LangTab into chat subdir.
-rw-r--r-- | src/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/Makefile.am | 4 | ||||
-rw-r--r-- | src/being/being.cpp | 2 | ||||
-rw-r--r-- | src/game.cpp | 2 | ||||
-rw-r--r-- | src/gui/widgets/tabs/chat/langtab.cpp (renamed from src/gui/widgets/tabs/langtab.cpp) | 2 | ||||
-rw-r--r-- | src/gui/widgets/tabs/chat/langtab.h (renamed from src/gui/widgets/tabs/langtab.h) | 6 | ||||
-rw-r--r-- | src/gui/windows/chatwindow.cpp | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bbbaabc75..25ce36275 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -195,8 +195,8 @@ SET(SRCS gui/widgets/statuswindowattrs.h gui/widgets/label.cpp gui/widgets/label.h - gui/widgets/tabs/langtab.cpp - gui/widgets/tabs/langtab.h + gui/widgets/tabs/chat/langtab.cpp + gui/widgets/tabs/chat/langtab.h gui/widgets/layout.cpp gui/widgets/layout.h gui/widgets/layoutarray.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 15eee3d5c..03e37df22 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -319,8 +319,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ gui/widgets/statuswindowattrs.h \ gui/widgets/label.cpp \ gui/widgets/label.h \ - gui/widgets/tabs/langtab.cpp \ - gui/widgets/tabs/langtab.h \ + gui/widgets/tabs/chat/langtab.cpp \ + gui/widgets/tabs/chat/langtab.h \ gui/widgets/layout.cpp \ gui/widgets/layout.h \ gui/widgets/layoutarray.cpp \ diff --git a/src/being/being.cpp b/src/being/being.cpp index 7d054fc97..97b20ddc6 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -82,7 +82,7 @@ #include "gui/widgets/skilldata.h" #include "gui/widgets/skillinfo.h" -#include "gui/widgets/tabs/langtab.h" +#include "gui/widgets/tabs/chat/langtab.h" #include "utils/delete2.h" #include "utils/files.h" diff --git a/src/game.cpp b/src/game.cpp index 5a67595b2..bf9d2efad 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -89,7 +89,7 @@ #include "gui/widgets/virtshortcutcontainer.h" #include "gui/widgets/tabs/chat/gmtab.h" -#include "gui/widgets/tabs/langtab.h" +#include "gui/widgets/tabs/chat/langtab.h" #include "gui/widgets/tabs/tradetab.h" #include "net/generalhandler.h" diff --git a/src/gui/widgets/tabs/langtab.cpp b/src/gui/widgets/tabs/chat/langtab.cpp index 1dc5cea09..a97a46da1 100644 --- a/src/gui/widgets/tabs/langtab.cpp +++ b/src/gui/widgets/tabs/chat/langtab.cpp @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/widgets/tabs/langtab.h" +#include "gui/widgets/tabs/chat/langtab.h" #include "chatlogger.h" diff --git a/src/gui/widgets/tabs/langtab.h b/src/gui/widgets/tabs/chat/langtab.h index 1eec0ab84..e4abc68bf 100644 --- a/src/gui/widgets/tabs/langtab.h +++ b/src/gui/widgets/tabs/chat/langtab.h @@ -18,8 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef GUI_WIDGETS_TABS_LANGTAB_H -#define GUI_WIDGETS_TABS_LANGTAB_H +#ifndef GUI_WIDGETS_TABS_CHAT_LANGTAB_H +#define GUI_WIDGETS_TABS_CHAT_LANGTAB_H #include "gui/widgets/tabs/chat/chattab.h" #include "gui/widgets/tabs/chat/chattabtype.h" @@ -42,4 +42,4 @@ class LangTab final : public ChatTab extern LangTab *langChatTab; -#endif // GUI_WIDGETS_TABS_LANGTAB_H +#endif // GUI_WIDGETS_TABS_CHAT_LANGTAB_H diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index 6321c878f..40a28d6bf 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -60,7 +60,7 @@ #include "gui/widgets/itemlinkhandler.h" #include "gui/widgets/scrollarea.h" -#include "gui/widgets/tabs/langtab.h" +#include "gui/widgets/tabs/chat/langtab.h" #include "gui/widgets/tabs/tradetab.h" #include "gui/widgets/tabs/whispertab.h" |