Made all local action listeners structs and moved them into anonymous namespaces.

2 files changed, 22 insertions, 22 deletions

diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index 02afc9db..070fb112 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.cpp
@@ -43,27 +43,25 @@ OkDialog *deathNotice = NULL;
  * Listener used for handling the overweigth message.
  */
 // TODO Move somewhere else
-class WeightNoticeListener : public gcn::ActionListener
-{
-    public:
-        void action(const std::string &eventId)
-        {
-            weightNotice = NULL;
-        }
-} weightNoticeListener;
-
+namespace {
+    struct WeightListener : public gcn::ActionListener
+    {
+        void action(const std::string &eventId) { weightNotice = NULL; }
+    } weightListener;
+}
 
 /**
  * Listener used for handling death message.
  */
 // TODO Move somewhere else
-class DeathNoticeListener : public gcn::ActionListener {
-    public:
+namespace {
+    struct DeathListener : public gcn::ActionListener {
         void action(const std::string &eventId) {
             player_node->revive();
             deathNotice = NULL;
         }
-} deathNoticeListener;
+    } deathListener;
+}
 
 PlayerHandler::PlayerHandler()
 {
@@ -142,7 +140,7 @@ void PlayerHandler::handleMessage(MessageIn *msg)
                                              "You are carrying more then half your "
                                              "weight. You are unable to regain "
                                              "health.");
-                                     weightNotice->addActionListener(&weightNoticeListener);
+                                     weightNotice->addActionListener(&weightListener);
                                  }
                                  player_node->mTotalWeight = value;
                                  break;
@@ -164,7 +162,7 @@ void PlayerHandler::handleMessage(MessageIn *msg)
                 {
                     deathNotice = new OkDialog("Message",
                             "You're now dead, press ok to restart");
-                    deathNotice->addActionListener(&deathNoticeListener);
+                    deathNotice->addActionListener(&deathListener);
                     player_node->mAction = Being::DEAD;
                 }
             }
diff --git a/src/net/tradehandler.cpp b/src/net/tradehandler.cpp
index c3fd6d4b..5bce0574 100644
--- a/src/net/tradehandler.cpp
+++ b/src/net/tradehandler.cpp
@@ -38,13 +38,15 @@ std::string tradePartnerName;
 /**
  * Listener for request trade dialogs
  */
-struct RequestTradeListener : public gcn::ActionListener
-{
-    void action(const std::string& eventId)
+namespace {
+    struct RequestTradeListener : public gcn::ActionListener
     {
-        player_node->tradeReply(eventId == "yes");
-    };
-} requestTradeListener;
+        void action(const std::string& eventId)
+        {
+            player_node->tradeReply(eventId == "yes");
+        };
+    } listener;
+}
 
 TradeHandler::TradeHandler()
 {
@@ -77,14 +79,14 @@ void TradeHandler::handleMessage(MessageIn *msg)
                     player_node->tradeReply(false);
                     break;
                 }
-                
+
                 player_node->setTrading(true);
                 tradePartnerName = msg->readString(24);
                 ConfirmDialog *dlg;
                 dlg = new ConfirmDialog("Request for trade",
                         tradePartnerName +
                         " wants to trade with you, do you accept?");
-                dlg->addActionListener(&requestTradeListener);
+                dlg->addActionListener(&listener);
             break;
 
         case SMSG_TRADE_RESPONSE: