summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gui/emoteshortcutcontainer.h2
-rw-r--r--src/gui/emotewindow.cpp1
-rw-r--r--src/gui/emotewindow.h4
-rw-r--r--src/gui/equipmentwindow.cpp11
-rw-r--r--src/gui/equipmentwindow.h3
-rw-r--r--src/gui/itemcontainer.cpp1
-rw-r--r--src/gui/itemcontainer.h3
-rw-r--r--src/gui/itemshortcutcontainer.cpp1
-rw-r--r--src/gui/itemshortcutcontainer.h6
-rw-r--r--src/gui/shortcutcontainer.h4
10 files changed, 17 insertions, 19 deletions
diff --git a/src/gui/emoteshortcutcontainer.h b/src/gui/emoteshortcutcontainer.h
index 71485259..cffaee6f 100644
--- a/src/gui/emoteshortcutcontainer.h
+++ b/src/gui/emoteshortcutcontainer.h
@@ -25,8 +25,6 @@
#include <vector>
#include <guichan/mouselistener.hpp>
-#include <guichan/widget.hpp>
-#include <guichan/widgetlistener.hpp>
#include "shortcutcontainer.h"
diff --git a/src/gui/emotewindow.cpp b/src/gui/emotewindow.cpp
index 3653cb68..b4e9c735 100644
--- a/src/gui/emotewindow.cpp
+++ b/src/gui/emotewindow.cpp
@@ -28,6 +28,7 @@
#include "emotewindow.h"
#include "emotecontainer.h"
#include "scrollarea.h"
+#include "textbox.h"
#include "widgets/layout.h"
diff --git a/src/gui/emotewindow.h b/src/gui/emotewindow.h
index eaea1f7c..8e36e5ce 100644
--- a/src/gui/emotewindow.h
+++ b/src/gui/emotewindow.h
@@ -25,12 +25,12 @@
#include <guichan/actionlistener.hpp>
#include <guichan/selectionlistener.hpp>
-#include "textbox.h"
#include "window.h"
#include "../guichanfwd.h"
class EmoteContainer;
+class TextBox;
/**
* Emote dialog.
@@ -38,7 +38,7 @@ class EmoteContainer;
* \ingroup Interface
*/
class EmoteWindow : public Window, gcn::ActionListener,
- gcn::SelectionListener
+ gcn::SelectionListener
{
public:
/**
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index b532d621..b37dfc3a 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -28,6 +28,7 @@
#include "equipmentwindow.h"
#include "playerbox.h"
+#include "../equipment.h"
#include "../graphics.h"
#include "../inventory.h"
#include "../item.h"
@@ -42,15 +43,15 @@
// Positions of the boxes, 2nd dimension is X and Y respectively.
static const int boxPosition[][2] = {
{50, 208}, // EQUIP_LEGS_SLOT
- {8, 123}, // EQUIP_FIGHT1_SLOT
- {8, 78}, // EQUIP_GLOVES_SLOT
+ {8, 123}, // EQUIP_FIGHT1_SLOT
+ {8, 78}, // EQUIP_GLOVES_SLOT
{129, 168}, // EQUIP_RING2_SLOT
- {8, 168}, // EQUIP_RING1_SLOT
+ {8, 168}, // EQUIP_RING1_SLOT
{129, 123}, // EQUIP_FIGHT2_SLOT
- {90, 208}, // EQUIP_FEET_SLOT
+ {90, 208}, // EQUIP_FEET_SLOT
{50, 40}, // EQUIP_CAPE_SLOT
{70, 0}, // EQUIP_HEAD_SLOT
- {90, 40}, // EQUIP_TORSO_SLOT
+ {90, 40}, // EQUIP_TORSO_SLOT
{129, 78} // EQUIP_AMMO_SLOT
};
diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h
index d8018644..8e9b22eb 100644
--- a/src/gui/equipmentwindow.h
+++ b/src/gui/equipmentwindow.h
@@ -26,8 +26,7 @@
#include "window.h"
-#include "../equipment.h"
-
+class Equipment;
class Inventory;
class PlayerBox;
diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp
index e07a997c..ab3da9f6 100644
--- a/src/gui/itemcontainer.cpp
+++ b/src/gui/itemcontainer.cpp
@@ -25,6 +25,7 @@
#include <guichan/selectionlistener.hpp>
#include "itemcontainer.h"
+#include "itempopup.h"
#include "../graphics.h"
#include "../inventory.h"
diff --git a/src/gui/itemcontainer.h b/src/gui/itemcontainer.h
index aac06bae..5513faa7 100644
--- a/src/gui/itemcontainer.h
+++ b/src/gui/itemcontainer.h
@@ -28,13 +28,12 @@
#include <guichan/widget.hpp>
#include <guichan/widgetlistener.hpp>
-#include "itempopup.h"
-
#include "../guichanfwd.h"
class Image;
class Inventory;
class Item;
+class ItemPopup;
namespace gcn {
class SelectionListener;
diff --git a/src/gui/itemshortcutcontainer.cpp b/src/gui/itemshortcutcontainer.cpp
index 5179ceb8..8803ab15 100644
--- a/src/gui/itemshortcutcontainer.cpp
+++ b/src/gui/itemshortcutcontainer.cpp
@@ -21,6 +21,7 @@
#include <SDL_mouse.h>
#include "itemshortcutcontainer.h"
+#include "itempopup.h"
#include "../configuration.h"
#include "../graphics.h"
diff --git a/src/gui/itemshortcutcontainer.h b/src/gui/itemshortcutcontainer.h
index 9b61ca86..d6a04d7b 100644
--- a/src/gui/itemshortcutcontainer.h
+++ b/src/gui/itemshortcutcontainer.h
@@ -23,16 +23,14 @@
#define ITEMSHORTCUTCONTAINER_H
#include <guichan/mouselistener.hpp>
-#include <guichan/widget.hpp>
-#include <guichan/widgetlistener.hpp>
-#include "../guichanfwd.h"
#include "shortcutcontainer.h"
-#include "itempopup.h"
+#include "../guichanfwd.h"
class Image;
class Item;
+class ItemPopup;
/**
* An item shortcut container. Used to quickly use items.
diff --git a/src/gui/shortcutcontainer.h b/src/gui/shortcutcontainer.h
index d841f4d8..66aca6c3 100644
--- a/src/gui/shortcutcontainer.h
+++ b/src/gui/shortcutcontainer.h
@@ -36,8 +36,8 @@ class Image;
* \ingroup GUI
*/
class ShortcutContainer : public gcn::Widget,
- public gcn::WidgetListener,
- public gcn::MouseListener
+ public gcn::WidgetListener,
+ public gcn::MouseListener
{
public:
/**