diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-10-24 22:03:11 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-10-25 10:45:54 +0300 |
| commit | 67f8b40f80368dad17a9da50c78923433e266f54 (patch) | |
| tree | 4667906e1ab807c31216f89da450b3cce5585150 /src/gui/windows | |
| parent | 286f34b97b8a4fb56fde1f9e5f3a95ba0c807441 (diff) | |
| download | manaplus-67f8b40f80368dad17a9da50c78923433e266f54.tar.gz manaplus-67f8b40f80368dad17a9da50c78923433e266f54.tar.bz2 manaplus-67f8b40f80368dad17a9da50c78923433e266f54.tar.xz manaplus-67f8b40f80368dad17a9da50c78923433e266f54.zip | |
Fix code style.
Diffstat (limited to 'src/gui/windows')
| -rw-r--r-- | src/gui/windows/chatwindow.cpp | 2 | ||||
| -rw-r--r-- | src/gui/windows/npcpostdialog.cpp | 8 | ||||
| -rw-r--r-- | src/gui/windows/npcpostdialog.h | 2 | ||||
| -rw-r--r-- | src/gui/windows/socialwindow.cpp | 2 | ||||
| -rw-r--r-- | src/gui/windows/textcommandeditor.cpp | 1 |
5 files changed, 4 insertions, 11 deletions
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index 73ab5a0cf..bb5f37a4d 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -64,8 +64,6 @@ #include "gui/widgets/tabs/chat/tradetab.h" #include "gui/widgets/tabs/chat/whispertab.h" -#include "input/inputmanager.h" - #include "render/opengldebug.h" #include "net/chathandler.h" diff --git a/src/gui/windows/npcpostdialog.cpp b/src/gui/windows/npcpostdialog.cpp index 1adf01309..353ba1b4b 100644 --- a/src/gui/windows/npcpostdialog.cpp +++ b/src/gui/windows/npcpostdialog.cpp @@ -32,21 +32,19 @@ #include "gui/widgets/tabs/chat/chattab.h" -#include "net/npchandler.h" - #include "utils/gettext.h" #include "debug.h" NpcPostDialog::DialogList NpcPostDialog::instances; -NpcPostDialog::NpcPostDialog(const int npcId) : +NpcPostDialog::NpcPostDialog(const int npcId A_UNUSED) : // TRANSLATORS: npc post dialog caption Window(_("NPC"), false, nullptr, "npcpost.xml"), ActionListener(), mText(new TextBox(this)), - mSender(new TextField(this)), - mNpcId(npcId) + mSender(new TextField(this)) +// mNpcId(npcId) { setContentSize(400, 180); } diff --git a/src/gui/windows/npcpostdialog.h b/src/gui/windows/npcpostdialog.h index c0477bf20..998844db8 100644 --- a/src/gui/windows/npcpostdialog.h +++ b/src/gui/windows/npcpostdialog.h @@ -69,7 +69,7 @@ class NpcPostDialog final : public Window, TextBox *mText; TextField *mSender; - int mNpcId; +// int mNpcId; }; #endif // GUI_WINDOWS_NPCPOSTDIALOG_H diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp index 6790c26ab..9005e8b35 100644 --- a/src/gui/windows/socialwindow.cpp +++ b/src/gui/windows/socialwindow.cpp @@ -49,8 +49,6 @@ #include "gui/widgets/tabs/socialpickuptab.h" #include "gui/widgets/tabs/socialplayerstab.h" -#include "gui/widgets/tabs/chat/chattab.h" - #include "gui/popups/createpartypopup.h" #include "net/serverfeatures.h" diff --git a/src/gui/windows/textcommandeditor.cpp b/src/gui/windows/textcommandeditor.cpp index d35334e36..7cd72149b 100644 --- a/src/gui/windows/textcommandeditor.cpp +++ b/src/gui/windows/textcommandeditor.cpp @@ -40,7 +40,6 @@ #include "gui/widgets/radiobutton.h" #include "utils/delete2.h" -#include "utils/gettext.h" #include "debug.h" |