fix code style.

25 files changed, 69 insertions, 72 deletions

diff --git a/src/gui/widgets/tabs/battletab.h b/src/gui/widgets/tabs/battletab.h
index b4aa1d1df..1624094aa 100644
--- a/src/gui/widgets/tabs/battletab.h
+++ b/src/gui/widgets/tabs/battletab.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_WIDGETS_BATTLETAB_H
-#define GUI_WIDGETS_BATTLETAB_H
+#ifndef GUI_WIDGETS_TABS_BATTLETAB_H
+#define GUI_WIDGETS_TABS_BATTLETAB_H
 
 #include "gui/widgets/tabs/chattab.h"
 
@@ -45,4 +45,4 @@ class BattleTab final : public ChatTab
 
 extern BattleTab *battleChatTab;
 
-#endif  // GUI_WIDGETS_BATTLETAB_H
+#endif  // GUI_WIDGETS_TABS_BATTLETAB_H
diff --git a/src/gui/widgets/tabs/chattab.h b/src/gui/widgets/tabs/chattab.h
index e7744a8c1..91dee8148 100644
--- a/src/gui/widgets/tabs/chattab.h
+++ b/src/gui/widgets/tabs/chattab.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_WIDGETS_CHATTAB_H
-#define GUI_WIDGETS_CHATTAB_H
+#ifndef GUI_WIDGETS_TABS_CHATTAB_H
+#define GUI_WIDGETS_TABS_CHATTAB_H
 
 #include "gui/windows/chatwindow.h"
 
@@ -209,4 +209,4 @@ class ChatTab : public Tab
 extern ChatTab *localChatTab;
 extern ChatTab *debugChatTab;
 
-#endif  // GUI_WIDGETS_CHATTAB_H
+#endif  // GUI_WIDGETS_TABS_CHATTAB_H
diff --git a/src/gui/widgets/tabs/gmtab.h b/src/gui/widgets/tabs/gmtab.h
index 28ccabe8a..85f6cad89 100644
--- a/src/gui/widgets/tabs/gmtab.h
+++ b/src/gui/widgets/tabs/gmtab.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_WIDGETS_GMTAB_H
-#define GUI_WIDGETS_GMTAB_H
+#ifndef GUI_WIDGETS_TABS_GMTAB_H
+#define GUI_WIDGETS_TABS_GMTAB_H
 
 #include "gui/widgets/tabs/chattab.h"
 
@@ -50,4 +50,4 @@ class GmTab final : public ChatTab
 
 extern GmTab *gmChatTab;
 
-#endif  // GUI_WIDGETS_GMTAB_H
+#endif  // GUI_WIDGETS_TABS_GMTAB_H
diff --git a/src/gui/widgets/tabs/guildchattab.h b/src/gui/widgets/tabs/guildchattab.h
index f7aebcf55..9739f5958 100644
--- a/src/gui/widgets/tabs/guildchattab.h
+++ b/src/gui/widgets/tabs/guildchattab.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_WIDGETS_GUILDCHATTAB_H
-#define GUI_WIDGETS_GUILDCHATTAB_H
+#ifndef GUI_WIDGETS_TABS_GUILDCHATTAB_H
+#define GUI_WIDGETS_TABS_GUILDCHATTAB_H
 
 #include "gui/widgets/tabs/chattab.h"
 
@@ -57,4 +57,4 @@ class GuildChatTab final : public ChatTab, public ConfigListener
         void getAutoCompleteList(StringVect &names) const override;
 };
 
-#endif  // GUI_WIDGETS_GUILDCHATTAB_H
+#endif  // GUI_WIDGETS_TABS_GUILDCHATTAB_H
diff --git a/src/gui/widgets/tabs/langtab.h b/src/gui/widgets/tabs/langtab.h
index fa4e7c08c..8f2d0dfed 100644
--- a/src/gui/widgets/tabs/langtab.h
+++ b/src/gui/widgets/tabs/langtab.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_WIDGETS_LANGTAB_H
-#define GUI_WIDGETS_LANGTAB_H
+#ifndef GUI_WIDGETS_TABS_LANGTAB_H
+#define GUI_WIDGETS_TABS_LANGTAB_H
 
 #include "gui/widgets/tabs/chattab.h"
 
@@ -40,4 +40,4 @@ class LangTab final : public ChatTab
 
 extern LangTab *langChatTab;
 
