From acad79a3a1c6eeef16625738dd481d9a4d7f9b0a Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 12 Oct 2014 12:34:36 +0300 Subject: Move LangTab into chat subdir. --- src/CMakeLists.txt | 4 +-- src/Makefile.am | 4 +-- src/being/being.cpp | 2 +- src/game.cpp | 2 +- src/gui/widgets/tabs/chat/langtab.cpp | 46 +++++++++++++++++++++++++++++++++++ src/gui/widgets/tabs/chat/langtab.h | 45 ++++++++++++++++++++++++++++++++++ src/gui/widgets/tabs/langtab.cpp | 46 ----------------------------------- src/gui/widgets/tabs/langtab.h | 45 ---------------------------------- src/gui/windows/chatwindow.cpp | 2 +- 9 files changed, 98 insertions(+), 98 deletions(-) create mode 100644 src/gui/widgets/tabs/chat/langtab.cpp create mode 100644 src/gui/widgets/tabs/chat/langtab.h delete mode 100644 src/gui/widgets/tabs/langtab.cpp delete mode 100644 src/gui/widgets/tabs/langtab.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bbbaabc75..25ce36275 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -195,8 +195,8 @@ SET(SRCS gui/widgets/statuswindowattrs.h gui/widgets/label.cpp gui/widgets/label.h - gui/widgets/tabs/langtab.cpp - gui/widgets/tabs/langtab.h + gui/widgets/tabs/chat/langtab.cpp + gui/widgets/tabs/chat/langtab.h gui/widgets/layout.cpp gui/widgets/layout.h gui/widgets/layoutarray.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 15eee3d5c..03e37df22 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -319,8 +319,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ gui/widgets/statuswindowattrs.h \ gui/widgets/label.cpp \ gui/widgets/label.h \ - gui/widgets/tabs/langtab.cpp \ - gui/widgets/tabs/langtab.h \ + gui/widgets/tabs/chat/langtab.cpp \ + gui/widgets/tabs/chat/langtab.h \ gui/widgets/layout.cpp \ gui/widgets/layout.h \ gui/widgets/layoutarray.cpp \ diff --git a/src/being/being.cpp b/src/being/being.cpp index 7d054fc97..97b20ddc6 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -82,7 +82,7 @@ #include "gui/widgets/skilldata.h" #include "gui/widgets/skillinfo.h" -#include "gui/widgets/tabs/langtab.h" +#include "gui/widgets/tabs/chat/langtab.h" #include "utils/delete2.h" #include "utils/files.h" diff --git a/src/game.cpp b/src/game.cpp index 5a67595b2..bf9d2efad 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -89,7 +89,7 @@ #include "gui/widgets/virtshortcutcontainer.h" #include "gui/widgets/tabs/chat/gmtab.h" -#include "gui/widgets/tabs/langtab.h" +#include "gui/widgets/tabs/chat/langtab.h" #include "gui/widgets/tabs/tradetab.h" #include "net/generalhandler.h" diff --git a/src/gui/widgets/tabs/chat/langtab.cpp b/src/gui/widgets/tabs/chat/langtab.cpp new file mode 100644 index 000000000..a97a46da1 --- /dev/null +++ b/src/gui/widgets/tabs/chat/langtab.cpp @@ -0,0 +1,46 @@ +/* + * The ManaPlus Client + * 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/langtab.h" + +#include "chatlogger.h" + +#include "utils/gettext.h" + +#include "debug.h" + +LangTab *langChatTab = nullptr; + +LangTab::LangTab(const Widget2 *const widget, + const std::string &lang) : + // TRANSLATORS: lang chat tab name + ChatTab(widget, _("Lang"), lang + " ") +{ +} + +LangTab::~LangTab() +{ +} + +void LangTab::saveToLogFile(const std::string &msg) const +{ + if (chatLogger) + chatLogger->log(std::string("#Lang"), std::string(msg)); +} diff --git a/src/gui/widgets/tabs/chat/langtab.h b/src/gui/widgets/tabs/chat/langtab.h new file mode 100644 index 000000000..e4abc68bf --- /dev/null +++ b/src/gui/widgets/tabs/chat/langtab.h @@ -0,0 +1,45 @@ +/* + * The ManaPlus Client + * 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_LANGTAB_H +#define GUI_WIDGETS_TABS_CHAT_LANGTAB_H + +#include "gui/widgets/tabs/chat/chattab.h" +#include "gui/widgets/tabs/chat/chattabtype.h" + +class LangTab final : public ChatTab +{ + public: + LangTab(const Widget2 *const widget, + const std::string &lang); + + A_DELETE_COPY(LangTab) + + ~LangTab(); + + int getType() const override final A_WARN_UNUSED + { return ChatTabType::LANG; } + + void saveToLogFile(const std::string &msg) const override final; +}; + +extern LangTab *langChatTab; + +#endif // GUI_WIDGETS_TABS_CHAT_LANGTAB_H diff --git a/src/gui/widgets/tabs/langtab.cpp b/src/gui/widgets/tabs/langtab.cpp deleted file mode 100644 index 1dc5cea09..000000000 --- a/src/gui/widgets/tabs/langtab.cpp +++ /dev/null @@ -1,46 +0,0 @@ -/* - * The ManaPlus Client - * 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/langtab.h" - -#include "chatlogger.h" - -#include "utils/gettext.h" - -#include "debug.h" - -LangTab *langChatTab = nullptr; - -LangTab::LangTab(const Widget2 *const widget, - const std::string &lang) : - // TRANSLATORS: lang chat tab name - ChatTab(widget, _("Lang"), lang + " ") -{ -} - -LangTab::~LangTab() -{ -} - -void LangTab::saveToLogFile(const std::string &msg) const -{ - if (chatLogger) - chatLogger->log(std::string("#Lang"), std::string(msg)); -} diff --git a/src/gui/widgets/tabs/langtab.h b/src/gui/widgets/tabs/langtab.h deleted file mode 100644 index 1eec0ab84..000000000 --- a/src/gui/widgets/tabs/langtab.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * The ManaPlus Client - * 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_LANGTAB_H -#define GUI_WIDGETS_TABS_LANGTAB_H - -#include "gui/widgets/tabs/chat/chattab.h" -#include "gui/widgets/tabs/chat/chattabtype.h" - -class LangTab final : public ChatTab -{ - public: - LangTab(const Widget2 *const widget, - const std::string &lang); - - A_DELETE_COPY(LangTab) - - ~LangTab(); - - int getType() const override final A_WARN_UNUSED - { return ChatTabType::LANG; } - - void saveToLogFile(const std::string &msg) const override final; -}; - -extern LangTab *langChatTab; - -#endif // GUI_WIDGETS_TABS_LANGTAB_H diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index 6321c878f..40a28d6bf 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -60,7 +60,7 @@ #include "gui/widgets/itemlinkhandler.h" #include "gui/widgets/scrollarea.h" -#include "gui/widgets/tabs/langtab.h" +#include "gui/widgets/tabs/chat/langtab.h" #include "gui/widgets/tabs/tradetab.h" #include "gui/widgets/tabs/whispertab.h" -- cgit v1.2.3-60-g2f50