Fix code style.

24 files changed, 5 insertions, 35 deletions

diff --git a/src/gui/widgets/horizontcontainer.cpp b/src/gui/widgets/horizontcontainer.cpp
index ff9a5b010..f02a0b0af 100644
--- a/src/gui/widgets/horizontcontainer.cpp
+++ b/src/gui/widgets/horizontcontainer.cpp
@@ -28,6 +28,7 @@ HorizontContainer::HorizontContainer(const Widget2 *const widget,
                                      const int spacing) :
     Container(widget),
     WidgetListener(),
+    ToolTipListener(),
     mSpacing(spacing),
     mCount(0),
     mLastX(spacing)
diff --git a/src/gui/widgets/tabs/chat/battletab.cpp b/src/gui/widgets/tabs/chat/battletab.cpp
index 73fc3802e..1735c1d06 100644
--- a/src/gui/widgets/tabs/chat/battletab.cpp
+++ b/src/gui/widgets/tabs/chat/battletab.cpp
@@ -22,7 +22,6 @@
 
 #include "gui/widgets/tabs/chat/battletab.h"
 
-#include "chatlogger.h"
 #include "configuration.h"
 
 #include "utils/gettext.h"
diff --git a/src/gui/widgets/tabs/chat/battletab.h b/src/gui/widgets/tabs/chat/battletab.h
index ffac0dfd9..be4a594eb 100644
--- a/src/gui/widgets/tabs/chat/battletab.h
+++ b/src/gui/widgets/tabs/chat/battletab.h
@@ -24,7 +24,6 @@
 #define GUI_WIDGETS_TABS_CHAT_BATTLETAB_H
 
 #include "gui/widgets/tabs/chat/chattab.h"
