diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-10-12 12:38:26 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-10-12 12:38:26 +0300 |
| commit | 4bb46638ab42eed2d13efdb2c3d1ed174bc28097 (patch) | |
| tree | fd6db2e3be32df06bec8c2758ff7eb9c9092be3b | |
| parent | acad79a3a1c6eeef16625738dd481d9a4d7f9b0a (diff) | |
| download | manaverse-4bb46638ab42eed2d13efdb2c3d1ed174bc28097.tar.gz manaverse-4bb46638ab42eed2d13efdb2c3d1ed174bc28097.tar.bz2 manaverse-4bb46638ab42eed2d13efdb2c3d1ed174bc28097.tar.xz manaverse-4bb46638ab42eed2d13efdb2c3d1ed174bc28097.zip | |
Move TradeTab into chat subdir.
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/game.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/tabs/chat/tradetab.cpp (renamed from src/gui/widgets/tabs/tradetab.cpp) | 2 | ||||
| -rw-r--r-- | src/gui/widgets/tabs/chat/tradetab.h (renamed from src/gui/widgets/tabs/tradetab.h) | 6 | ||||
| -rw-r--r-- | src/gui/windows/chatwindow.cpp | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 25ce36275..820d742ed 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -308,8 +308,8 @@ SET(SRCS gui/widgets/textfield.h gui/widgets/textpreview.cpp gui/widgets/textpreview.h - gui/widgets/tabs/tradetab.cpp - gui/widgets/tabs/tradetab.h + gui/widgets/tabs/chat/tradetab.cpp + gui/widgets/tabs/chat/tradetab.h gui/widgets/vertcontainer.cpp gui/widgets/vertcontainer.h gui/widgets/tabs/whispertab.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 03e37df22..72c570377 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -430,8 +430,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ gui/widgets/textfield.h \ gui/widgets/textpreview.cpp \ gui/widgets/textpreview.h \ - gui/widgets/tabs/tradetab.cpp \ - gui/widgets/tabs/tradetab.h \ + gui/widgets/tabs/chat/tradetab.cpp \ + gui/widgets/tabs/chat/tradetab.h \ gui/widgets/vertcontainer.cpp \ gui/widgets/vertcontainer.h \ gui/widgets/tabs/whispertab.cpp \ diff --git a/src/game.cpp b/src/game.cpp index bf9d2efad..36dddf659 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -90,7 +90,7 @@ #include "gui/widgets/tabs/chat/gmtab.h" #include "gui/widgets/tabs/chat/langtab.h" -#include "gui/widgets/tabs/tradetab.h" +#include "gui/widgets/tabs/chat/tradetab.h" #include "net/generalhandler.h" #include "net/gamehandler.h" diff --git a/src/gui/widgets/tabs/tradetab.cpp b/src/gui/widgets/tabs/chat/tradetab.cpp index 1642f8804..2f5f0421c 100644 --- a/src/gui/widgets/tabs/tradetab.cpp +++ b/src/gui/widgets/tabs/chat/tradetab.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/widgets/tabs/tradetab.h" +#include "gui/widgets/tabs/chat/tradetab.h" #include "chatlogger.h" diff --git a/src/gui/widgets/tabs/tradetab.h b/src/gui/widgets/tabs/chat/tradetab.h index 10c2ee02c..1acd9294b 100644 --- a/src/gui/widgets/tabs/tradetab.h +++ b/src/gui/widgets/tabs/chat/tradetab.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef GUI_WIDGETS_TABS_TRADETAB_H -#define GUI_WIDGETS_TABS_TRADETAB_H +#ifndef GUI_WIDGETS_TABS_CHAT_TRADETAB_H +#define GUI_WIDGETS_TABS_CHAT_TRADETAB_H #include "gui/widgets/tabs/chat/chattab.h" #include "gui/widgets/tabs/chat/chattabtype.h" @@ -49,4 +49,4 @@ class TradeTab final : public ChatTab extern TradeTab *tradeChatTab; -#endif // GUI_WIDGETS_TABS_TRADETAB_H +#endif // GUI_WIDGETS_TABS_CHAT_TRADETAB_H diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index 40a28d6bf..a990d67df 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -61,7 +61,7 @@ #include "gui/widgets/scrollarea.h" #include "gui/widgets/tabs/chat/langtab.h" -#include "gui/widgets/tabs/tradetab.h" +#include "gui/widgets/tabs/chat/tradetab.h" #include "gui/widgets/tabs/whispertab.h" #include "render/opengldebug.h" |