-#endif  // GUI_WIDGETS_LANGTAB_H
+#endif  // GUI_WIDGETS_TABS_LANGTAB_H
diff --git a/src/gui/widgets/tabs/setup_audio.h b/src/gui/widgets/tabs/setup_audio.h
index 98cdc5470..1054f250b 100644
--- a/src/gui/widgets/tabs/setup_audio.h
+++ b/src/gui/widgets/tabs/setup_audio.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_SETUP_AUDIO_H
-#define GUI_SETUP_AUDIO_H
+#ifndef GUI_WIDGETS_TABS_SETUP_AUDIO_H
+#define GUI_WIDGETS_TABS_SETUP_AUDIO_H
 
 #include "gui/widgets/setupitem.h"
 
@@ -42,4 +42,4 @@ class Setup_Audio final : public SetupTabScroll
         SetupItemNames *mChannelsList;
 };
 
-#endif  // GUI_SETUP_AUDIO_H
+#endif  // GUI_WIDGETS_TABS_SETUP_AUDIO_H
diff --git a/src/gui/widgets/tabs/setup_chat.h b/src/gui/widgets/tabs/setup_chat.h
index 108f67a7f..aa151e6f0 100644
--- a/src/gui/widgets/tabs/setup_chat.h
+++ b/src/gui/widgets/tabs/setup_chat.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_SETUP_CHAT_H
-#define GUI_SETUP_CHAT_H
+#ifndef GUI_WIDGETS_TABS_SETUP_CHAT_H
+#define GUI_WIDGETS_TABS_SETUP_CHAT_H
 
 #include "gui/widgets/tabs/setuptabscroll.h"
 
@@ -37,4 +37,4 @@ class Setup_Chat final : public SetupTabScroll
         void externalUpdated() override;
 };
 
-#endif  // GUI_SETUP_CHAT_H
+#endif  // GUI_WIDGETS_TABS_SETUP_CHAT_H
diff --git a/src/gui/widgets/tabs/setup_colors.cpp b/src/gui/widgets/tabs/setup_colors.cpp
index f5b834b6a..19139e37f 100644
--- a/src/gui/widgets/tabs/setup_colors.cpp
+++ b/src/gui/widgets/tabs/setup_colors.cpp
@@ -21,7 +21,6 @@
 
 #include "gui/widgets/tabs/setup_colors.h"
 
-#include "gui/gui.h"
 #include "gui/sdlfont.h"
 #include "gui/userpalette.h"
 
diff --git a/src/gui/widgets/tabs/setup_colors.h b/src/gui/widgets/tabs/setup_colors.h
index fcc6a378f..347c43cab 100644
--- a/src/gui/widgets/tabs/setup_colors.h
+++ b/src/gui/widgets/tabs/setup_colors.h
@@ -19,8 +19,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_SETUP_COLORS_H
-#define GUI_SETUP_COLORS_H
+#ifndef GUI_WIDGETS_TABS_SETUP_COLORS_H
+#define GUI_WIDGETS_TABS_SETUP_COLORS_H
 
 #include "gui/widgets/tabs/setuptab.h"
 
@@ -90,4 +90,4 @@ class Setup_Colors final : public SetupTab,
         void updateGradType();
 };
 
-#endif  // GUI_SETUP_COLORS_H
+#endif  // GUI_WIDGETS_TABS_SETUP_COLORS_H
diff --git a/src/gui/widgets/tabs/setup_input.h b/src/gui/widgets/tabs/setup_input.h
index 03113913e..72ea08f31 100644
--- a/src/gui/widgets/tabs/setup_input.h
+++ b/src/gui/widgets/tabs/setup_input.h
@@ -21,8 +21,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_SETUP_INPUT_H
-#define GUI_SETUP_INPUT_H
+#ifndef GUI_WIDGETS_TABS_SETUP_INPUT_H
+#define GUI_WIDGETS_TABS_SETUP_INPUT_H
 
 #include "gui/widgets/tabs/setuptab.h"
 
@@ -101,4 +101,4 @@ class Setup_Input final : public SetupTab
         int *mActionDataSize;
 };
 
