diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-10-12 12:07:17 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-10-12 12:07:17 +0300 |
commit | de8e1e4b7ad775aee03f9faf137194e38d19574b (patch) | |
tree | e1aed9d96feb5a2b40de2f84cf56d4e920f0c229 | |
parent | 708805b5df0018812f3a9feb47e37ccfc36398f2 (diff) | |
download | manaplus-de8e1e4b7ad775aee03f9faf137194e38d19574b.tar.gz manaplus-de8e1e4b7ad775aee03f9faf137194e38d19574b.tar.bz2 manaplus-de8e1e4b7ad775aee03f9faf137194e38d19574b.tar.xz manaplus-de8e1e4b7ad775aee03f9faf137194e38d19574b.zip |
Move ChatTabType into chat subdir.
-rw-r--r-- | src/actions/chat.cpp | 2 | ||||
-rw-r--r-- | src/actions/windows.cpp | 2 | ||||
-rw-r--r-- | src/gui/widgets/tabs/chat/battletab.h | 2 | ||||
-rw-r--r-- | src/gui/widgets/tabs/chat/chattab.cpp | 2 | ||||
-rw-r--r-- | src/gui/widgets/tabs/chat/chattabtype.h (renamed from src/gui/widgets/tabs/chattabtype.h) | 6 | ||||
-rw-r--r-- | src/gui/widgets/tabs/gmtab.h | 2 | ||||
-rw-r--r-- | src/gui/widgets/tabs/guildchattab.h | 2 | ||||
-rw-r--r-- | src/gui/widgets/tabs/langtab.h | 2 | ||||
-rw-r--r-- | src/gui/widgets/tabs/tradetab.h | 2 | ||||
-rw-r--r-- | src/gui/widgets/tabs/whispertab.h | 2 | ||||
-rw-r--r-- | src/net/ea/gui/guildtab.h | 2 | ||||
-rw-r--r-- | src/net/ea/gui/partytab.h | 2 |
12 files changed, 14 insertions, 14 deletions
diff --git a/src/actions/chat.cpp b/src/actions/chat.cpp index 873a5467a..d838aac06 100644 --- a/src/actions/chat.cpp +++ b/src/actions/chat.cpp @@ -31,7 +31,7 @@ #include "gui/windows/chatwindow.h" #include "gui/widgets/tabs/chat/chattab.h" -#include "gui/widgets/tabs/chattabtype.h" +#include "gui/widgets/tabs/chat/chattabtype.h" #include "net/chathandler.h" #include "net/guildhandler.h" diff --git a/src/actions/windows.cpp b/src/actions/windows.cpp index c17d14978..fae82261c 100644 --- a/src/actions/windows.cpp +++ b/src/actions/windows.cpp @@ -45,7 +45,7 @@ #include "gui/windows/updaterwindow.h" #include "gui/widgets/tabs/chat/chattab.h" -#include "gui/widgets/tabs/chattabtype.h" +#include "gui/widgets/tabs/chat/chattabtype.h" #include "debug.h" diff --git a/src/gui/widgets/tabs/chat/battletab.h b/src/gui/widgets/tabs/chat/battletab.h index 2660455d0..0d933e740 100644 --- a/src/gui/widgets/tabs/chat/battletab.h +++ b/src/gui/widgets/tabs/chat/battletab.h @@ -24,7 +24,7 @@ #define GUI_WIDGETS_TABS_CHAT_BATTLETAB_H #include "gui/widgets/tabs/chat/chattab.h" -#include "gui/widgets/tabs/chattabtype.h" +#include "gui/widgets/tabs/chat/chattabtype.h" /** * A tab for a party chat channel. diff --git a/src/gui/widgets/tabs/chat/chattab.cpp b/src/gui/widgets/tabs/chat/chattab.cpp index 0ad9bbf34..88df68774 100644 --- a/src/gui/widgets/tabs/chat/chattab.cpp +++ b/src/gui/widgets/tabs/chat/chattab.cpp @@ -40,7 +40,7 @@ #include "gui/widgets/itemlinkhandler.h" #include "gui/widgets/tabbedarea.h" -#include "gui/widgets/tabs/chattabtype.h" +#include "gui/widgets/tabs/chat/chattabtype.h" #include "input/inputmanager.h" diff --git a/src/gui/widgets/tabs/chattabtype.h b/src/gui/widgets/tabs/chat/chattabtype.h index 802b33a43..4b0af6423 100644 --- a/src/gui/widgets/tabs/chattabtype.h +++ b/src/gui/widgets/tabs/chat/chattabtype.h @@ -18,8 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef GUI_WIDGETS_TABS_CHATTABTYPE_H -#define GUI_WIDGETS_TABS_CHATTABTYPE_H +#ifndef GUI_WIDGETS_TABS_CHAT_CHATTABTYPE_H +#define GUI_WIDGETS_TABS_CHAT_CHATTABTYPE_H namespace ChatTabType { @@ -38,4 +38,4 @@ namespace ChatTabType }; } // namespace ChatTabType -#endif // GUI_WIDGETS_TABS_CHATTABTYPE_H +#endif // GUI_WIDGETS_TABS_CHAT_CHATTABTYPE_H diff --git a/src/gui/widgets/tabs/gmtab.h b/src/gui/widgets/tabs/gmtab.h index 2f0fa8c68..ebd171a5e 100644 --- a/src/gui/widgets/tabs/gmtab.h +++ b/src/gui/widgets/tabs/gmtab.h @@ -22,7 +22,7 @@ #define GUI_WIDGETS_TABS_GMTAB_H #include "gui/widgets/tabs/chat/chattab.h" -#include "gui/widgets/tabs/chattabtype.h" +#include "gui/widgets/tabs/chat/chattabtype.h" /** * A tab for whispers from a single player. diff --git a/src/gui/widgets/tabs/guildchattab.h b/src/gui/widgets/tabs/guildchattab.h index 59656068a..5a876bcd4 100644 --- a/src/gui/widgets/tabs/guildchattab.h +++ b/src/gui/widgets/tabs/guildchattab.h @@ -24,7 +24,7 @@ #define GUI_WIDGETS_TABS_GUILDCHATTAB_H #include "gui/widgets/tabs/chat/chattab.h" -#include "gui/widgets/tabs/chattabtype.h" +#include "gui/widgets/tabs/chat/chattabtype.h" /** * A tab for a guild chat channel. diff --git a/src/gui/widgets/tabs/langtab.h b/src/gui/widgets/tabs/langtab.h index 2bb1047d0..1eec0ab84 100644 --- a/src/gui/widgets/tabs/langtab.h +++ b/src/gui/widgets/tabs/langtab.h @@ -22,7 +22,7 @@ #define GUI_WIDGETS_TABS_LANGTAB_H #include "gui/widgets/tabs/chat/chattab.h" -#include "gui/widgets/tabs/chattabtype.h" +#include "gui/widgets/tabs/chat/chattabtype.h" class LangTab final : public ChatTab { diff --git a/src/gui/widgets/tabs/tradetab.h b/src/gui/widgets/tabs/tradetab.h index dd5c9eb76..10c2ee02c 100644 --- a/src/gui/widgets/tabs/tradetab.h +++ b/src/gui/widgets/tabs/tradetab.h @@ -24,7 +24,7 @@ #define GUI_WIDGETS_TABS_TRADETAB_H #include "gui/widgets/tabs/chat/chattab.h" -#include "gui/widgets/tabs/chattabtype.h" +#include "gui/widgets/tabs/chat/chattabtype.h" /** * A tab for a party chat channel. diff --git a/src/gui/widgets/tabs/whispertab.h b/src/gui/widgets/tabs/whispertab.h index 045d4bfce..57c215dd9 100644 --- a/src/gui/widgets/tabs/whispertab.h +++ b/src/gui/widgets/tabs/whispertab.h @@ -24,7 +24,7 @@ #define GUI_WIDGETS_TABS_WHISPERTAB_H #include "gui/widgets/tabs/chat/chattab.h" -#include "gui/widgets/tabs/chattabtype.h" +#include "gui/widgets/tabs/chat/chattabtype.h" /** * A tab for whispers from a single player. diff --git a/src/net/ea/gui/guildtab.h b/src/net/ea/gui/guildtab.h index ea0791b4e..01965f538 100644 --- a/src/net/ea/gui/guildtab.h +++ b/src/net/ea/gui/guildtab.h @@ -24,7 +24,7 @@ #define NET_EA_GUI_GUILDTAB_H #include "gui/widgets/tabs/chat/chattab.h" -#include "gui/widgets/tabs/chattabtype.h" +#include "gui/widgets/tabs/chat/chattabtype.h" namespace Ea { diff --git a/src/net/ea/gui/partytab.h b/src/net/ea/gui/partytab.h index f315fe8a8..e627ab842 100644 --- a/src/net/ea/gui/partytab.h +++ b/src/net/ea/gui/partytab.h @@ -24,7 +24,7 @@ #define NET_EA_GUI_PARTYTAB_H #include "gui/widgets/tabs/chat/chattab.h" -#include "gui/widgets/tabs/chattabtype.h" +#include "gui/widgets/tabs/chat/chattabtype.h" namespace Ea { |