From 4bb46638ab42eed2d13efdb2c3d1ed174bc28097 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 12 Oct 2014 12:38:26 +0300 Subject: Move TradeTab into chat subdir. --- src/CMakeLists.txt | 4 +-- src/Makefile.am | 4 +-- src/game.cpp | 2 +- src/gui/widgets/tabs/chat/tradetab.cpp | 55 ++++++++++++++++++++++++++++++++++ src/gui/widgets/tabs/chat/tradetab.h | 52 ++++++++++++++++++++++++++++++++ src/gui/widgets/tabs/tradetab.cpp | 55 ---------------------------------- src/gui/widgets/tabs/tradetab.h | 52 -------------------------------- src/gui/windows/chatwindow.cpp | 2 +- 8 files changed, 113 insertions(+), 113 deletions(-) create mode 100644 src/gui/widgets/tabs/chat/tradetab.cpp create mode 100644 src/gui/widgets/tabs/chat/tradetab.h delete mode 100644 src/gui/widgets/tabs/tradetab.cpp delete mode 100644 src/gui/widgets/tabs/tradetab.h 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/chat/tradetab.cpp b/src/gui/widgets/tabs/chat/tradetab.cpp new file mode 100644 index 000000000..2f5f0421c --- /dev/null +++ b/src/gui/widgets/tabs/chat/tradetab.cpp @@ -0,0 +1,55 @@ +/* + * The ManaPlus Client + * Copyright (C) 2008-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2014 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "gui/widgets/tabs/chat/tradetab.h" + +#include "chatlogger.h" + +#include "gui/chatconsts.h" + +#include "utils/gettext.h" + +#include "debug.h" + +TradeTab *tradeChatTab = nullptr; + +TradeTab::TradeTab(const Widget2 *const widget) : + // TRANSLATORS: trade chat tab name + ChatTab(widget, _("Trade"), TRADE_CHANNEL) +{ +} + +TradeTab::~TradeTab() +{ +} + +void TradeTab::handleInput(const std::string &msg) +{ + std::string str("\302\202" + msg); + ChatTab::handleInput(str); +} + +void TradeTab::saveToLogFile(const std::string &msg) const +{ + if (chatLogger) + chatLogger->log(std::string("#Trade"), std::string(msg)); +} diff --git a/src/gui/widgets/tabs/chat/tradetab.h b/src/gui/widgets/tabs/chat/tradetab.h new file mode 100644 index 000000000..1acd9294b --- /dev/null +++ b/src/gui/widgets/tabs/chat/tradetab.h @@ -0,0 +1,52 @@ +/* + * The ManaPlus Client + * Copyright (C) 2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2014 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#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" + +/** + * A tab for a party chat channel. + */ +class TradeTab final : public ChatTab +{ + public: + explicit TradeTab(const Widget2 *const widget); + + A_DELETE_COPY(TradeTab) + + ~TradeTab(); + + int getType() const override final A_WARN_UNUSED + { return ChatTabType::TRADE; } + + void saveToLogFile(const std::string &msg) const override final; + + protected: + void handleInput(const std::string &msg) override final; +}; + +extern TradeTab *tradeChatTab; + +#endif // GUI_WIDGETS_TABS_CHAT_TRADETAB_H diff --git a/src/gui/widgets/tabs/tradetab.cpp b/src/gui/widgets/tabs/tradetab.cpp deleted file mode 100644 index 1642f8804..000000000 --- a/src/gui/widgets/tabs/tradetab.cpp +++ /dev/null @@ -1,55 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2008-2009 The Mana World Development Team - * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011-2014 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "gui/widgets/tabs/tradetab.h" - -#include "chatlogger.h" - -#include "gui/chatconsts.h" - -#include "utils/gettext.h" - -#include "debug.h" - -TradeTab *tradeChatTab = nullptr; - -TradeTab::TradeTab(const Widget2 *const widget) : - // TRANSLATORS: trade chat tab name - ChatTab(widget, _("Trade"), TRADE_CHANNEL) -{ -} - -TradeTab::~TradeTab() -{ -} - -void TradeTab::handleInput(const std::string &msg) -{ - std::string str("\302\202" + msg); - ChatTab::handleInput(str); -} - -void TradeTab::saveToLogFile(const std::string &msg) const -{ - if (chatLogger) - chatLogger->log(std::string("#Trade"), std::string(msg)); -} diff --git a/src/gui/widgets/tabs/tradetab.h b/src/gui/widgets/tabs/tradetab.h deleted file mode 100644 index 10c2ee02c..000000000 --- a/src/gui/widgets/tabs/tradetab.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2009 The Mana World Development Team - * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011-2014 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef GUI_WIDGETS_TABS_TRADETAB_H -#define GUI_WIDGETS_TABS_TRADETAB_H - -#include "gui/widgets/tabs/chat/chattab.h" -#include "gui/widgets/tabs/chat/chattabtype.h" - -/** - * A tab for a party chat channel. - */ -class TradeTab final : public ChatTab -{ - public: - explicit TradeTab(const Widget2 *const widget); - - A_DELETE_COPY(TradeTab) - - ~TradeTab(); - - int getType() const override final A_WARN_UNUSED - { return ChatTabType::TRADE; } - - void saveToLogFile(const std::string &msg) const override final; - - protected: - void handleInput(const std::string &msg) override final; -}; - -extern TradeTab *tradeChatTab; - -#endif // GUI_WIDGETS_TABS_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" -- cgit v1.2.3-60-g2f50