-#endif  // GUI_SETUP_INPUT_H
+#endif  // GUI_WIDGETS_TABS_SETUP_INPUT_H
diff --git a/src/gui/widgets/tabs/setup_joystick.h b/src/gui/widgets/tabs/setup_joystick.h
index 3110da9b6..4254dac81 100644
--- a/src/gui/widgets/tabs/setup_joystick.h
+++ b/src/gui/widgets/tabs/setup_joystick.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_SETUP_JOYSTICK_H
-#define GUI_SETUP_JOYSTICK_H
+#ifndef GUI_WIDGETS_TABS_SETUP_JOYSTICK_H
+#define GUI_WIDGETS_TABS_SETUP_JOYSTICK_H
 
 #include "gui/widgets/tabs/setuptab.h"
 
@@ -59,4 +59,4 @@ class Setup_Joystick final : public SetupTab
         CheckBox *mUseInactiveCheckBox;
 };
 
-#endif  // GUI_SETUP_JOYSTICK_H
+#endif  // GUI_WIDGETS_TABS_SETUP_JOYSTICK_H
diff --git a/src/gui/widgets/tabs/setup_other.h b/src/gui/widgets/tabs/setup_other.h
index 10e83517b..e914dca37 100644
--- a/src/gui/widgets/tabs/setup_other.h
+++ b/src/gui/widgets/tabs/setup_other.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_SETUP_OTHER_H
-#define GUI_SETUP_OTHER_H
+#ifndef GUI_WIDGETS_TABS_SETUP_OTHER_H
+#define GUI_WIDGETS_TABS_SETUP_OTHER_H
 
 #include "gui/widgets/tabs/setuptabscroll.h"
 
@@ -46,4 +46,4 @@ class Setup_Other final : public SetupTabScroll
         NamesModel *mDensityList;
 };
 
-#endif  // GUI_SETUP_OTHER_H
+#endif  // GUI_WIDGETS_TABS_SETUP_OTHER_H
diff --git a/src/gui/widgets/tabs/setup_perfomance.h b/src/gui/widgets/tabs/setup_perfomance.h
index 1695dec1f..cc226daa4 100644
--- a/src/gui/widgets/tabs/setup_perfomance.h
+++ b/src/gui/widgets/tabs/setup_perfomance.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_SETUP_PERFOMANCE_H
-#define GUI_SETUP_PERFOMANCE_H
+#ifndef GUI_WIDGETS_TABS_SETUP_PERFOMANCE_H
+#define GUI_WIDGETS_TABS_SETUP_PERFOMANCE_H
 
 #include "gui/widgets/tabs/setuptabscroll.h"
 
@@ -40,4 +40,4 @@ class Setup_Perfomance final : public SetupTabScroll
         NamesModel *mTexturesList;
 };
 
-#endif  // GUI_SETUP_PERFOMANCE_H
+#endif  // GUI_WIDGETS_TABS_SETUP_PERFOMANCE_H
diff --git a/src/gui/widgets/tabs/setup_players.h b/src/gui/widgets/tabs/setup_players.h
index af0709c08..c942c1a03 100644
--- a/src/gui/widgets/tabs/setup_players.h
+++ b/src/gui/widgets/tabs/setup_players.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_SETUP_PLAYERS_H
-#define GUI_SETUP_PLAYERS_H
+#ifndef GUI_WIDGETS_TABS_SETUP_PLAYERS_H
+#define GUI_WIDGETS_TABS_SETUP_PLAYERS_H
 
 #include "gui/widgets/tabs/setuptabscroll.h"
 
@@ -33,4 +33,4 @@ class Setup_Players final : public SetupTabScroll
         A_DELETE_COPY(Setup_Players)
 };
 
-#endif  // GUI_SETUP_PLAYERS_H
+#endif  // GUI_WIDGETS_TABS_SETUP_PLAYERS_H
diff --git a/src/gui/widgets/tabs/setup_relations.h b/src/gui/widgets/tabs/setup_relations.h
index 789dd5f3e..b5c99934a 100644
--- a/src/gui/widgets/tabs/setup_relations.h
+++ b/src/gui/widgets/tabs/setup_relations.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_SETUP_RELATIONS_H
-#define GUI_SETUP_RELATIONS_H
+#ifndef GUI_WIDGETS_TABS_SETUP_RELATIONS_H
+#define GUI_WIDGETS_TABS_SETUP_RELATIONS_H
 
 #include "being/playerrelations.h"
 
@@ -80,4 +80,4 @@ private:
     DropDown *mIgnoreActionChoicesBox;
 };
 
