summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/CMakeLists.txt4
-rw-r--r--src/Makefile.am4
-rw-r--r--src/actions/commands.cpp2
-rw-r--r--src/being/localplayer.cpp2
-rw-r--r--src/gui/popups/popupmenu.cpp2
-rw-r--r--src/gui/widgets/tabs/chat/whispertab.cpp (renamed from src/gui/widgets/tabs/whispertab.cpp)2
-rw-r--r--src/gui/widgets/tabs/chat/whispertab.h (renamed from src/gui/widgets/tabs/whispertab.h)6
-rw-r--r--src/gui/windows/chatwindow.cpp2
-rw-r--r--src/utils/chatutils.cpp2
9 files changed, 13 insertions, 13 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 820d742ed..f88213bb5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -312,8 +312,8 @@ SET(SRCS
gui/widgets/tabs/chat/tradetab.h
gui/widgets/vertcontainer.cpp
gui/widgets/vertcontainer.h
- gui/widgets/tabs/whispertab.cpp
- gui/widgets/tabs/whispertab.h
+ gui/widgets/tabs/chat/whispertab.cpp
+ gui/widgets/tabs/chat/whispertab.h
gui/widgets/widget2.h
gui/widgets/widgetgroup.cpp
gui/widgets/widgetgroup.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 72c570377..3693d270e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -434,8 +434,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
gui/widgets/tabs/chat/tradetab.h \
gui/widgets/vertcontainer.cpp \
gui/widgets/vertcontainer.h \
- gui/widgets/tabs/whispertab.cpp \
- gui/widgets/tabs/whispertab.h \
+ gui/widgets/tabs/chat/whispertab.cpp \
+ gui/widgets/tabs/chat/whispertab.h \
gui/widgets/widget2.h \
gui/widgets/widgetgroup.cpp \
gui/widgets/widgetgroup.h \
diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp
index 1f7f77157..d187f8f6c 100644
--- a/src/actions/commands.cpp
+++ b/src/actions/commands.cpp
@@ -34,7 +34,7 @@
#include "gui/windows/socialwindow.h"
#include "gui/windows/outfitwindow.h"
-#include "gui/widgets/tabs/whispertab.h"
+#include "gui/widgets/tabs/chat/whispertab.h"
#include "net/adminhandler.h"
#include "net/chathandler.h"
diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp
index 48be4c5bc..74bef82b5 100644
--- a/src/being/localplayer.cpp
+++ b/src/being/localplayer.cpp
@@ -58,7 +58,7 @@
#include "gui/windows/updaterwindow.h"
#include "gui/widgets/tabs/chat/gmtab.h"
-#include "gui/widgets/tabs/whispertab.h"
+#include "gui/widgets/tabs/chat/whispertab.h"
#include "net/beinghandler.h"
#include "net/chathandler.h"
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index fd7b2df50..57dd21fca 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -62,9 +62,9 @@
#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 "gui/widgets/tabs/chat/whispertab.h"
#include "net/adminhandler.h"
#include "net/beinghandler.h"
diff --git a/src/gui/widgets/tabs/whispertab.cpp b/src/gui/widgets/tabs/chat/whispertab.cpp
index 03b90ca18..f7b49dee8 100644
--- a/src/gui/widgets/tabs/whispertab.cpp
+++ b/src/gui/widgets/tabs/chat/whispertab.cpp
@@ -20,7 +20,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "gui/widgets/tabs/whispertab.h"
+#include "gui/widgets/tabs/chat/whispertab.h"
#include "chatlogger.h"
diff --git a/src/gui/widgets/tabs/whispertab.h b/src/gui/widgets/tabs/chat/whispertab.h
index 57c215dd9..5817ff8d6 100644
--- a/src/gui/widgets/tabs/whispertab.h
+++ b/src/gui/widgets/tabs/chat/whispertab.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef GUI_WIDGETS_TABS_WHISPERTAB_H
-#define GUI_WIDGETS_TABS_WHISPERTAB_H
+#ifndef GUI_WIDGETS_TABS_CHAT_WHISPERTAB_H
+#define GUI_WIDGETS_TABS_CHAT_WHISPERTAB_H
#include "gui/widgets/tabs/chat/chattab.h"
#include "gui/widgets/tabs/chat/chattabtype.h"
@@ -71,4 +71,4 @@ class WhisperTab final : public ChatTab
std::string mNick;
};
-#endif // GUI_WIDGETS_TABS_WHISPERTAB_H
+#endif // GUI_WIDGETS_TABS_CHAT_WHISPERTAB_H
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index a990d67df..a6a96be5b 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -62,7 +62,7 @@
#include "gui/widgets/tabs/chat/langtab.h"
#include "gui/widgets/tabs/chat/tradetab.h"
-#include "gui/widgets/tabs/whispertab.h"
+#include "gui/widgets/tabs/chat/whispertab.h"
#include "render/opengldebug.h"
diff --git a/src/utils/chatutils.cpp b/src/utils/chatutils.cpp
index d03cdd764..60a5329b1 100644
--- a/src/utils/chatutils.cpp
+++ b/src/utils/chatutils.cpp
@@ -29,7 +29,7 @@
#include "gui/chatconsts.h"
-#include "gui/widgets/tabs/whispertab.h"
+#include "gui/widgets/tabs/chat/whispertab.h"
#include "net/chathandler.h"
#include "net/guildhandler.h"