10 files changed, 19 insertions, 19 deletions
diff --git a/src/gui/chat.h b/src/gui/chat.h
index bba3a477..b0d2bfa8 100644
--- a/src/gui/chat.h
+++ b/src/gui/chat.h
@@ -22,7 +22,7 @@
 #ifndef CHAT_H
 #define CHAT_H
 
-#include "listener.h"
+#include "eventlistener.h"
 
 #include "gui/widgets/window.h"
 #include "gui/widgets/textfield.h"
@@ -77,7 +77,7 @@ struct CHATLOG
  */
 class ChatWindow : public Window,
                    public gcn::ActionListener,
-                   public Listener
+                   public EventListener
 {
     public:
         /**
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 2aca60bf..d1c18ab2 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -30,7 +30,7 @@
 #include "gui/widgets/windowcontainer.h"
 
 #include "configuration.h"
-#include "listener.h"
+#include "eventlistener.h"
 #include "graphics.h"
 #include "log.h"
 
@@ -50,7 +50,7 @@ SDLInput *guiInput = 0;
 // Bolded font
 gcn::Font *boldFont = 0;
 
-class GuiConfigListener : public Listener
+class GuiConfigListener : public EventListener
 {
     public:
         GuiConfigListener(Gui *g):
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index d192fafa..0cdb1dbd 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -23,7 +23,7 @@
 #define INVENTORYWINDOW_H
 
 #include "inventory.h"
-#include "listener.h"
+#include "eventlistener.h"
 
 #include "gui/widgets/window.h"
 #include "gui/widgets/textfield.h"
@@ -49,7 +49,7 @@ class InventoryWindow : public Window,
                         public gcn::KeyListener,
                         public gcn::SelectionListener,
                         public InventoryListener,
-                        public Listener
+                        public EventListener
 {
     public:
         /**
diff --git a/src/gui/ministatus.h b/src/gui/ministatus.h
index 7fbb8597..38025202 100644
--- a/src/gui/ministatus.h
+++ b/src/gui/ministatus.h
@@ -22,7 +22,7 @@
 #ifndef MINISTATUS_H
 #define MINISTATUS_H
 
-#include "listener.h"
+#include "eventlistener.h"
 
 #include "gui/widgets/popup.h"
 
@@ -38,7 +38,7 @@ class TextPopup;
  *
  * \ingroup Interface
  */
-class MiniStatusWindow : public Popup, public Listener
+class MiniStatusWindow : public Popup, public EventListener
 {
     public:
         MiniStatusWindow();
diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp
index a8f61a1a..bb508184 100644
--- a/src/gui/npcdialog.cpp
+++ b/src/gui/npcdialog.cpp
@@ -23,7 +23,7 @@
 
 #include "configuration.h"
 #include "event.h"
-#include "listener.h"
+#include "eventlistener.h"
 #include "playerinfo.h"
 
 #include "gui/npcpostdialog.h"
@@ -52,7 +52,7 @@
 
 typedef std::map<int, NpcDialog*> NpcDialogs;
 
-class NpcEventListener : public Listener
+class NpcEventListener : public EventListener
 {
 public:
     void event(Event::Channel channel, const Event &event);
diff --git a/src/gui/npcdialog.h b/src/gui/npcdialog.h
index 9981e088..976e0d14 100644
--- a/src/gui/npcdialog.h
+++ b/src/gui/npcdialog.h
@@ -22,7 +22,7 @@
 #ifndef NPCDIALOG_H
 #define NPCDIALOG_H
 
-#include "listener.h"
+#include "eventlistener.h"
 
 #include "gui/widgets/window.h"
 
@@ -45,7 +45,7 @@ class Button;
  * \ingroup Interface
  */
 class NpcDialog : public Window, public gcn::ActionListener,
-                  public gcn::ListModel, public Listener
+                  public gcn::ListModel, public EventListener
 {
     public:
         /**
diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp
index 4c405254..c7976caa 100644
--- a/src/gui/skilldialog.cpp
+++ b/src/gui/skilldialog.cpp
@@ -24,7 +24,7 @@
 #include "log.h"
 #include "playerinfo.h"
 #include "configuration.h"
-#include "listener.h"
+#include "eventlistener.h"
 
 #include "gui/setup.h"
 
diff --git a/src/gui/skilldialog.h b/src/gui/skilldialog.h
index d83210b5..a49c537b 100644
--- a/src/gui/skilldialog.h
+++ b/src/gui/skilldialog.h
@@ -23,7 +23,7 @@
 #define SKILLDIALOG_H
 
 #include "gui/widgets/window.h"
-#include "listener.h"
+#include "eventlistener.h"
 
 #include <guichan/actionlistener.hpp>
 
@@ -42,7 +42,7 @@ struct SkillInfo;
  *
  * \ingroup Interface
  */
-class SkillDialog : public Window, public gcn::ActionListener, public Listener
+class SkillDialog : public Window, public gcn::ActionListener, public EventListener
 {
     public:
         SkillDialog();
diff --git a/src/gui/statuswindow.h b/src/gui/statuswindow.h
index d52dbd72..53bc05cf 100644
--- a/src/gui/statuswindow.h
+++ b/src/gui/statuswindow.h
@@ -22,7 +22,7 @@
 #ifndef STATUS_H
 #define STATUS_H
 
-#include "listener.h"
+#include "eventlistener.h"
 
 #include "gui/widgets/window.h"
 
@@ -40,7 +40,7 @@ class VertContainer;
  *
  * \ingroup Interface
  */
-class StatusWindow : public Window, public Listener
+class StatusWindow : public Window, public EventListener
 {
     public:
         /**
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index feb521d7..ce535a64 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -22,7 +22,7 @@
 #ifndef VIEWPORT_H
 #define VIEWPORT_H
 
-#include "listener.h"
+#include "eventlistener.h"
 #include "position.h"
 
 #include "gui/widgets/windowcontainer.h"
@@ -54,7 +54,7 @@ const int walkingMouseDelay = 500;
  * coordinates.
  */
 class Viewport : public WindowContainer, public gcn::MouseListener,
-        public Listener
+        public EventListener
 {
     public:
         /**