diff options
Diffstat (limited to 'src')
28 files changed, 34 insertions, 32 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a881127dd..d44db537d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -131,11 +131,11 @@ SET(SRCS gui/widgets/characterviewnormal.h gui/widgets/characterviewsmall.cpp gui/widgets/characterviewsmall.h - gui/widgets/tabs/chattab.cpp - gui/widgets/tabs/chattab.h gui/widgets/tabs/chattabtype.h gui/widgets/tabs/debugwindowtabs.cpp gui/widgets/tabs/debugwindowtabs.h + gui/widgets/tabs/chat/chattab.cpp + gui/widgets/tabs/chat/chattab.h gui/widgets/chatinput.h gui/widgets/checkbox.cpp gui/widgets/checkbox.h diff --git a/src/Makefile.am b/src/Makefile.am index d936dd918..b0d1cce89 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -253,11 +253,11 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ gui/widgets/characterviewnormal.h \ gui/widgets/characterviewsmall.cpp \ gui/widgets/characterviewsmall.h \ - gui/widgets/tabs/chattab.cpp \ - gui/widgets/tabs/chattab.h \ gui/widgets/tabs/chattabtype.h \ gui/widgets/tabs/debugwindowtabs.cpp \ gui/widgets/tabs/debugwindowtabs.h \ + gui/widgets/tabs/chat/chattab.cpp \ + gui/widgets/tabs/chat/chattab.h \ gui/widgets/chatinput.h \ gui/widgets/checkbox.cpp \ gui/widgets/checkbox.h \ diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp index b2a455a8d..924fac801 100644 --- a/src/actions/actions.cpp +++ b/src/actions/actions.cpp @@ -54,7 +54,7 @@ #include "gui/windows/shopwindow.h" #include "gui/windows/shortcutwindow.h" -#include "gui/widgets/tabs/chattab.h" +#include "gui/widgets/tabs/chat/chattab.h" #include "render/graphics.h" #if defined USE_OPENGL diff --git a/src/actions/chat.cpp b/src/actions/chat.cpp index 122dd7dbe..873a5467a 100644 --- a/src/actions/chat.cpp +++ b/src/actions/chat.cpp @@ -30,7 +30,7 @@ #include "gui/windows/chatwindow.h" -#include "gui/widgets/tabs/chattab.h" +#include "gui/widgets/tabs/chat/chattab.h" #include "gui/widgets/tabs/chattabtype.h" #include "net/chathandler.h" diff --git a/src/actions/statusbar.cpp b/src/actions/statusbar.cpp index af69bb2b0..073897e05 100644 --- a/src/actions/statusbar.cpp +++ b/src/actions/statusbar.cpp @@ -30,7 +30,7 @@ #include "gui/viewport.h" -#include "gui/widgets/tabs/chattab.h" +#include "gui/widgets/tabs/chat/chattab.h" #include "listeners/updatestatuslistener.h" diff --git a/src/actions/windows.cpp b/src/actions/windows.cpp index edbadd5d0..c17d14978 100644 --- a/src/actions/windows.cpp +++ b/src/actions/windows.cpp @@ -44,7 +44,7 @@ #include "gui/windows/shortcutwindow.h" #include "gui/windows/updaterwindow.h" -#include "gui/widgets/tabs/chattab.h" +#include "gui/widgets/tabs/chat/chattab.h" #include "gui/widgets/tabs/chattabtype.h" #include "debug.h" diff --git a/src/actormanager.cpp b/src/actormanager.cpp index ae57b4d6d..622ae0d71 100644 --- a/src/actormanager.cpp +++ b/src/actormanager.cpp @@ -33,7 +33,7 @@ #include "gui/viewport.h" -#include "gui/widgets/tabs/chattab.h" +#include "gui/widgets/tabs/chat/chattab.h" #include "gui/windows/botcheckerwindow.h" #include "gui/windows/chatwindow.h" diff --git a/src/gamemodifiers.cpp b/src/gamemodifiers.cpp index 79206c703..c3e0789f5 100644 --- a/src/gamemodifiers.cpp +++ b/src/gamemodifiers.cpp @@ -33,7 +33,7 @@ #include "gui/windows/okdialog.h" #include "gui/windows/outfitwindow.h" -#include "gui/widgets/tabs/chattab.h" +#include "gui/widgets/tabs/chat/chattab.h" #include "resources/map/map.h" 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" diff --git a/src/net/ea/gui/guildtab.h b/src/net/ea/gui/guildtab.h index f9bc24b7a..ea0791b4e 100644 --- a/src/net/ea/gui/guildtab.h +++ b/src/net/ea/gui/guildtab.h @@ -23,7 +23,7 @@ #ifndef NET_EA_GUI_GUILDTAB_H #define NET_EA_GUI_GUILDTAB_H -#include "gui/widgets/tabs/chattab.h" +#include "gui/widgets/tabs/chat/chattab.h" #include "gui/widgets/tabs/chattabtype.h" namespace Ea diff --git a/src/net/ea/gui/partytab.h b/src/net/ea/gui/partytab.h index 7a82b1ae0..f315fe8a8 100644 --- a/src/net/ea/gui/partytab.h +++ b/src/net/ea/gui/partytab.h @@ -23,7 +23,7 @@ #ifndef NET_EA_GUI_PARTYTAB_H #define NET_EA_GUI_PARTYTAB_H -#include "gui/widgets/tabs/chattab.h" +#include "gui/widgets/tabs/chat/chattab.h" #include "gui/widgets/tabs/chattabtype.h" namespace Ea diff --git a/src/net/eathena/pethandler.cpp b/src/net/eathena/pethandler.cpp index 50fd3d53c..34892ba64 100644 --- a/src/net/eathena/pethandler.cpp +++ b/src/net/eathena/pethandler.cpp @@ -32,7 +32,7 @@ #include "gui/windows/eggselectiondialog.h" -#include "gui/widgets/tabs/chattab.h" +#include "gui/widgets/tabs/chat/chattab.h" #include "net/chathandler.h" diff --git a/src/net/guildhandler.h b/src/net/guildhandler.h index 2964af16d..156fef029 100644 --- a/src/net/guildhandler.h +++ b/src/net/guildhandler.h @@ -25,7 +25,7 @@ #include "guild.h" -#include "gui/widgets/tabs/chattab.h" +#include "gui/widgets/tabs/chat/chattab.h" #include <iosfwd> diff --git a/src/net/partyhandler.h b/src/net/partyhandler.h index f9905c837..dbd0a0b9c 100644 --- a/src/net/partyhandler.h +++ b/src/net/partyhandler.h @@ -25,7 +25,7 @@ #include "localconsts.h" -#include "gui/widgets/tabs/chattab.h" +#include "gui/widgets/tabs/chat/chattab.h" #include "net/partyshare.h" diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp index 73e651da2..fde774670 100644 --- a/src/net/tmwa/chathandler.cpp +++ b/src/net/tmwa/chathandler.cpp @@ -26,7 +26,7 @@ #include "being/localplayer.h" -#include "gui/widgets/tabs/chattab.h" +#include "gui/widgets/tabs/chat/chattab.h" #include "gui/windows/chatwindow.h" diff --git a/src/notifymanager.cpp b/src/notifymanager.cpp index 08245dcd9..ab7c1030a 100644 --- a/src/notifymanager.cpp +++ b/src/notifymanager.cpp @@ -25,7 +25,7 @@ #include "being/localplayer.h" -#include "gui/widgets/tabs/chattab.h" +#include "gui/widgets/tabs/chat/chattab.h" #include "net/guildhandler.h" #include "net/partyhandler.h" diff --git a/src/statuseffect.cpp b/src/statuseffect.cpp index 88c0ac495..6185b9dc9 100644 --- a/src/statuseffect.cpp +++ b/src/statuseffect.cpp @@ -27,7 +27,7 @@ #include "logger.h" #include "soundmanager.h" -#include "gui/widgets/tabs/chattab.h" +#include "gui/widgets/tabs/chat/chattab.h" #include "particle/particle.h" |