Rename mailview into mailviewwindow.

5 files changed, 20 insertions, 20 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1fe043dda..82d269c5d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -386,8 +386,8 @@ SET(SRCS
     gui/windows/logindialog.h
     gui/windows/maileditwindow.cpp
     gui/windows/maileditwindow.h
-    gui/windows/mailview.cpp
-    gui/windows/mailview.h
+    gui/windows/mailviewwindow.cpp
+    gui/windows/mailviewwindow.h
     gui/windows/mailwindow.cpp
     gui/windows/mailwindow.h
     gui/windows/minimap.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index edbeb454a..d11fd78cf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -524,8 +524,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      gui/windows/logindialog.h \
 	      gui/windows/maileditwindow.cpp \
 	      gui/windows/maileditwindow.h \
-	      gui/windows/mailview.cpp \
-	      gui/windows/mailview.h \
+	      gui/windows/mailviewwindow.cpp \
+	      gui/windows/mailviewwindow.h \
 	      gui/windows/mailwindow.cpp \
 	      gui/windows/mailwindow.h \
 	      gui/windows/minimap.cpp \
diff --git a/src/gui/windows/mailview.cpp b/src/gui/windows/mailviewwindow.cpp
index 32a207acf..baafc0d93 100644
--- a/src/gui/windows/mailview.cpp
+++ b/src/gui/windows/mailviewwindow.cpp
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/windows/mailview.h"
+#include "gui/windows/mailviewwindow.h"
 
 #include "configuration.h"
 
@@ -48,9 +48,9 @@
 
 #include "debug.h"
 
-MailView *mailViewWindow = nullptr;
+MailViewWindow *mailViewWindow = nullptr;
 
-MailView::MailView(const MailMessage *const message) :
+MailViewWindow::MailViewWindow(const MailMessage *const message) :
     // TRANSLATORS: mail view window name
     Window(_("View mail"), false, nullptr, "mailview.xml"),
     ActionListener(),
@@ -124,7 +124,7 @@ MailView::MailView(const MailMessage *const message) :
     enableVisibleSound(true);
 }
 
-MailView::~MailView()
+MailViewWindow::~MailViewWindow()
 {
     if (mIcon)
     {
@@ -136,7 +136,7 @@ MailView::~MailView()
     mailViewWindow = nullptr;
 }
 
-void MailView::action(const ActionEvent &event)
+void MailViewWindow::action(const ActionEvent &event)
 {
     const std::string &eventId = event.getId();
     if (eventId == "close")
diff --git a/src/gui/windows/mailview.h b/src/gui/windows/mailviewwindow.h
index 8d1ddde78..155449bcf 100644
--- a/src/gui/windows/mailview.h
+++ b/src/gui/windows/mailviewwindow.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_WINDOWS_MAILVIEW_H
-#define GUI_WINDOWS_MAILVIEW_H
+#ifndef GUI_WINDOWS_MAILVIEWWINDOW_H
+#define GUI_WINDOWS_MAILVIEWWINDOW_H
 
 #ifdef EATHENA_SUPPORT
 
@@ -34,15 +34,15 @@ class TextField;
 
 struct MailMessage;
 
-class MailView final : public Window,
-                       public ActionListener
+class MailViewWindow final : public Window,
+                             public ActionListener
 {
     public:
-        MailView(const MailMessage *const message);
+        MailViewWindow(const MailMessage *const message);
 
-        A_DELETE_COPY(MailView)
+        A_DELETE_COPY(MailViewWindow)
 
-        ~MailView();
+        ~MailViewWindow();
 
         void action(const ActionEvent &event) override final;
 
@@ -59,7 +59,7 @@ class MailView final : public Window,
         Icon *mIcon;
 };
 
-extern MailView *mailViewWindow;
+extern MailViewWindow *mailViewWindow;
 
 #endif  // EATHENA_SUPPORT
-#endif  // GUI_WINDOWS_MAILVIEW_H
+#endif  // GUI_WINDOWS_MAILVIEWWINDOW_H
diff --git a/src/gui/windows/mailwindow.cpp b/src/gui/windows/mailwindow.cpp
index 959ae6a2c..61cd80917 100644
--- a/src/gui/windows/mailwindow.cpp
+++ b/src/gui/windows/mailwindow.cpp
@@ -27,7 +27,7 @@
 #include "gui/mailmessage.h"
 
 #include "gui/windows/maileditwindow.h"
-#include "gui/windows/mailview.h"
+#include "gui/windows/mailviewwindow.h"
 #include "gui/windows/setupwindow.h"
 
 #include "gui/widgets/button.h"
@@ -158,5 +158,5 @@ void MailWindow::showMessage(MailMessage *const mail)
         mail->strTime = mail2->strTime;
     }
     delete mailViewWindow;
-    mailViewWindow = new MailView(mail);
+    mailViewWindow = new MailViewWindow(mail);
 }