-#endif  // GUI_SETUP_RELATIONS_H
+#endif  // GUI_WIDGETS_TABS_SETUP_RELATIONS_H
diff --git a/src/gui/widgets/tabs/setup_theme.cpp b/src/gui/widgets/tabs/setup_theme.cpp
index dde3ad04e..109666bb1 100644
--- a/src/gui/widgets/tabs/setup_theme.cpp
+++ b/src/gui/widgets/tabs/setup_theme.cpp
@@ -22,8 +22,6 @@
 
 #include "gui/widgets/tabs/setup_theme.h"
 
-#include "gui/gui.h"
-
 #include "gui/windows/okdialog.h"
 
 #include "gui/widgets/button.h"
diff --git a/src/gui/widgets/tabs/setup_theme.h b/src/gui/widgets/tabs/setup_theme.h
index 96d07aa15..e6cf63d17 100644
--- a/src/gui/widgets/tabs/setup_theme.h
+++ b/src/gui/widgets/tabs/setup_theme.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_SETUP_THEME_H
-#define GUI_SETUP_THEME_H
+#ifndef GUI_WIDGETS_TABS_SETUP_THEME_H
+#define GUI_WIDGETS_TABS_SETUP_THEME_H
 
 #include "gui/widgets/tabs/setuptab.h"
 
@@ -102,4 +102,4 @@ class Setup_Theme final : public SetupTab
         std::string mThemeInfo;
 };
 
-#endif  // GUI_SETUP_THEME_H
+#endif  // GUI_WIDGETS_TABS_SETUP_THEME_H
diff --git a/src/gui/widgets/tabs/setup_touch.h b/src/gui/widgets/tabs/setup_touch.h
index b908ce19d..dee9905b6 100644
--- a/src/gui/widgets/tabs/setup_touch.h
+++ b/src/gui/widgets/tabs/setup_touch.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_SETUP_TOUCH_H
-#define GUI_SETUP_TOUCH_H
+#ifndef GUI_WIDGETS_TABS_SETUP_TOUCH_H
+#define GUI_WIDGETS_TABS_SETUP_TOUCH_H
 
 #include "gui/widgets/setuptouchitem.h"
 
@@ -38,4 +38,4 @@ class Setup_Touch final : public SetupTabScroll
         TouchActionsModel *mActionsList;
 };
 
-#endif  // GUI_SETUP_TOUCH_H
+#endif  // GUI_WIDGETS_TABS_SETUP_TOUCH_H
diff --git a/src/gui/widgets/tabs/setup_video.h b/src/gui/widgets/tabs/setup_video.h
index e8fb415c9..f98b1478b 100644
--- a/src/gui/widgets/tabs/setup_video.h
+++ b/src/gui/widgets/tabs/setup_video.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_SETUP_VIDEO_H
-#define GUI_SETUP_VIDEO_H
+#ifndef GUI_WIDGETS_TABS_SETUP_VIDEO_H
+#define GUI_WIDGETS_TABS_SETUP_VIDEO_H
 
 #include "gui/widgets/tabs/setuptab.h"
 
@@ -79,4 +79,4 @@ class Setup_Video final : public SetupTab, public gcn::KeyListener
         CheckBox *mNoFrameCheckBox;
 };
 
-#endif  // GUI_SETUP_VIDEO_H
+#endif  // GUI_WIDGETS_TABS_SETUP_VIDEO_H
diff --git a/src/gui/widgets/tabs/setup_visual.h b/src/gui/widgets/tabs/setup_visual.h
index e1492d028..92c8147ef 100644
--- a/src/gui/widgets/tabs/setup_visual.h
+++ b/src/gui/widgets/tabs/setup_visual.h
@@ -19,8 +19,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_SETUP_VISUAL_H
-#define GUI_SETUP_VISUAL_H
+#ifndef GUI_WIDGETS_TABS_SETUP_VISUAL_H
+#define GUI_WIDGETS_TABS_SETUP_VISUAL_H
 
 #include "gui/widgets/setupitem.h"
 
@@ -45,4 +45,4 @@ class Setup_Visual final : public SetupTabScroll
         NamesModel *mVSyncList;
 };
 
