summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-10-12 11:25:48 +0300
committerAndrei Karas <akaras@inbox.ru>2014-10-12 11:25:48 +0300
commit2efb18fd64cb1bbc4cebe3141dce5c7e1db14628 (patch)
treee718637bd5d53b3193d65bcda00c4cebf1f96b5b
parente72cfb920d15b8962a02f87b90442a88d521ab49 (diff)
downloadmv-2efb18fd64cb1bbc4cebe3141dce5c7e1db14628.tar.gz
mv-2efb18fd64cb1bbc4cebe3141dce5c7e1db14628.tar.bz2
mv-2efb18fd64cb1bbc4cebe3141dce5c7e1db14628.tar.xz
mv-2efb18fd64cb1bbc4cebe3141dce5c7e1db14628.zip
Move BattleTab into chat subdir.
-rw-r--r--src/CMakeLists.txt4
-rw-r--r--src/Makefile.am4
-rw-r--r--src/game.cpp2
-rw-r--r--src/gui/widgets/tabs/chat/battletab.cpp (renamed from src/gui/widgets/tabs/battletab.cpp)2
-rw-r--r--src/gui/widgets/tabs/chat/battletab.h (renamed from src/gui/widgets/tabs/battletab.h)6
-rw-r--r--src/gui/windows/chatwindow.cpp2
6 files changed, 10 insertions, 10 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 66d69a435..a881127dd 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -118,8 +118,8 @@ SET(SRCS
gui/models/avatarlistmodel.h
gui/models/beingslistmodel.h
gui/models/colorlistmodel.h
- gui/widgets/tabs/battletab.cpp
- gui/widgets/tabs/battletab.h
+ gui/widgets/tabs/chat/battletab.cpp
+ gui/widgets/tabs/chat/battletab.h
gui/widgets/browserbox.cpp
gui/widgets/browserbox.h
gui/widgets/button.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 61a526001..d936dd918 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -240,8 +240,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
gui/models/avatarlistmodel.h \
gui/models/beingslistmodel.h \
gui/models/colorlistmodel.h \
- gui/widgets/tabs/battletab.cpp \
- gui/widgets/tabs/battletab.h \
+ gui/widgets/tabs/chat/battletab.cpp \
+ gui/widgets/tabs/chat/battletab.h \
gui/widgets/browserbox.cpp \
gui/widgets/browserbox.h \
gui/widgets/button.cpp \
diff --git a/src/game.cpp b/src/game.cpp
index 4cc045019..dee43777c 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -81,7 +81,7 @@
#include "gui/windows/questswindow.h"
#include "gui/windows/whoisonline.h"
-#include "gui/widgets/tabs/battletab.h"
+#include "gui/widgets/tabs/chat/battletab.h"
#include "gui/widgets/emoteshortcutcontainer.h"
#include "gui/widgets/itemshortcutcontainer.h"
diff --git a/src/gui/widgets/tabs/battletab.cpp b/src/gui/widgets/tabs/chat/battletab.cpp
index 176a24151..47a68e9d0 100644
--- a/src/gui/widgets/tabs/battletab.cpp
+++ b/src/gui/widgets/tabs/chat/battletab.cpp
@@ -20,7 +20,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "gui/widgets/tabs/battletab.h"
+#include "gui/widgets/tabs/chat/battletab.h"
#include "chatlogger.h"
#include "configuration.h"
diff --git a/src/gui/widgets/tabs/battletab.h b/src/gui/widgets/tabs/chat/battletab.h
index 0f9a80609..f156dbfda 100644
--- a/src/gui/widgets/tabs/battletab.h
+++ b/src/gui/widgets/tabs/chat/battletab.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef GUI_WIDGETS_TABS_BATTLETAB_H
-#define GUI_WIDGETS_TABS_BATTLETAB_H
+#ifndef GUI_WIDGETS_TABS_CHAT_BATTLETAB_H
+#define GUI_WIDGETS_TABS_CHAT_BATTLETAB_H
#include "gui/widgets/tabs/chattab.h"
#include "gui/widgets/tabs/chattabtype.h"
@@ -46,4 +46,4 @@ class BattleTab final : public ChatTab
extern BattleTab *battleChatTab;
-#endif // GUI_WIDGETS_TABS_BATTLETAB_H
+#endif // GUI_WIDGETS_TABS_CHAT_BATTLETAB_H
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index da64f195d..6321c878f 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -52,7 +52,7 @@
#include "gui/widgets/tabbedarea.h"
#include "gui/windows/whoisonline.h"
-#include "gui/widgets/tabs/battletab.h"
+#include "gui/widgets/tabs/chat/battletab.h"
#include "gui/widgets/button.h"
#include "gui/widgets/chatinput.h"