From 10273bc94e90fefcfe3fc215aaaaafe7e0e96bd4 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 18 May 2014 01:59:32 +0300
Subject: Remove useless includes.
---
src/CMakeLists.txt | 2 +
src/Makefile.am | 2 +
src/actormanager.cpp | 2 +-
src/being/being.cpp | 1 +
src/game.cpp | 1 +
src/gui/fonts/font.cpp | 4 +-
src/gui/fonts/font.h | 7 ---
src/gui/fonts/textchunk.h | 1 -
src/gui/models/userstablemodel.h | 2 +
src/gui/popups/createpartypopup.h | 2 +
src/gui/popups/popupmenu.cpp | 1 +
src/gui/widgets/chatinput.h | 2 +
src/gui/widgets/itemlinkhandler.cpp | 4 +-
src/gui/widgets/itemshortcutcontainer.cpp | 1 +
src/gui/widgets/serverslistbox.h | 4 ++
src/gui/widgets/skilllistbox.h | 15 ++++++
src/gui/widgets/statuswindowattrs.h | 9 ++++
src/gui/widgets/tabs/chattab.cpp | 1 +
src/gui/widgets/tabs/chattab.h | 3 +-
src/gui/widgets/tabs/debugwindowtabs.cpp | 5 --
src/gui/widgets/tabs/guildchattab.cpp | 2 +
src/gui/widgets/tabs/skilltab.h | 4 +-
src/gui/widgets/tabs/socialattacktab.h | 64 ++++--------------------
src/gui/widgets/tabs/socialfriendstab.h | 13 +++++
src/gui/widgets/tabs/socialguildtab.h | 3 ++
src/gui/widgets/tabs/socialguildtab2.h | 5 ++
src/gui/widgets/tabs/socialnavigationtab.h | 17 +++++++
src/gui/widgets/tabs/socialpartytab.h | 4 ++
src/gui/widgets/tabs/socialpickuptab.h | 8 +++
src/gui/widgets/tabs/socialplayerstab.h | 14 ++++++
src/gui/widgets/tabs/socialtab.h | 5 +-
src/gui/widgets/tabs/socialtabbase.h | 80 ++++++++++++++++++++++++++++++
src/gui/widgets/tabs/whispertab.cpp | 2 +
src/gui/windowmenu.h | 5 +-
src/gui/windows/changeemaildialog.cpp | 1 -
src/gui/windows/changepassworddialog.cpp | 1 -
src/gui/windows/charselectdialog.cpp | 2 -
src/gui/windows/chatwindow.cpp | 1 -
src/gui/windows/debugwindow.cpp | 19 -------
src/gui/windows/debugwindow.h | 2 -
src/gui/windows/itemamountwindow.cpp | 1 -
src/gui/windows/logindialog.cpp | 1 -
src/gui/windows/quitdialog.cpp | 1 -
src/gui/windows/shortcutwindow.cpp | 1 -
src/gui/windows/skilldialog.cpp | 12 +----
src/gui/windows/skilldialog.h | 3 --
src/gui/windows/socialwindow.cpp | 16 ------
src/gui/windows/unregisterdialog.cpp | 1 -
src/guildmanager.cpp | 1 +
src/itemshortcut.cpp | 2 +
src/net/ea/gui/guildtab.cpp | 2 +
src/net/ea/gui/partytab.cpp | 2 +
src/net/ea/guildhandler.cpp | 1 +
src/net/ea/partyhandler.cpp | 1 +
src/net/tmwa/questhandler.cpp | 2 +
src/resources/skillconsts.h | 27 ++++++++++
56 files changed, 253 insertions(+), 142 deletions(-)
create mode 100644 src/gui/widgets/tabs/socialtabbase.h
create mode 100644 src/resources/skillconsts.h
(limited to 'src')
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c43ecbae1..3db1eaeb1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -270,6 +270,7 @@ SET(SRCS
gui/widgets/tabs/socialpickuptab.h
gui/widgets/tabs/socialplayerstab.h
gui/widgets/tabs/socialtab.h
+ gui/widgets/tabs/socialtabbase.h
gui/widgets/tabs/tab.cpp
gui/widgets/tabs/tab.h
gui/widgets/tabbedarea.cpp
@@ -576,6 +577,7 @@ SET(SRCS
resources/sdlimagehelper.h
resources/sdlmusic.cpp
resources/sdlmusic.h
+ resources/skillconsts.h
resources/db/sounddb.cpp
resources/db/sounddb.h
resources/db/weaponsdb.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index c615c1dca..8e356dbb7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -91,6 +91,7 @@ dyecmd_SOURCES += dyetool/dyemain.cpp \
resources/sdlimagehelper.h \
resources/sdlmusic.cpp \
resources/sdlmusic.h \
+ resources/skillconsts.h \
resources/soundeffect.cpp \
resources/soundeffect.h \
resources/subimage.cpp \
@@ -371,6 +372,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
gui/widgets/tabs/socialpickuptab.h \
gui/widgets/tabs/socialplayerstab.h \
gui/widgets/tabs/socialtab.h \
+ gui/widgets/tabs/socialtabbase.h \
gui/widgets/tabs/tab.cpp \
gui/widgets/tabs/tab.h \
gui/widgets/tabbedarea.cpp \
diff --git a/src/actormanager.cpp b/src/actormanager.cpp
index 0ba29a774..0ffed88be 100644
--- a/src/actormanager.cpp
+++ b/src/actormanager.cpp
@@ -35,12 +35,12 @@
#include "gui/widgets/tabs/chattab.h"
+#include "gui/windows/chatwindow.h"
#include "gui/windows/equipmentwindow.h"
#include "gui/windows/socialwindow.h"
#include "input/inputmanager.h"
-#include "utils/checkutils.h"
#include "utils/gettext.h"
#include "net/net.h"
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 479109c2e..c0e325afb 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -49,6 +49,7 @@
#include "gui/popups/speechbubble.h"
+#include "gui/windows/chatwindow.h"
#include "gui/windows/equipmentwindow.h"
#include "gui/windows/skilldialog.h"
#include "gui/windows/socialwindow.h"
diff --git a/src/game.cpp b/src/game.cpp
index 34305cec2..b0caf54d9 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -56,6 +56,7 @@
#include "gui/fonts/font.h"
#include "gui/windows/botcheckerwindow.h"
+#include "gui/windows/chatwindow.h"
#include "gui/windows/debugwindow.h"
#include "gui/windows/didyouknowwindow.h"
#include "gui/windows/emotewindow.h"
diff --git a/src/gui/fonts/font.cpp b/src/gui/fonts/font.cpp
index 4c297793e..2edca6b0b 100644
--- a/src/gui/fonts/font.cpp
+++ b/src/gui/fonts/font.cpp
@@ -71,14 +71,12 @@
#include "gui/fonts/textchunk.h"
-#include "render/sdlgraphics.h"
+#include "render/graphics.h"
#include "resources/image.h"
#include "resources/imagehelper.h"
#include "resources/resourcemanager.h"
-#include "resources/surfaceimagehelper.h"
-#include "utils/delete2.h"
#include "utils/paths.h"
#include "utils/sdlcheckutils.h"
#include "utils/stringutils.h"
diff --git a/src/gui/fonts/font.h b/src/gui/fonts/font.h
index 6e933f7e1..c8e39fd7c 100644
--- a/src/gui/fonts/font.h
+++ b/src/gui/fonts/font.h
@@ -67,22 +67,15 @@
#ifndef GUI_FONTS_FONT_H
#define GUI_FONTS_FONT_H
-#include "gui/color.h"
-
#include "gui/fonts/textchunklist.h"
-#include "gui/fonts/textchunksmall.h"
#include <SDL_ttf.h>
-#include <map>
#include <string>
#include "localconsts.h"
-class Color;
class Graphics;
-class Image;
-class TextChunk;
const unsigned int CACHES_NUMBER = 256;
diff --git a/src/gui/fonts/textchunk.h b/src/gui/fonts/textchunk.h
index f83472f07..6f124346d 100644
--- a/src/gui/fonts/textchunk.h
+++ b/src/gui/fonts/textchunk.h
@@ -32,7 +32,6 @@
#include "localconsts.h"
-class Color;
class Image;
class TextChunk final
diff --git a/src/gui/models/userstablemodel.h b/src/gui/models/userstablemodel.h
index 0c86f36f3..5219a7363 100644
--- a/src/gui/models/userstablemodel.h
+++ b/src/gui/models/userstablemodel.h
@@ -27,6 +27,8 @@
#include "gui/widgets/button.h"
#include "gui/widgets/label.h"
+#include "gui/models/tablemodel.h"
+
#include "actormanager.h"
#include "being/localplayer.h"
diff --git a/src/gui/popups/createpartypopup.h b/src/gui/popups/createpartypopup.h
index dc420dec1..16dc5c9af 100644
--- a/src/gui/popups/createpartypopup.h
+++ b/src/gui/popups/createpartypopup.h
@@ -22,9 +22,11 @@
#include "gui/widgets/browserbox.h"
#include "gui/widgets/linkhandler.h"
#include "gui/widgets/popup.h"
+#include "gui/windows/socialwindow.h"
#include "utils/delete2.h"
#include "utils/gettext.h"
+#include "utils/stringutils.h"
#include "debug.h"
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 36970eaad..7e9925039 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -76,6 +76,7 @@
#include "net/tradehandler.h"
#include "resources/iteminfo.h"
+#include "resources/skillconsts.h"
#include "resources/map/map.h"
#include "resources/map/mapitem.h"
diff --git a/src/gui/widgets/chatinput.h b/src/gui/widgets/chatinput.h
index 1079a219d..5ac95a928 100644
--- a/src/gui/widgets/chatinput.h
+++ b/src/gui/widgets/chatinput.h
@@ -27,6 +27,8 @@
#include "configuration.h"
+#include "gui/windows/emotewindow.h"
+
#include "gui/widgets/textfield.h"
#include "localconsts.h"
diff --git a/src/gui/widgets/itemlinkhandler.cpp b/src/gui/widgets/itemlinkhandler.cpp
index b1d277957..8bd46d440 100644
--- a/src/gui/widgets/itemlinkhandler.cpp
+++ b/src/gui/widgets/itemlinkhandler.cpp
@@ -29,8 +29,8 @@
#include "gui/windows/confirmdialog.h"
#include "gui/windows/helpwindow.h"
+#include "utils/delete2.h"
#include "utils/gettext.h"
-#include "utils/process.h"
#include "utils/stringutils.h"
#include "resources/db/itemdb.h"
@@ -39,8 +39,6 @@
#include "input/mouseinput.h"
-#include "utils/delete2.h"
-
#include <string>
#include "debug.h"
diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp
index 6a47b91ac..e04b90a4e 100644
--- a/src/gui/widgets/itemshortcutcontainer.cpp
+++ b/src/gui/widgets/itemshortcutcontainer.cpp
@@ -46,6 +46,7 @@
#include "gui/widgets/skillinfo.h"
#include "resources/image.h"
+#include "resources/skillconsts.h"
#include "utils/delete2.h"
diff --git a/src/gui/widgets/serverslistbox.h b/src/gui/widgets/serverslistbox.h
index 03333bdb0..e8ce0365d 100644
--- a/src/gui/widgets/serverslistbox.h
+++ b/src/gui/widgets/serverslistbox.h
@@ -25,6 +25,10 @@
#include "gui/fonts/font.h"
+#include "gui/theme.h"
+
+#include "gui/widgets/listbox.h"
+
#include "gui/models/serverslistmodel.h"
#include "localconsts.h"
diff --git a/src/gui/widgets/skilllistbox.h b/src/gui/widgets/skilllistbox.h
index c658161ef..d2da4b150 100644
--- a/src/gui/widgets/skilllistbox.h
+++ b/src/gui/widgets/skilllistbox.h
@@ -25,10 +25,25 @@
#include "gui/widgets/listbox.h"
+#include "dragdrop.h"
+
+#include "gui/skin.h"
+#include "gui/viewport.h"
+
+#include "gui/fonts/font.h"
+
+#include "gui/widgets/skilldata.h"
+
+#include "gui/models/skillmodel.h"
+
+#include "gui/popups/textpopup.h"
+
#include "render/graphics.h"
#include "utils/delete2.h"
+#include "resources/skillconsts.h"
+
#include "localconsts.h"
class SkillModel;
diff --git a/src/gui/widgets/statuswindowattrs.h b/src/gui/widgets/statuswindowattrs.h
index 0a4110fdc..d266b2086 100644
--- a/src/gui/widgets/statuswindowattrs.h
+++ b/src/gui/widgets/statuswindowattrs.h
@@ -25,8 +25,17 @@
#include "gui/widgets/container.h"
+#include "gui/widgets/label.h"
+
+#include "events/actionevent.h"
+
+#include "listeners/actionlistener.h"
+
#include "localconsts.h"
+class Button;
+class LayoutHelper;
+
class AttrDisplay : public Container
{
public:
diff --git a/src/gui/widgets/tabs/chattab.cpp b/src/gui/widgets/tabs/chattab.cpp
index 47d5b3906..47787d25d 100644
--- a/src/gui/widgets/tabs/chattab.cpp
+++ b/src/gui/widgets/tabs/chattab.cpp
@@ -34,6 +34,7 @@
#include "gui/chatlog.h"
+#include "gui/windows/chatwindow.h"
#include "gui/windows/helpwindow.h"
#include "gui/widgets/scrollarea.h"
diff --git a/src/gui/widgets/tabs/chattab.h b/src/gui/widgets/tabs/chattab.h
index b7c76494d..b22074623 100644
--- a/src/gui/widgets/tabs/chattab.h
+++ b/src/gui/widgets/tabs/chattab.h
@@ -23,9 +23,10 @@
#ifndef GUI_WIDGETS_TABS_CHATTAB_H
#define GUI_WIDGETS_TABS_CHATTAB_H
-#include "gui/windows/chatwindow.h"
+#include "gui/chatmsgtype.h"
#include "gui/widgets/browserbox.h"
+
#include "gui/widgets/tabs/tab.h"
#include "localconsts.h"
diff --git a/src/gui/widgets/tabs/debugwindowtabs.cpp b/src/gui/widgets/tabs/debugwindowtabs.cpp
index cf0c6af6e..9f987c721 100644
--- a/src/gui/widgets/tabs/debugwindowtabs.cpp
+++ b/src/gui/widgets/tabs/debugwindowtabs.cpp
@@ -23,7 +23,6 @@
#include "gui/widgets/tabs/debugwindowtabs.h"
#include "game.h"
-#include "main.h"
#include "being/localplayer.h"
@@ -31,13 +30,10 @@
#include "gui/viewport.h"
-#include "gui/windows/setupwindow.h"
-
#include "gui/widgets/containerplacer.h"
#include "gui/widgets/label.h"
#include "gui/widgets/layoutcell.h"
#include "gui/widgets/layouthelper.h"
-#include "gui/widgets/tabbedarea.h"
#include "resources/imagehelper.h"
@@ -45,7 +41,6 @@
#include "net/packetcounters.h"
-#include "utils/delete2.h"
#include "utils/gettext.h"
#include "utils/stringutils.h"
#include "utils/timer.h"
diff --git a/src/gui/widgets/tabs/guildchattab.cpp b/src/gui/widgets/tabs/guildchattab.cpp
index da1a651e1..933dc69b5 100644
--- a/src/gui/widgets/tabs/guildchattab.cpp
+++ b/src/gui/widgets/tabs/guildchattab.cpp
@@ -28,6 +28,8 @@
#include "soundconsts.h"
#include "soundmanager.h"
+#include "gui/windows/chatwindow.h"
+
#include "utils/gettext.h"
#include "debug.h"
diff --git a/src/gui/widgets/tabs/skilltab.h b/src/gui/widgets/tabs/skilltab.h
index 330485c40..b074ca6ab 100644
--- a/src/gui/widgets/tabs/skilltab.h
+++ b/src/gui/widgets/tabs/skilltab.h
@@ -25,14 +25,14 @@
#include "gui/windows/skilldialog.h"
+#include "gui/widgets/skilllistbox.h"
+
#include "gui/widgets/tabs/tab.h"
#include "utils/delete2.h"
#include "localconsts.h"
-class SkillListBox;
-
class SkillTab final : public Tab
{
public:
diff --git a/src/gui/widgets/tabs/socialattacktab.h b/src/gui/widgets/tabs/socialattacktab.h
index 0f902caaf..01921b016 100644
--- a/src/gui/widgets/tabs/socialattacktab.h
+++ b/src/gui/widgets/tabs/socialattacktab.h
@@ -23,65 +23,21 @@
#include "gui/widgets/tabs/socialtab.h"
+#include "actormanager.h"
+
+#include "being/localplayer.h"
+
+#include "gui/models/beingslistmodel.h"
+
+#include "gui/widgets/tabs/socialtabbase.h"
+
+#include "resources/map/mapitem.h"
+
#include "utils/delete2.h"
#include "utils/gettext.h"
#include "localconsts.h"
-class BeingsListModel;
-
-#define addAvatars(mob, str, type) \
-{\
- ava = new Avatar(str);\
- ava->setOnline(false);\
- ava->setLevel(-1);\
- ava->setType(MapItem::SEPARATOR);\
- ava->setX(0);\
- ava->setY(0);\
- avatars->push_back(ava);\
- mobs = actorManager->get##mob##s();\
- i = mobs.begin();\
- i_end = mobs.end();\
- while (i != i_end)\
- {\
- std::string name;\
- int level = -1;\
- if (*i == "")\
- {\
- name = _("(default)");\
- level = 0;\
- }\
- else\
- {\
- name = *i;\
- }\
- ava = new Avatar(name);\
- ava->setOnline(true);\
- ava->setLevel(level);\
- ava->setType(MapItem::type);\
- ava->setX(0);\
- ava->setY(0);\
- avatars->push_back(ava);\
- ++ i;\
- }\
-}
-
-#define updateAtkListStart() \
- if (!socialWindow || !player_node || !actorManager)\
- return;\
- std::vector<Avatar*> *const avatars = mBeings->getMembers();\
- std::vector<Avatar*>::iterator ia = avatars->begin();\
- while (ia != avatars->end())\
- {\
- delete *ia;\
- ++ ia;\
- }\
- avatars->clear();\
- Avatar *ava = nullptr;\
- std::list<std::string> mobs;\
- std::list<std::string>::const_iterator i;\
- std::list<std::string>::const_iterator i_end;
-
class SocialAttackTab final : public SocialTab
{
public:
diff --git a/src/gui/widgets/tabs/socialfriendstab.h b/src/gui/widgets/tabs/socialfriendstab.h
index 35d5c4215..3d65e2678 100644
--- a/src/gui/widgets/tabs/socialfriendstab.h
+++ b/src/gui/widgets/tabs/socialfriendstab.h
@@ -23,8 +23,21 @@
#include "gui/widgets/tabs/socialtab.h"
+#include "actormanager.h"
+#include "avatar.h"
+
+#include "being/actortype.h"
+#include "being/playerrelations.h"
+
+#include "gui/models/beingslistmodel.h"
+
+#include "gui/windows/whoisonline.h"
+
#include "utils/delete2.h"
#include "utils/gettext.h"
+#include "utils/stringutils.h"
+
+#include <algorithm>
#include "localconsts.h"
diff --git a/src/gui/widgets/tabs/socialguildtab.h b/src/gui/widgets/tabs/socialguildtab.h
index 4647f5f07..ee40e146f 100644
--- a/src/gui/widgets/tabs/socialguildtab.h
+++ b/src/gui/widgets/tabs/socialguildtab.h
@@ -24,8 +24,11 @@
#include "gui/widgets/tabs/socialtab.h"
+#include "being/localplayer.h"
+
#include "utils/delete2.h"
#include "utils/gettext.h"
+#include "utils/stringutils.h"
#include "net/net.h"
#include "net/guildhandler.h"
diff --git a/src/gui/widgets/tabs/socialguildtab2.h b/src/gui/widgets/tabs/socialguildtab2.h
index 62d55982a..c5702b17d 100644
--- a/src/gui/widgets/tabs/socialguildtab2.h
+++ b/src/gui/widgets/tabs/socialguildtab2.h
@@ -24,8 +24,13 @@
#include "gui/widgets/tabs/socialtab.h"
+#include "guild.h"
+
+#include "being/localplayer.h"
+
#include "utils/delete2.h"
#include "utils/gettext.h"
+#include "utils/stringutils.h"
#include "localconsts.h"
diff --git a/src/gui/widgets/tabs/socialnavigationtab.h b/src/gui/widgets/tabs/socialnavigationtab.h
index 1d0fbfa33..e8925cbb2 100644
--- a/src/gui/widgets/tabs/socialnavigationtab.h
+++ b/src/gui/widgets/tabs/socialnavigationtab.h
@@ -23,11 +23,28 @@
#include "gui/widgets/tabs/socialtab.h"
+#include "actormanager.h"
+#include "configuration.h"
+
+#include "gui/models/beingslistmodel.h"
+
+#include "gui/windows/outfitwindow.h"
+
+#include "being/localplayer.h"
+
+#include "input/keyboardconfig.h"
+
#include "utils/delete2.h"
#include "utils/gettext.h"
+#include "resources/map/map.h"
+#include "resources/map/mapitem.h"
+#include "resources/map/speciallayer.h"
+
#include "localconsts.h"
+class Avatar;
+
class SocialNavigationTab final : public SocialTab
{
public:
diff --git a/src/gui/widgets/tabs/socialpartytab.h b/src/gui/widgets/tabs/socialpartytab.h
index dc86fb958..247414851 100644
--- a/src/gui/widgets/tabs/socialpartytab.h
+++ b/src/gui/widgets/tabs/socialpartytab.h
@@ -24,6 +24,10 @@
#include "gui/widgets/tabs/socialtab.h"
+#include "party.h"
+
+#include "being/localplayer.h"
+
#include "net/net.h"
#include "net/partyhandler.h"
diff --git a/src/gui/widgets/tabs/socialpickuptab.h b/src/gui/widgets/tabs/socialpickuptab.h
index ddf9924b1..15d7c3aeb 100644
--- a/src/gui/widgets/tabs/socialpickuptab.h
+++ b/src/gui/widgets/tabs/socialpickuptab.h
@@ -23,6 +23,14 @@
#include "gui/widgets/tabs/socialtab.h"
+#include "actormanager.h"
+
+#include "being/localplayer.h"
+
+#include "gui/models/beingslistmodel.h"
+
+#include "gui/widgets/tabs/socialtabbase.h"
+
#include "utils/delete2.h"
#include "utils/gettext.h"
diff --git a/src/gui/widgets/tabs/socialplayerstab.h b/src/gui/widgets/tabs/socialplayerstab.h
index 2026a6346..bb2e2250a 100644
--- a/src/gui/widgets/tabs/socialplayerstab.h
+++ b/src/gui/widgets/tabs/socialplayerstab.h
@@ -23,8 +23,22 @@
#include "gui/widgets/tabs/socialtab.h"
+#include "actormanager.h"
+#include "party.h"
+
+#include "being/being.h"
+
+#include "gui/models/beingslistmodel.h"
+
+#include "utils/gettext.h"
+#include "utils/delete2.h"
+#include "utils/stringutils.h"
+
#include "localconsts.h"
+class Avatar;
+class Being;
+
class SocialPlayersTab final : public SocialTab
{
public:
diff --git a/src/gui/widgets/tabs/socialtab.h b/src/gui/widgets/tabs/socialtab.h
index 5ba8e9884..1514c56e5 100644
--- a/src/gui/widgets/tabs/socialtab.h
+++ b/src/gui/widgets/tabs/socialtab.h
@@ -24,6 +24,9 @@
#include "gui/windows/socialwindow.h"
+#include "gui/windows/confirmdialog.h"
+#include "gui/windows/textdialog.h"
+
#include "gui/widgets/avatarlistbox.h"
#include "gui/widgets/scrollarea.h"
@@ -32,8 +35,6 @@
#include "localconsts.h"
class AvatarListModel;
-class ConfirmDialog;
-class TextDialog;
class SocialTab : public Tab
{
diff --git a/src/gui/widgets/tabs/socialtabbase.h b/src/gui/widgets/tabs/socialtabbase.h
new file mode 100644
index 000000000..6a64ad9f0
--- /dev/null
+++ b/src/gui/widgets/tabs/socialtabbase.h
@@ -0,0 +1,80 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GUI_WIDGETS_TABS_SOCIALTABBASE_H
+#define GUI_WIDGETS_TABS_SOCIALTABBASE_H
+
+#include "actormanager.h"
+
+#include "resources/map/mapitem.h"
+
+#define addAvatars(mob, str, type) \
+{\
+ ava = new Avatar(str);\
+ ava->setOnline(false);\
+ ava->setLevel(-1);\
+ ava->setType(MapItem::SEPARATOR);\
+ ava->setX(0);\
+ ava->setY(0);\
+ avatars->push_back(ava);\
+ mobs = actorManager->get##mob##s();\
+ i = mobs.begin();\
+ i_end = mobs.end();\
+ while (i != i_end)\
+ {\
+ std::string name;\
+ int level = -1;\
+ if (*i == "")\
+ {\
+ name = _("(default)");\
+ level = 0;\
+ }\
+ else\
+ {\
+ name = *i;\
+ }\
+ ava = new Avatar(name);\
+ ava->setOnline(true);\
+ ava->setLevel(level);\
+ ava->setType(MapItem::type);\
+ ava->setX(0);\
+ ava->setY(0);\
+ avatars->push_back(ava);\
+ ++ i;\
+ }\
+}
+
+#define updateAtkListStart() \
+ if (!socialWindow || !player_node || !actorManager)\
+ return;\
+ std::vector<Avatar*> *const avatars = mBeings->getMembers();\
+ std::vector<Avatar*>::iterator ia = avatars->begin();\
+ while (ia != avatars->end())\
+ {\
+ delete *ia;\
+ ++ ia;\
+ }\
+ avatars->clear();\
+ Avatar *ava = nullptr;\
+ std::list<std::string> mobs;\
+ std::list<std::string>::const_iterator i;\
+ std::list<std::string>::const_iterator i_end;
+
+#endif // GUI_WIDGETS_TABS_SOCIALTABBASE_H
diff --git a/src/gui/widgets/tabs/whispertab.cpp b/src/gui/widgets/tabs/whispertab.cpp
index 023d94110..2d295dc14 100644
--- a/src/gui/widgets/tabs/whispertab.cpp
+++ b/src/gui/widgets/tabs/whispertab.cpp
@@ -30,6 +30,8 @@
#include "net/chathandler.h"
#include "net/net.h"
+#include "gui/windows/chatwindow.h"
+
#include "gui/widgets/windowcontainer.h"
#include "debug.h"
diff --git a/src/gui/windowmenu.h b/src/gui/windowmenu.h
index cdcf77082..a32272ef9 100644
--- a/src/gui/windowmenu.h
+++ b/src/gui/windowmenu.h
@@ -37,10 +37,11 @@
#include <vector>
class Button;
-class ButtonInfo;
-class ButtonText;
class TextPopup;
+struct ButtonInfo;
+struct ButtonText;
+
/**
* The window menu. Allows showing and hiding many of the different windows
* used in the game.
diff --git a/src/gui/windows/changeemaildialog.cpp b/src/gui/windows/changeemaildialog.cpp
index d95773cc7..33a55ef2b 100644
--- a/src/gui/windows/changeemaildialog.cpp
+++ b/src/gui/windows/changeemaildialog.cpp
@@ -24,7 +24,6 @@
#include "client.h"
-#include "gui/windows/registerdialog.h"
#include "gui/windows/okdialog.h"
#include "gui/widgets/button.h"
diff --git a/src/gui/windows/changepassworddialog.cpp b/src/gui/windows/changepassworddialog.cpp
index ccad64b69..d809c5efc 100644
--- a/src/gui/windows/changepassworddialog.cpp
+++ b/src/gui/windows/changepassworddialog.cpp
@@ -24,7 +24,6 @@
#include "client.h"
-#include "gui/windows/registerdialog.h"
#include "gui/windows/okdialog.h"
#include "gui/widgets/button.h"
diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp
index 5c12c5441..66460f4e7 100644
--- a/src/gui/windows/charselectdialog.cpp
+++ b/src/gui/windows/charselectdialog.cpp
@@ -34,7 +34,6 @@
#include "gui/windows/charcreatedialog.h"
#include "gui/windows/chardeleteconfirm.h"
-#include "gui/windows/confirmdialog.h"
#include "gui/windows/logindialog.h"
#include "gui/windows/okdialog.h"
#include "gui/windows/textdialog.h"
@@ -44,7 +43,6 @@
#include "gui/widgets/characterviewnormal.h"
#include "gui/widgets/characterviewsmall.h"
#include "gui/widgets/containerplacer.h"
-#include "gui/widgets/layoutcell.h"
#include "net/logindata.h"
#include "net/loginhandler.h"
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index bcfcf65f7..423aa556a 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -60,7 +60,6 @@
#include "gui/widgets/dropdown.h"
#include "gui/widgets/itemlinkhandler.h"
#include "gui/widgets/scrollarea.h"
-#include "gui/widgets/textfield.h"
#include "gui/widgets/tabs/langtab.h"
#include "gui/widgets/tabs/tradetab.h"
diff --git a/src/gui/windows/debugwindow.cpp b/src/gui/windows/debugwindow.cpp
index 523b72237..8dc915604 100644
--- a/src/gui/windows/debugwindow.cpp
+++ b/src/gui/windows/debugwindow.cpp
@@ -22,35 +22,16 @@
#include "gui/windows/debugwindow.h"
-#include "game.h"
-#include "main.h"
-
#include "being/localplayer.h"
-#include "particle/particle.h"
-
-#include "gui/viewport.h"
-
#include "gui/windows/setupwindow.h"
-#include "gui/widgets/containerplacer.h"
-#include "gui/widgets/label.h"
-#include "gui/widgets/layoutcell.h"
-#include "gui/widgets/layouthelper.h"
#include "gui/widgets/tabbedarea.h"
#include "gui/widgets/tabs/debugwindowtabs.h"
-#include "resources/imagehelper.h"
-
-#include "resources/map/map.h"
-
-#include "net/packetcounters.h"
-
#include "utils/delete2.h"
#include "utils/gettext.h"
-#include "utils/stringutils.h"
-#include "utils/timer.h"
#include "debug.h"
diff --git a/src/gui/windows/debugwindow.h b/src/gui/windows/debugwindow.h
index 79f0f30e6..c52ed6b05 100644
--- a/src/gui/windows/debugwindow.h
+++ b/src/gui/windows/debugwindow.h
@@ -23,10 +23,8 @@
#ifndef GUI_WINDOWS_DEBUGWINDOW_H
#define GUI_WINDOWS_DEBUGWINDOW_H
-#include "gui/widgets/container.h"
#include "gui/widgets/window.h"
-class Label;
class MapDebugTab;
class NetDebugTab;
class TabbedArea;
diff --git a/src/gui/windows/itemamountwindow.cpp b/src/gui/windows/itemamountwindow.cpp
index b8d1cb606..c2b00e87e 100644
--- a/src/gui/windows/itemamountwindow.cpp
+++ b/src/gui/windows/itemamountwindow.cpp
@@ -45,7 +45,6 @@
#include "gui/widgets/dropdown.h"
#include "gui/widgets/icon.h"
#include "gui/widgets/inttextfield.h"
-#include "gui/widgets/layoutcell.h"
#include "gui/widgets/label.h"
#include "gui/widgets/slider.h"
diff --git a/src/gui/windows/logindialog.cpp b/src/gui/windows/logindialog.cpp
index 9979bf8b1..01d1bcd61 100644
--- a/src/gui/windows/logindialog.cpp
+++ b/src/gui/windows/logindialog.cpp
@@ -50,7 +50,6 @@
#include "utils/gettext.h"
#include "utils/paths.h"
-#include "utils/process.h"
#include "debug.h"
diff --git a/src/gui/windows/quitdialog.cpp b/src/gui/windows/quitdialog.cpp
index ccb3e469c..e3276fae6 100644
--- a/src/gui/windows/quitdialog.cpp
+++ b/src/gui/windows/quitdialog.cpp
@@ -35,7 +35,6 @@
#include "gui/viewport.h"
#include "gui/widgets/containerplacer.h"
-#include "gui/widgets/layoutcell.h"
#include "gui/widgets/button.h"
#include "gui/widgets/radiobutton.h"
diff --git a/src/gui/windows/shortcutwindow.cpp b/src/gui/windows/shortcutwindow.cpp
index 34c3d8f90..cac23c361 100644
--- a/src/gui/windows/shortcutwindow.cpp
+++ b/src/gui/windows/shortcutwindow.cpp
@@ -31,7 +31,6 @@
#include "gui/widgets/shortcutcontainer.h"
#include "gui/widgets/tabs/shortcuttab.h"
-#include "gui/widgets/tabs/tab.h"
#include "utils/delete2.h"
diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp
index f9351f29a..64bcdf137 100644
--- a/src/gui/windows/skilldialog.cpp
+++ b/src/gui/windows/skilldialog.cpp
@@ -23,20 +23,12 @@
#include "gui/windows/skilldialog.h"
#include "configuration.h"
-#include "dragdrop.h"
#include "effectmanager.h"
#include "itemshortcut.h"
#include "being/attributes.h"
#include "being/localplayer.h"
-#include "gui/skin.h"
-#include "gui/viewport.h"
-
-#include "gui/fonts/font.h"
-
-#include "gui/popups/textpopup.h"
-
#include "gui/models/skillmodel.h"
#include "gui/windows/setupwindow.h"
@@ -45,22 +37,20 @@
#include "gui/widgets/button.h"
#include "gui/widgets/skilllistbox.h"
#include "gui/widgets/label.h"
-#include "gui/widgets/listbox.h"
#include "gui/widgets/scrollarea.h"
#include "gui/widgets/tabbedarea.h"
#include "gui/widgets/tabs/skilltab.h"
-#include "gui/widgets/tabs/tab.h"
#include "net/net.h"
#include "net/playerhandler.h"
#include "net/skillhandler.h"
-#include "utils/delete2.h"
#include "utils/dtor.h"
#include "utils/gettext.h"
#include "resources/beingcommon.h"
+#include "resources/skillconsts.h"
#include "debug.h"
diff --git a/src/gui/windows/skilldialog.h b/src/gui/windows/skilldialog.h
index 3bf64df9b..e0ed1f1b2 100644
--- a/src/gui/windows/skilldialog.h
+++ b/src/gui/windows/skilldialog.h
@@ -27,9 +27,6 @@
#include "listeners/actionlistener.h"
-const int SKILL_MIN_ID = 200000;
-const unsigned int SKILL_VAR_MIN_ID = 1000000;
-
class Button;
class Label;
class SkillModel;
diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp
index 23869e5ea..2a858d964 100644
--- a/src/gui/windows/socialwindow.cpp
+++ b/src/gui/windows/socialwindow.cpp
@@ -21,36 +21,20 @@
#include "gui/windows/socialwindow.h"
-#include "actormanager.h"
#include "configuration.h"
#include "guild.h"
#include "guildmanager.h"
-#include "party.h"
-
-#include "resources/map/map.h"
-#include "resources/map/mapitem.h"
-#include "resources/map/speciallayer.h"
#include "being/localplayer.h"
#include "being/playerrelations.h"
-#include "input/keyboardconfig.h"
-
-#include "gui/models/beingslistmodel.h"
-
#include "gui/windows/confirmdialog.h"
#include "gui/windows/okdialog.h"
#include "gui/windows/setupwindow.h"
#include "gui/windows/textdialog.h"
-#include "gui/windows/whoisonline.h"
-
-#include "gui/windows/outfitwindow.h"
-#include "gui/widgets/avatarlistbox.h"
#include "gui/widgets/button.h"
-#include "gui/widgets/browserbox.h"
#include "gui/widgets/label.h"
-#include "gui/widgets/popup.h"
#include "gui/widgets/scrollarea.h"
#include "gui/widgets/tabbedarea.h"
diff --git a/src/gui/windows/unregisterdialog.cpp b/src/gui/windows/unregisterdialog.cpp
index 99336405c..ad0b98e0e 100644
--- a/src/gui/windows/unregisterdialog.cpp
+++ b/src/gui/windows/unregisterdialog.cpp
@@ -25,7 +25,6 @@
#include "client.h"
#include "gui/windows/okdialog.h"
-#include "gui/windows/registerdialog.h"
#include "gui/widgets/button.h"
#include "gui/widgets/label.h"
diff --git a/src/guildmanager.cpp b/src/guildmanager.cpp
index 1dd4d8247..94d1cc3df 100644
--- a/src/guildmanager.cpp
+++ b/src/guildmanager.cpp
@@ -29,6 +29,7 @@
#include "being/localplayer.h"
+#include "gui/windows/chatwindow.h"
#include "gui/windows/socialwindow.h"
#include "gui/widgets/tabs/guildchattab.h"
diff --git a/src/itemshortcut.cpp b/src/itemshortcut.cpp
index a1f74a154..d4c7efa3a 100644
--- a/src/itemshortcut.cpp
+++ b/src/itemshortcut.cpp
@@ -32,6 +32,8 @@
#include "gui/windows/skilldialog.h"
+#include "resources/skillconsts.h"
+
#include "debug.h"
ItemShortcut *itemShortcut[SHORTCUT_TABS];
diff --git a/src/net/ea/gui/guildtab.cpp b/src/net/ea/gui/guildtab.cpp
index fbd3f0add..43e759e39 100644
--- a/src/net/ea/gui/guildtab.cpp
+++ b/src/net/ea/gui/guildtab.cpp
@@ -31,6 +31,8 @@
#include "net/guildhandler.h"
#include "net/net.h"
+#include "gui/windows/chatwindow.h"
+
#include "utils/gettext.h"
#include "debug.h"
diff --git a/src/net/ea/gui/partytab.cpp b/src/net/ea/gui/partytab.cpp
index 0395b3a94..659ee9660 100644
--- a/src/net/ea/gui/partytab.cpp
+++ b/src/net/ea/gui/partytab.cpp
@@ -34,6 +34,8 @@
#include "net/net.h"
#include "net/partyhandler.h"
+#include "gui/windows/chatwindow.h"
+
#include "utils/gettext.h"
#include "debug.h"
diff --git a/src/net/ea/guildhandler.cpp b/src/net/ea/guildhandler.cpp
index efa94dce1..15fa3165e 100644
--- a/src/net/ea/guildhandler.cpp
+++ b/src/net/ea/guildhandler.cpp
@@ -28,6 +28,7 @@
#include "being/localplayer.h"
+#include "gui/windows/chatwindow.h"
#include "gui/windows/socialwindow.h"
#include "net/messagein.h"
diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp
index a6476d4fa..51ef473f1 100644
--- a/src/net/ea/partyhandler.cpp
+++ b/src/net/ea/partyhandler.cpp
@@ -29,6 +29,7 @@
#include "being/localplayer.h"
+#include "gui/windows/chatwindow.h"
#include "gui/windows/socialwindow.h"
#include "net/messagein.h"
diff --git a/src/net/tmwa/questhandler.cpp b/src/net/tmwa/questhandler.cpp
index 73ba770ea..8c0f7df03 100644
--- a/src/net/tmwa/questhandler.cpp
+++ b/src/net/tmwa/questhandler.cpp
@@ -25,6 +25,8 @@
#include "net/tmwa/protocol.h"
+#include "resources/skillconsts.h"
+
#include "debug.h"
namespace TmwAthena
diff --git a/src/resources/skillconsts.h b/src/resources/skillconsts.h
new file mode 100644
index 000000000..fd5181515
--- /dev/null
+++ b/src/resources/skillconsts.h
@@ -0,0 +1,27 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GUI_RESOURCES_SKILLCONSTS_H
+#define GUI_RESOURCES_SKILLCONSTS_H
+
+const int SKILL_MIN_ID = 200000;
+const unsigned int SKILL_VAR_MIN_ID = 1000000;
+
+#endif // GUI_RESOURCES_SKILLCONSTS_H
--
cgit v1.2.3-70-g09d2