Merge branch 'master' into stable

1 files changed, 7 insertions, 6 deletions

diff --git a/src/client.h b/src/client.h
index 22567ae94..0e6528ca3 100644
--- a/src/client.h
+++ b/src/client.h
@@ -23,11 +23,11 @@
 #ifndef CLIENT_H
 #define CLIENT_H
 
-#include "configlistener.h"
+#include "listeners/configlistener.h"
 
 #include "net/serverinfo.h"
 
-#include <guichan/actionlistener.hpp>
+#include "listeners/actionlistener.h"
 
 #include <SDL.h>
 
@@ -57,10 +57,10 @@ extern unsigned int tmwServerVersion;
 extern int start_time;
 extern int textures_count;
 
-class ErrorListener : public gcn::ActionListener
+class ErrorListener : public ActionListener
 {
     public:
-        void action(const gcn::ActionEvent &event) override final;
+        void action(const ActionEvent &event) override final;
 };
 
 extern std::string errorMessage;
@@ -142,7 +142,8 @@ struct PacketLimit
  * The core part of the client. This class initializes all subsystems, runs
  * the event loop, and shuts everything down again.
  */
-class Client final : public ConfigListener, public gcn::ActionListener
+class Client final : public ConfigListener,
+                     public ActionListener
 {
 public:
     /**
@@ -301,7 +302,7 @@ public:
 
     void optionChanged(const std::string &name) override final;
 
-    void action(const gcn::ActionEvent &event) override final;
+    void action(const ActionEvent &event) override final;
 
     void initTradeFilter() const;