From 2efb18fd64cb1bbc4cebe3141dce5c7e1db14628 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 12 Oct 2014 11:25:48 +0300 Subject: Move BattleTab into chat subdir. --- src/gui/widgets/tabs/battletab.cpp | 50 --------------------------------- src/gui/widgets/tabs/battletab.h | 49 -------------------------------- src/gui/widgets/tabs/chat/battletab.cpp | 50 +++++++++++++++++++++++++++++++++ src/gui/widgets/tabs/chat/battletab.h | 49 ++++++++++++++++++++++++++++++++ src/gui/windows/chatwindow.cpp | 2 +- 5 files changed, 100 insertions(+), 100 deletions(-) delete mode 100644 src/gui/widgets/tabs/battletab.cpp delete mode 100644 src/gui/widgets/tabs/battletab.h create mode 100644 src/gui/widgets/tabs/chat/battletab.cpp create mode 100644 src/gui/widgets/tabs/chat/battletab.h (limited to 'src/gui') diff --git a/src/gui/widgets/tabs/battletab.cpp b/src/gui/widgets/tabs/battletab.cpp deleted file mode 100644 index 176a24151..000000000 --- a/src/gui/widgets/tabs/battletab.cpp +++ /dev/null @@ -1,50 +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/battletab.h" - -#include "chatlogger.h" -#include "configuration.h" - -#include "utils/gettext.h" - -#include "debug.h" - -BattleTab *battleChatTab = nullptr; - -BattleTab::BattleTab(const Widget2 *const widget) : - // TRANSLATORS: battle chat tab name - ChatTab(widget, _("Battle"), "") -{ - if (config.getBoolValue("showChatHistory")) - loadFromLogFile("#Battle"); -} - -BattleTab::~BattleTab() -{ -} - -void BattleTab::saveToLogFile(const std::string &msg) const -{ - if (chatLogger) - chatLogger->log(std::string("#Battle"), std::string(msg)); -} diff --git a/src/gui/widgets/tabs/battletab.h b/src/gui/widgets/tabs/battletab.h deleted file mode 100644 index 0f9a80609..000000000 --- a/src/gui/widgets/tabs/battletab.h +++ /dev/null @@ -1,49 +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_BATTLETAB_H -#define GUI_WIDGETS_TABS_BATTLETAB_H - -#include "gui/widgets/tabs/chattab.h" -#include "gui/widgets/tabs/chattabtype.h" - -/** - * A tab for a party chat channel. - */ -class BattleTab final : public ChatTab -{ - public: - explicit BattleTab(const Widget2 *const widget); - - A_DELETE_COPY(BattleTab) - - ~BattleTab(); - - int getType() const override final A_WARN_UNUSED - { return ChatTabType::BATTLE; } - - void saveToLogFile(const std::string &msg) const override final; -}; - -extern BattleTab *battleChatTab; - -#endif // GUI_WIDGETS_TABS_BATTLETAB_H diff --git a/src/gui/widgets/tabs/chat/battletab.cpp b/src/gui/widgets/tabs/chat/battletab.cpp new file mode 100644 index 000000000..47a68e9d0 --- /dev/null +++ b/src/gui/widgets/tabs/chat/battletab.cpp @@ -0,0 +1,50 @@ +/* + * 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/battletab.h" + +#include "chatlogger.h" +#include "configuration.h" + +#include "utils/gettext.h" + +#include "debug.h" + +BattleTab *battleChatTab = nullptr; + +BattleTab::BattleTab(const Widget2 *const widget) : + // TRANSLATORS: battle chat tab name + ChatTab(widget, _("Battle"), "") +{ + if (config.getBoolValue("showChatHistory")) + loadFromLogFile("#Battle"); +} + +BattleTab::~BattleTab() +{ +} + +void BattleTab::saveToLogFile(const std::string &msg) const +{ + if (chatLogger) + chatLogger->log(std::string("#Battle"), std::string(msg)); +} diff --git a/src/gui/widgets/tabs/chat/battletab.h b/src/gui/widgets/tabs/chat/battletab.h new file mode 100644 index 000000000..f156dbfda --- /dev/null +++ b/src/gui/widgets/tabs/chat/battletab.h @@ -0,0 +1,49 @@ +/* + * 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_BATTLETAB_H +#define GUI_WIDGETS_TABS_CHAT_BATTLETAB_H + +#include "gui/widgets/tabs/chattab.h" +#include "gui/widgets/tabs/chattabtype.h" + +/** + * A tab for a party chat channel. + */ +class BattleTab final : public ChatTab +{ + public: + explicit BattleTab(const Widget2 *const widget); + + A_DELETE_COPY(BattleTab) + + ~BattleTab(); + + int getType() const override final A_WARN_UNUSED + { return ChatTabType::BATTLE; } + + void saveToLogFile(const std::string &msg) const override final; +}; + +extern BattleTab *battleChatTab; + +#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" -- cgit v1.2.3-70-g09d2