diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-10-12 12:01:08 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-10-12 12:01:08 +0300 |
commit | 708805b5df0018812f3a9feb47e37ccfc36398f2 (patch) | |
tree | 11eac0c17f8fc58cd4a4c00c1a7b7c05ebbcf867 /src/gui | |
parent | 2efb18fd64cb1bbc4cebe3141dce5c7e1db14628 (diff) | |
download | manaverse-708805b5df0018812f3a9feb47e37ccfc36398f2.tar.gz manaverse-708805b5df0018812f3a9feb47e37ccfc36398f2.tar.bz2 manaverse-708805b5df0018812f3a9feb47e37ccfc36398f2.tar.xz manaverse-708805b5df0018812f3a9feb47e37ccfc36398f2.zip |
Move ChatTab into chat subdir.
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/popups/popupmenu.cpp | 3 | ||||
-rw-r--r-- | src/gui/widgets/tabs/chat/battletab.h | 2 | ||||
-rw-r--r-- | src/gui/widgets/tabs/chat/chattab.cpp (renamed from src/gui/widgets/tabs/chattab.cpp) | 2 | ||||
-rw-r--r-- | src/gui/widgets/tabs/chat/chattab.h (renamed from src/gui/widgets/tabs/chattab.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/gui/windows/npcpostdialog.cpp | 2 | ||||
-rw-r--r-- | src/gui/windows/socialwindow.cpp | 3 | ||||
-rw-r--r-- | src/gui/windows/tradewindow.cpp | 2 |
12 files changed, 16 insertions, 14 deletions
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp index 4771e4209..fd7b2df50 100644 --- a/src/gui/popups/popupmenu.cpp +++ b/src/gui/popups/popupmenu.cpp @@ -59,12 +59,13 @@ #include "gui/widgets/button.h" #include "gui/widgets/browserbox.h" -#include "gui/widgets/tabs/chattab.h" #include "gui/widgets/progressbar.h" #include "gui/widgets/scrollarea.h" #include "gui/widgets/textfield.h" #include "gui/widgets/tabs/whispertab.h" +#include "gui/widgets/tabs/chat/chattab.h" + #include "net/adminhandler.h" #include "net/beinghandler.h" #include "net/buysellhandler.h" diff --git a/src/gui/widgets/tabs/chat/battletab.h b/src/gui/widgets/tabs/chat/battletab.h index f156dbfda..2660455d0 100644 --- a/src/gui/widgets/tabs/chat/battletab.h +++ b/src/gui/widgets/tabs/chat/battletab.h @@ -23,7 +23,7 @@ #ifndef GUI_WIDGETS_TABS_CHAT_BATTLETAB_H #define GUI_WIDGETS_TABS_CHAT_BATTLETAB_H -#include "gui/widgets/tabs/chattab.h" +#include "gui/widgets/tabs/chat/chattab.h" #include "gui/widgets/tabs/chattabtype.h" /** diff --git a/src/gui/widgets/tabs/chattab.cpp b/src/gui/widgets/tabs/chat/chattab.cpp index fe4bd9187..0ad9bbf34 100644 --- a/src/gui/widgets/tabs/chattab.cpp +++ b/src/gui/widgets/tabs/chat/chattab.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/widgets/tabs/chattab.h" +#include "gui/widgets/tabs/chat/chattab.h" #include "chatlogger.h" #include "configuration.h" diff --git a/src/gui/widgets/tabs/chattab.h b/src/gui/widgets/tabs/chat/chattab.h index 1cfdedbbf..055c0a3e6 100644 --- a/src/gui/widgets/tabs/chattab.h +++ b/src/gui/widgets/tabs/chat/chattab.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef GUI_WIDGETS_TABS_CHATTAB_H -#define GUI_WIDGETS_TABS_CHATTAB_H +#ifndef GUI_WIDGETS_TABS_CHAT_CHATTAB_H +#define GUI_WIDGETS_TABS_CHAT_CHATTAB_H #include "gui/chatmsgtype.h" @@ -195,4 +195,4 @@ class ChatTab notfinal : public Tab extern ChatTab *localChatTab; extern ChatTab *debugChatTab; -#endif // GUI_WIDGETS_TABS_CHATTAB_H +#endif // GUI_WIDGETS_TABS_CHAT_CHATTAB_H diff --git a/src/gui/widgets/tabs/gmtab.h b/src/gui/widgets/tabs/gmtab.h index ffe738523..2f0fa8c68 100644 --- a/src/gui/widgets/tabs/gmtab.h +++ b/src/gui/widgets/tabs/gmtab.h @@ -21,7 +21,7 @@ #ifndef GUI_WIDGETS_TABS_GMTAB_H #define GUI_WIDGETS_TABS_GMTAB_H -#include "gui/widgets/tabs/chattab.h" +#include "gui/widgets/tabs/chat/chattab.h" #include "gui/widgets/tabs/chattabtype.h" /** diff --git a/src/gui/widgets/tabs/guildchattab.h b/src/gui/widgets/tabs/guildchattab.h index 41c06636c..59656068a 100644 --- a/src/gui/widgets/tabs/guildchattab.h +++ b/src/gui/widgets/tabs/guildchattab.h @@ -23,7 +23,7 @@ #ifndef GUI_WIDGETS_TABS_GUILDCHATTAB_H #define GUI_WIDGETS_TABS_GUILDCHATTAB_H -#include "gui/widgets/tabs/chattab.h" +#include "gui/widgets/tabs/chat/chattab.h" #include "gui/widgets/tabs/chattabtype.h" /** diff --git a/src/gui/widgets/tabs/langtab.h b/src/gui/widgets/tabs/langtab.h index 49c9c68a0..2bb1047d0 100644 --- a/src/gui/widgets/tabs/langtab.h +++ b/src/gui/widgets/tabs/langtab.h @@ -21,7 +21,7 @@ #ifndef GUI_WIDGETS_TABS_LANGTAB_H #define GUI_WIDGETS_TABS_LANGTAB_H -#include "gui/widgets/tabs/chattab.h" +#include "gui/widgets/tabs/chat/chattab.h" #include "gui/widgets/tabs/chattabtype.h" class LangTab final : public ChatTab diff --git a/src/gui/widgets/tabs/tradetab.h b/src/gui/widgets/tabs/tradetab.h index 9bcaa6275..dd5c9eb76 100644 --- a/src/gui/widgets/tabs/tradetab.h +++ b/src/gui/widgets/tabs/tradetab.h @@ -23,7 +23,7 @@ #ifndef GUI_WIDGETS_TABS_TRADETAB_H #define GUI_WIDGETS_TABS_TRADETAB_H -#include "gui/widgets/tabs/chattab.h" +#include "gui/widgets/tabs/chat/chattab.h" #include "gui/widgets/tabs/chattabtype.h" /** diff --git a/src/gui/widgets/tabs/whispertab.h b/src/gui/widgets/tabs/whispertab.h index 8a315a7c3..045d4bfce 100644 --- a/src/gui/widgets/tabs/whispertab.h +++ b/src/gui/widgets/tabs/whispertab.h @@ -23,7 +23,7 @@ #ifndef GUI_WIDGETS_TABS_WHISPERTAB_H #define GUI_WIDGETS_TABS_WHISPERTAB_H -#include "gui/widgets/tabs/chattab.h" +#include "gui/widgets/tabs/chat/chattab.h" #include "gui/widgets/tabs/chattabtype.h" /** diff --git a/src/gui/windows/npcpostdialog.cpp b/src/gui/windows/npcpostdialog.cpp index dfd8b7041..fefa8103f 100644 --- a/src/gui/windows/npcpostdialog.cpp +++ b/src/gui/windows/npcpostdialog.cpp @@ -30,7 +30,7 @@ #include "gui/widgets/textfield.h" #include "gui/widgets/scrollarea.h" -#include "gui/widgets/tabs/chattab.h" +#include "gui/widgets/tabs/chat/chattab.h" #include "net/npchandler.h" diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp index 536124379..6790c26ab 100644 --- a/src/gui/windows/socialwindow.cpp +++ b/src/gui/windows/socialwindow.cpp @@ -40,7 +40,6 @@ #include "gui/widgets/scrollarea.h" #include "gui/widgets/tabbedarea.h" -#include "gui/widgets/tabs/chattab.h" #include "gui/widgets/tabs/socialattacktab.h" #include "gui/widgets/tabs/socialfriendstab.h" #include "gui/widgets/tabs/socialguildtab.h" @@ -50,6 +49,8 @@ #include "gui/widgets/tabs/socialpickuptab.h" #include "gui/widgets/tabs/socialplayerstab.h" +#include "gui/widgets/tabs/chat/chattab.h" + #include "gui/popups/createpartypopup.h" #include "net/serverfeatures.h" diff --git a/src/gui/windows/tradewindow.cpp b/src/gui/windows/tradewindow.cpp index 857ace024..a3a6781ef 100644 --- a/src/gui/windows/tradewindow.cpp +++ b/src/gui/windows/tradewindow.cpp @@ -49,7 +49,7 @@ #include "gui/widgets/scrollarea.h" #include "gui/widgets/textfield.h" -#include "gui/widgets/tabs/chattab.h" +#include "gui/widgets/tabs/chat/chattab.h" #include "net/tradehandler.h" |