diff options
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/gui/windows/itemamountwindow.cpp | 2 | ||||
| -rw-r--r-- | src/gui/windows/maileditwindow.cpp (renamed from src/gui/windows/mailedit.cpp) | 12 | ||||
| -rw-r--r-- | src/gui/windows/maileditwindow.h (renamed from src/gui/windows/mailedit.h) | 18 | ||||
| -rw-r--r-- | src/gui/windows/mailwindow.cpp | 4 |
6 files changed, 22 insertions, 22 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2d860988d..1fe043dda 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -384,8 +384,8 @@ SET(SRCS gui/windows/killstats.h gui/windows/logindialog.cpp gui/windows/logindialog.h - gui/windows/mailedit.cpp - gui/windows/mailedit.h + gui/windows/maileditwindow.cpp + gui/windows/maileditwindow.h gui/windows/mailview.cpp gui/windows/mailview.h gui/windows/mailwindow.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 4f92a9c93..edbeb454a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -522,8 +522,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ gui/windows/killstats.h \ gui/windows/logindialog.cpp \ gui/windows/logindialog.h \ - gui/windows/mailedit.cpp \ - gui/windows/mailedit.h \ + gui/windows/maileditwindow.cpp \ + gui/windows/maileditwindow.h \ gui/windows/mailview.cpp \ gui/windows/mailview.h \ gui/windows/mailwindow.cpp \ diff --git a/src/gui/windows/itemamountwindow.cpp b/src/gui/windows/itemamountwindow.cpp index d1cf9138c..870d91265 100644 --- a/src/gui/windows/itemamountwindow.cpp +++ b/src/gui/windows/itemamountwindow.cpp @@ -35,7 +35,7 @@ #include "gui/popups/itempopup.h" -#include "gui/windows/mailedit.h" +#include "gui/windows/maileditwindow.h" #include "gui/windows/shopwindow.h" #include "gui/windows/tradewindow.h" diff --git a/src/gui/windows/mailedit.cpp b/src/gui/windows/maileditwindow.cpp index 5bb669b72..d6f91e394 100644 --- a/src/gui/windows/mailedit.cpp +++ b/src/gui/windows/maileditwindow.cpp @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/windows/mailedit.h" +#include "gui/windows/maileditwindow.h" #include "inventory.h" #include "item.h" @@ -46,9 +46,9 @@ #include "debug.h" -MailEdit *mailEditWindow = nullptr; +MailEditWindow *mailEditWindow = nullptr; -MailEdit::MailEdit() : +MailEditWindow::MailEditWindow() : // TRANSLATORS: mail edit window name Window(_("Edit mail"), false, nullptr, "mailedit.xml"), ActionListener(), @@ -120,13 +120,13 @@ MailEdit::MailEdit() : enableVisibleSound(true); } -MailEdit::~MailEdit() +MailEditWindow::~MailEditWindow() { mailEditWindow = nullptr; delete2(mInventory); } -void MailEdit::action(const ActionEvent &event) +void MailEditWindow::action(const ActionEvent &event) { const std::string &eventId = event.getId(); if (eventId == "close") @@ -166,7 +166,7 @@ void MailEdit::action(const ActionEvent &event) } } -void MailEdit::addItem(const Item *const item, const int amount) +void MailEditWindow::addItem(const Item *const item, const int amount) { mInventory->addItem(item->getId(), item->getType(), diff --git a/src/gui/windows/mailedit.h b/src/gui/windows/maileditwindow.h index 57ae40828..b1838817c 100644 --- a/src/gui/windows/mailedit.h +++ b/src/gui/windows/maileditwindow.h @@ -18,8 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef GUI_WINDOWS_MAILEDIT_H -#define GUI_WINDOWS_MAILEDIT_H +#ifndef GUI_WINDOWS_MAILEDITWINDOW_H +#define GUI_WINDOWS_MAILEDITWINDOW_H #ifdef EATHENA_SUPPORT @@ -36,15 +36,15 @@ class Label; class ScrollArea; class TextField; -class MailEdit final : public Window, - public ActionListener +class MailEditWindow final : public Window, + public ActionListener { public: - MailEdit(); + MailEditWindow(); - A_DELETE_COPY(MailEdit) + A_DELETE_COPY(MailEditWindow) - ~MailEdit(); + ~MailEditWindow(); void action(const ActionEvent &event) override final; @@ -68,7 +68,7 @@ class MailEdit final : public Window, ScrollArea *mItemScrollArea; }; -extern MailEdit *mailEditWindow; +extern MailEditWindow *mailEditWindow; #endif // EATHENA_SUPPORT -#endif // GUI_WINDOWS_MAILEDIT_H +#endif // GUI_WINDOWS_MAILEDITWINDOW_H diff --git a/src/gui/windows/mailwindow.cpp b/src/gui/windows/mailwindow.cpp index 1d0bbca62..959ae6a2c 100644 --- a/src/gui/windows/mailwindow.cpp +++ b/src/gui/windows/mailwindow.cpp @@ -26,7 +26,7 @@ #include "gui/mailmessage.h" -#include "gui/windows/mailedit.h" +#include "gui/windows/maileditwindow.h" #include "gui/windows/mailview.h" #include "gui/windows/setupwindow.h" @@ -113,7 +113,7 @@ void MailWindow::action(const ActionEvent &event) else if (eventId == "new") { if (!mailEditWindow) - mailEditWindow = new MailEdit(); + mailEditWindow = new MailEditWindow(); } else if (eventId == "open") { |