diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-04-21 17:49:12 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-04-21 17:59:11 +0300 |
| commit | e787d4c803476b5d5969dd8578cb8a645a7443cb (patch) | |
| tree | 1672b7012af526b022ebb67253568c97799b723c | |
| parent | 29c335b22add00a7542f229714626df96e73530c (diff) | |
| download | plus-e787d4c803476b5d5969dd8578cb8a645a7443cb.tar.gz plus-e787d4c803476b5d5969dd8578cb8a645a7443cb.tar.bz2 plus-e787d4c803476b5d5969dd8578cb8a645a7443cb.tar.xz plus-e787d4c803476b5d5969dd8578cb8a645a7443cb.zip | |
Move chattabtype into enums directory.
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/enums/gui/chattabtype.h (renamed from src/gui/widgets/tabs/chat/chattabtype.h) | 6 | ||||
| -rw-r--r-- | src/gui/widgets/tabs/chat/chattab.h | 3 | ||||
| -rw-r--r-- | src/gui/windows/chatwindow.h | 3 |
5 files changed, 7 insertions, 9 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 55d64075c..45ef888a1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -135,7 +135,6 @@ SET(SRCS gui/widgets/characterviewnormal.h gui/widgets/characterviewsmall.cpp gui/widgets/characterviewsmall.h - gui/widgets/tabs/chat/chattabtype.h gui/widgets/tabs/debugwindowtabs.cpp gui/widgets/tabs/debugwindowtabs.h gui/widgets/tabs/chat/chattab.cpp @@ -1247,6 +1246,7 @@ SET(SRCS const/gui/chat.h gui/chatlog.h enums/gui/chatmsgtype.h + enums/gui/chattabtype.h gui/cliprect.h gui/color.cpp gui/color.h diff --git a/src/Makefile.am b/src/Makefile.am index 24c8de57b..0da76f1a0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -103,6 +103,7 @@ SRC += events/actionevent.h \ const/gui/pages.h \ gui/chatlog.h \ enums/gui/chatmsgtype.h \ + enums/gui/chattabtype.h \ gui/cliprect.h \ gui/color.h \ enums/gui/dialogtype.h \ @@ -878,7 +879,6 @@ manaplus_SOURCES += main.cpp \ gui/widgets/tabs/chat/battletab.h \ gui/widgets/tabs/chat/channeltab.cpp \ gui/widgets/tabs/chat/channeltab.h \ - gui/widgets/tabs/chat/chattabtype.h \ gui/widgets/tabs/debugwindowtabs.cpp \ gui/widgets/tabs/debugwindowtabs.h \ gui/widgets/tabs/chat/chattab.cpp \ diff --git a/src/gui/widgets/tabs/chat/chattabtype.h b/src/enums/gui/chattabtype.h index 620d64a22..54f42e6cc 100644 --- a/src/gui/widgets/tabs/chat/chattabtype.h +++ b/src/enums/gui/chattabtype.h @@ -18,8 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef GUI_WIDGETS_TABS_CHAT_CHATTABTYPE_H -#define GUI_WIDGETS_TABS_CHAT_CHATTABTYPE_H +#ifndef ENUMS_GUI_CHATTABTYPE_H +#define ENUMS_GUI_CHATTABTYPE_H namespace ChatTabType { @@ -39,4 +39,4 @@ namespace ChatTabType }; } // namespace ChatTabType -#endif // GUI_WIDGETS_TABS_CHAT_CHATTABTYPE_H +#endif // ENUMS_GUI_CHATTABTYPE_H diff --git a/src/gui/widgets/tabs/chat/chattab.h b/src/gui/widgets/tabs/chat/chattab.h index dc2062946..2d40e5769 100644 --- a/src/gui/widgets/tabs/chat/chattab.h +++ b/src/gui/widgets/tabs/chat/chattab.h @@ -24,6 +24,7 @@ #define GUI_WIDGETS_TABS_CHAT_CHATTAB_H #include "enums/gui/chatmsgtype.h" +#include "enums/gui/chattabtype.h" #include "enums/simpletypes/ignorerecord.h" #include "enums/simpletypes/online.h" @@ -33,8 +34,6 @@ #include "gui/widgets/tabs/tab.h" -#include "gui/widgets/tabs/chat/chattabtype.h" - #include "localconsts.h" class ScrollArea; diff --git a/src/gui/windows/chatwindow.h b/src/gui/windows/chatwindow.h index 49c068a0f..76ca9af02 100644 --- a/src/gui/windows/chatwindow.h +++ b/src/gui/windows/chatwindow.h @@ -24,14 +24,13 @@ #define GUI_WINDOWS_CHATWINDOW_H #include "enums/gui/chatmsgtype.h" +#include "enums/gui/chattabtype.h" #include "enums/simpletypes/ignorerecord.h" #include "enums/simpletypes/tryremovecolors.h" #include "gui/widgets/window.h" -#include "gui/widgets/tabs/chat/chattabtype.h" - #include "listeners/actionlistener.h" #include "listeners/attributelistener.h" #include "listeners/debugmessagelistener.h" |