-#include "gui/widgets/tabs/chat/chattabtype.h"
 
 /**
  * A tab for a party chat channel.
diff --git a/src/gui/widgets/tabs/chat/channeltab.cpp b/src/gui/widgets/tabs/chat/channeltab.cpp
index cf8e2443f..4983218dc 100644
--- a/src/gui/widgets/tabs/chat/channeltab.cpp
+++ b/src/gui/widgets/tabs/chat/channeltab.cpp
@@ -22,9 +22,6 @@
 
 #include "gui/widgets/tabs/chat/channeltab.h"
 
-#include "chatlogger.h"
-#include "configuration.h"
-
 #include "gui/widgets/windowcontainer.h"
 
 #include "gui/windows/chatwindow.h"
diff --git a/src/gui/widgets/tabs/chat/channeltab.h b/src/gui/widgets/tabs/chat/channeltab.h
index 0bcfc425c..03a5239ff 100644
--- a/src/gui/widgets/tabs/chat/channeltab.h
+++ b/src/gui/widgets/tabs/chat/channeltab.h
@@ -24,7 +24,6 @@
 #define GUI_WIDGETS_TABS_CHAT_CHANNELTAB_H
 
 #include "gui/widgets/tabs/chat/chattab.h"
-#include "gui/widgets/tabs/chat/chattabtype.h"
 
 /**
  * A tab for a chat channel.
diff --git a/src/gui/widgets/tabs/chat/emulateguildtab.cpp b/src/gui/widgets/tabs/chat/emulateguildtab.cpp
index 1606fbcd3..c0bb519e5 100644
--- a/src/gui/widgets/tabs/chat/emulateguildtab.cpp
+++ b/src/gui/widgets/tabs/chat/emulateguildtab.cpp
@@ -22,7 +22,6 @@
 
 #include "gui/widgets/tabs/chat/emulateguildtab.h"
 
-#include "chatlogger.h"
 #include "configuration.h"
 #include "guildmanager.h"
 #include "soundconsts.h"
diff --git a/src/gui/widgets/tabs/chat/emulateguildtab.h b/src/gui/widgets/tabs/chat/emulateguildtab.h
index 86279d249..1820e9ba8 100644
--- a/src/gui/widgets/tabs/chat/emulateguildtab.h
+++ b/src/gui/widgets/tabs/chat/emulateguildtab.h
@@ -24,7 +24,6 @@
 #define GUI_WIDGETS_TABS_CHAT_EMULATEGUILDTAB_H
 
 #include "gui/widgets/tabs/chat/chattab.h"
-#include "gui/widgets/tabs/chat/chattabtype.h"
 
 /**
  * Emulate guild tab, because server not support normal guilds.
diff --git a/src/gui/widgets/tabs/chat/gmtab.cpp b/src/gui/widgets/tabs/chat/gmtab.cpp
index db1e6a98d..079df013c 100644
--- a/src/gui/widgets/tabs/chat/gmtab.cpp
+++ b/src/gui/widgets/tabs/chat/gmtab.cpp
@@ -20,8 +20,6 @@
 
 #include "gui/widgets/tabs/chat/gmtab.h"
 
-#include "chatlogger.h"
-
 #include "utils/gettext.h"
 
 #include "debug.h"
diff --git a/src/gui/widgets/tabs/chat/gmtab.h b/src/gui/widgets/tabs/chat/gmtab.h
index 008b7ec12..a96fafb25 100644
--- a/src/gui/widgets/tabs/chat/gmtab.h
+++ b/src/gui/widgets/tabs/chat/gmtab.h
@@ -22,7 +22,6 @@
 #define GUI_WIDGETS_TABS_CHAT_GMTAB_H
 
 #include "gui/widgets/tabs/chat/chattab.h"
-#include "gui/widgets/tabs/chat/chattabtype.h"
 
 /**
  * A tab for whispers from a single player.
diff --git a/src/gui/widgets/tabs/chat/guildtab.cpp b/src/gui/widgets/tabs/chat/guildtab.cpp
index 97f0f348d..f3c0b1d04 100644
--- a/src/gui/widgets/tabs/chat/guildtab.cpp
+++ b/src/gui/widgets/tabs/chat/guildtab.cpp
@@ -22,7 +22,6 @@
 
 #include "gui/widgets/tabs/chat/guildtab.h"
 
-#include "chatlogger.h"
 #include "configuration.h"
 #include "guild.h"
 #include "soundconsts.h"
diff --git a/src/gui/widgets/tabs/chat/guildtab.h b/src/gui/widgets/tabs/chat/guildtab.h
index c0d5b7ce7..4ac43fcc5 100644
--- a/src/gui/widgets/tabs/chat/guildtab.h
+++ b/src/gui/widgets/tabs/chat/guildtab.h
@@ -24,7 +24,6 @@
 #define GUI_WIDGETS_TABS_CHAT_GUILDTAB_H
 
 #include "gui/widgets/tabs/chat/chattab.h"
-#include "gui/widgets/tabs/chat/chattabtype.h"
 
 /**
  * A tab for a guild chat channel.
diff --git a/src/gui/widgets/tabs/chat/langtab.cpp b/src/gui/widgets/tabs/chat/langtab.cpp
index 554af2782..6f5b84f1f 100644
--- a/src/gui/widgets/tabs/chat/langtab.cpp
+++ b/src/gui/widgets/tabs/chat/langtab.cpp
@@ -20,8 +20,6 @@
 
 #include "gui/widgets/tabs/chat/langtab.h"
 
-#include "chatlogger.h"
-
 #include "utils/gettext.h"
 
 #include "debug.h"
diff --git a/src/gui/widgets/tabs/chat/langtab.h b/src/gui/widgets/tabs/chat/langtab.h
index 65a26b562..1532afd32 100644
--- a/src/gui/widgets/tabs/chat/langtab.h
+++ b/src/gui/widgets/tabs/chat/langtab.h
@@ -22,7 +22,6 @@
 #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
 {
diff --git a/src/gui/widgets/tabs/chat/partytab.cpp b/src/gui/widgets/tabs/chat/partytab.cpp
index e34d49014..0779b62d0 100644
--- a/src/gui/widgets/tabs/chat/partytab.cpp
+++ b/src/gui/widgets/tabs/chat/partytab.cpp
@@ -22,7 +22,6 @@
 
 #include "gui/widgets/tabs/chat/partytab.h"
 
-#include "chatlogger.h"
 #include "configuration.h"
 #include "party.h"
 #include "soundconsts.h"
diff --git a/src/gui/widgets/tabs/chat/partytab.h b/src/gui/widgets/tabs/chat/partytab.h
index dc0799ecc..5590e9d18 100644
--- a/src/gui/widgets/tabs/chat/partytab.h
+++ b/src/gui/widgets/tabs/chat/partytab.h
@@ -24,7 +24,6 @@
 #define GUI_WIDGETS_TABS_CHAT_PARTYTAB_H
 
 #include "gui/widgets/tabs/chat/chattab.h"
-#include "gui/widgets/tabs/chat/chattabtype.h"
 
 /**
  * A tab for a party chat channel.
diff --git a/src/gui/widgets/tabs/chat/tradetab.cpp b/src/gui/widgets/tabs/chat/tradetab.cpp
index a4906a815..707b64847 100644
--- a/src/gui/widgets/tabs/chat/tradetab.cpp
+++ b/src/gui/widgets/tabs/chat/tradetab.cpp
@@ -22,8 +22,6 @@
 
 #include "gui/widgets/tabs/chat/tradetab.h"
 
-#include "chatlogger.h"
-
 #include "gui/chatconsts.h"
 
 #include "utils/gettext.h"
diff --git a/src/gui/widgets/tabs/chat/tradetab.h b/src/gui/widgets/tabs/chat/tradetab.h
index 935f2ce4f..3ed2a538e 100644
--- a/src/gui/widgets/tabs/chat/tradetab.h
+++ b/src/gui/widgets/tabs/chat/tradetab.h
@@ -24,7 +24,6 @@
 #define GUI_WIDGETS_TABS_CHAT_TRADETAB_H
 
 #include "gui/widgets/tabs/chat/chattab.h"
-#include "gui/widgets/tabs/chat/chattabtype.h"
 
 /**
  * A tab for a party chat channel.
diff --git a/src/gui/widgets/tabs/chat/whispertab.cpp b/src/gui/widgets/tabs/chat/whispertab.cpp
index 20354cc69..f82277171 100644
--- a/src/gui/widgets/tabs/chat/whispertab.cpp
+++ b/src/gui/widgets/tabs/chat/whispertab.cpp
@@ -22,8 +22,6 @@
 
 #include "gui/widgets/tabs/chat/whispertab.h"
 
-#include "chatlogger.h"
-
 #include "being/localplayer.h"
 
 #include "net/chathandler.h"
diff --git a/src/gui/widgets/tabs/chat/whispertab.h b/src/gui/widgets/tabs/chat/whispertab.h
index 2ad8ca03d..24fc2abe0 100644
--- a/src/gui/widgets/tabs/chat/whispertab.h
+++ b/src/gui/widgets/tabs/chat/whispertab.h
@@ -24,7 +24,6 @@
 #define GUI_WIDGETS_TABS_CHAT_WHISPERTAB_H
 
 #include "gui/widgets/tabs/chat/chattab.h"
-#include "gui/widgets/tabs/chat/chattabtype.h"
 
 /**
  * A tab for whispers from a single player.
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"