-#endif  // GUI_SETUP_VISUAL_H
+#endif  // GUI_WIDGETS_TABS_SETUP_VISUAL_H
diff --git a/src/gui/widgets/tabs/setuptab.h b/src/gui/widgets/tabs/setuptab.h
index ab866ba28..d42b27a9f 100644
--- a/src/gui/widgets/tabs/setuptab.h
+++ b/src/gui/widgets/tabs/setuptab.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_WIDGETS_SETUPTAB_H
-#define GUI_WIDGETS_SETUPTAB_H
+#ifndef GUI_WIDGETS_TABS_SETUPTAB_H
+#define GUI_WIDGETS_TABS_SETUPTAB_H
 
 #include "gui/widgets/container.h"
 
@@ -71,4 +71,4 @@ class SetupTab : public Container,
         std::string mName;
 };
 
-#endif  // GUI_WIDGETS_SETUPTAB_H
+#endif  // GUI_WIDGETS_TABS_SETUPTAB_H
diff --git a/src/gui/widgets/tabs/setuptabscroll.h b/src/gui/widgets/tabs/setuptabscroll.h
index e7be18709..16ded3ab3 100644
--- a/src/gui/widgets/tabs/setuptabscroll.h
+++ b/src/gui/widgets/tabs/setuptabscroll.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_WIDGETS_SETUPTABSCROLL_H
-#define GUI_WIDGETS_SETUPTABSCROLL_H
+#ifndef GUI_WIDGETS_TABS_SETUPTABSCROLL_H
+#define GUI_WIDGETS_TABS_SETUPTABSCROLL_H
 
 #include "gui/widgets/tabs/setuptab.h"
 
@@ -72,4 +72,4 @@ class SetupTabScroll : public SetupTab
         int mPreferredFirstItemSize;
 };
 
-#endif  // GUI_WIDGETS_SETUPTABSCROLL_H
+#endif  // GUI_WIDGETS_TABS_SETUPTABSCROLL_H
diff --git a/src/gui/widgets/tabs/tab.h b/src/gui/widgets/tabs/tab.h
index ecd0ae494..6106ccb29 100644
--- a/src/gui/widgets/tabs/tab.h
+++ b/src/gui/widgets/tabs/tab.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_WIDGETS_TAB_H
-#define GUI_WIDGETS_TAB_H
+#ifndef GUI_WIDGETS_TABS_TAB_H
+#define GUI_WIDGETS_TABS_TAB_H
 
 #include "gui/widgets/widget2.h"
 
@@ -184,4 +184,4 @@ class Tab : public gcn::BasicContainer,
         bool mHasMouse;
 };
 
-#endif  // GUI_WIDGETS_TAB_H
+#endif  // GUI_WIDGETS_TABS_TAB_H
diff --git a/src/gui/widgets/tabs/tradetab.h b/src/gui/widgets/tabs/tradetab.h
index 8c28704a4..d868c5a26 100644
--- a/src/gui/widgets/tabs/tradetab.h
+++ b/src/gui/widgets/tabs/tradetab.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_WIDGETS_TRADETAB_H
-#define GUI_WIDGETS_TRADETAB_H
+#ifndef GUI_WIDGETS_TABS_TRADETAB_H
+#define GUI_WIDGETS_TABS_TRADETAB_H
 
 #include "gui/widgets/tabs/chattab.h"
 
@@ -48,4 +48,4 @@ class TradeTab final : public ChatTab
 
 extern TradeTab *tradeChatTab;
 
-#endif  // GUI_WIDGETS_TRADETAB_H
+#endif  // GUI_WIDGETS_TABS_TRADETAB_H
diff --git a/src/gui/widgets/tabs/whispertab.h b/src/gui/widgets/tabs/whispertab.h
index 97e6427c2..d6d8b2a47 100644
--- a/src/gui/widgets/tabs/whispertab.h
+++ b/src/gui/widgets/tabs/whispertab.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_WIDGETS_WHISPERTAB_H
-#define GUI_WIDGETS_WHISPERTAB_H
+#ifndef GUI_WIDGETS_TABS_WHISPERTAB_H
+#define GUI_WIDGETS_TABS_WHISPERTAB_H
 
 #include "gui/widgets/tabs/chattab.h"
 
@@ -71,4 +71,4 @@ class WhisperTab final : public ChatTab
         std::string mNick;
 };
 
-#endif  // GUI_WIDGETS_WHISPERTAB_H
+#endif  // GUI_WIDGETS_TABS_WHISPERTAB_H