From ebd78a883cba4d555500ece5d77f3ebd88e329ae Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 4 May 2015 22:13:38 +0300 Subject: Fix code style. --- src/gui/windows/buydialog.cpp | 1 - src/gui/windows/maileditwindow.cpp | 6 ------ src/gui/windows/mailviewwindow.cpp | 4 ---- src/gui/windows/mailviewwindow.h | 3 +-- src/gui/windows/mailwindow.cpp | 1 - src/gui/windows/mailwindow.h | 2 +- 6 files changed, 2 insertions(+), 15 deletions(-) (limited to 'src/gui/windows') diff --git a/src/gui/windows/buydialog.cpp b/src/gui/windows/buydialog.cpp index 7f5c79cf5..540baffa8 100644 --- a/src/gui/windows/buydialog.cpp +++ b/src/gui/windows/buydialog.cpp @@ -44,7 +44,6 @@ #include "gui/widgets/scrollarea.h" #include "gui/widgets/shoplistbox.h" #include "gui/widgets/slider.h" -#include "gui/widgets/textfield.h" #include "net/adminhandler.h" #include "net/buysellhandler.h" diff --git a/src/gui/windows/maileditwindow.cpp b/src/gui/windows/maileditwindow.cpp index 2a1e0dcaf..c3447fe9c 100644 --- a/src/gui/windows/maileditwindow.cpp +++ b/src/gui/windows/maileditwindow.cpp @@ -20,7 +20,6 @@ #include "gui/windows/maileditwindow.h" -#include "inventory.h" #include "item.h" #include "being/playerinfo.h" @@ -28,21 +27,16 @@ #include "gui/windows/inventorywindow.h" #include "gui/windows/itemamountwindow.h" -#include "gui/windows/setupwindow.h" #include "gui/widgets/button.h" #include "gui/widgets/containerplacer.h" #include "gui/widgets/inttextfield.h" #include "gui/widgets/itemcontainer.h" #include "gui/widgets/label.h" -#include "gui/widgets/layout.h" -#include "gui/widgets/layouttype.h" #include "gui/widgets/scrollarea.h" -#include "gui/widgets/textfield.h" #include "utils/delete2.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "debug.h" diff --git a/src/gui/windows/mailviewwindow.cpp b/src/gui/windows/mailviewwindow.cpp index e8aac252e..ba41a069c 100644 --- a/src/gui/windows/mailviewwindow.cpp +++ b/src/gui/windows/mailviewwindow.cpp @@ -33,13 +33,9 @@ #include "gui/widgets/containerplacer.h" #include "gui/widgets/icon.h" #include "gui/widgets/label.h" -#include "gui/widgets/layout.h" -#include "gui/widgets/layouttype.h" -#include "gui/widgets/textfield.h" #include "utils/delete2.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "resources/image.h" #include "resources/iteminfo.h" diff --git a/src/gui/windows/mailviewwindow.h b/src/gui/windows/mailviewwindow.h index 62d2daa67..70fcd35a8 100644 --- a/src/gui/windows/mailviewwindow.h +++ b/src/gui/windows/mailviewwindow.h @@ -30,7 +30,6 @@ class Button; class Icon; class Label; -class TextField; struct MailMessage; @@ -38,7 +37,7 @@ class MailViewWindow final : public Window, public ActionListener { public: - MailViewWindow(const MailMessage *const message); + explicit MailViewWindow(const MailMessage *const message); A_DELETE_COPY(MailViewWindow) diff --git a/src/gui/windows/mailwindow.cpp b/src/gui/windows/mailwindow.cpp index cf42b3170..3fd61f2a3 100644 --- a/src/gui/windows/mailwindow.cpp +++ b/src/gui/windows/mailwindow.cpp @@ -33,7 +33,6 @@ #include "gui/widgets/button.h" #include "gui/widgets/containerplacer.h" #include "gui/widgets/extendedlistbox.h" -#include "gui/widgets/label.h" #include "gui/widgets/layout.h" #include "gui/widgets/layouttype.h" #include "gui/widgets/scrollarea.h" diff --git a/src/gui/windows/mailwindow.h b/src/gui/windows/mailwindow.h index 7df4be23f..6dba567ca 100644 --- a/src/gui/windows/mailwindow.h +++ b/src/gui/windows/mailwindow.h @@ -53,7 +53,7 @@ class MailWindow final : public Window, void addMail(MailMessage *const message); - void clear(); + void clear() override final; void showMessage(MailMessage *const mail); -- cgit v1.2.3-60-g2f50