Move renamelistener into separate file.

6 files changed, 142 insertions, 68 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 85e0bb0fb..aac6e98e4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -781,6 +781,8 @@ SET(SRCS
     being/playerrelations.h
     being/targetcursorsize.h
     listeners/playerrelationslistener.h
+    listeners/renamelistener.cpp
+    listeners/renamelistener.h
     position.cpp
     position.h
     resources/map/properties.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 1e8620275..9040b95d4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -869,6 +869,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      being/playerrelations.h \
 	      being/targetcursorsize.h \
 	      listeners/playerrelationslistener.h \
+	      listeners/renamelistener.cpp \
+	      listeners/renamelistener.h \
 	      position.cpp \
 	      position.h \
 	      resources/map/properties.h \
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 524758719..c284b92a0 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -2901,54 +2901,6 @@ void PopupMenu::showGMPopup()
     showPopup(getX(), getY());
 }
 
-RenameListener::RenameListener() :
-    ActionListener(),
-    mMapItemX(0),
-    mMapItemY(0),
-    mDialog(nullptr)
-{
-}
-
-void RenameListener::setMapItem(const MapItem *const mapItem)
-{
-    if (mapItem)
-    {
-        mMapItemX = mapItem->getX();
-        mMapItemY = mapItem->getY();
-    }
-    else
-    {
-        mMapItemX = 0;
-        mMapItemY = 0;
-    }
-}
-
-void RenameListener::action(const ActionEvent &event)
-{
-    if (event.getId() == "ok" && viewport && mDialog)
-    {
-        Map *const map = viewport->getMap();
-        if (!map)
-            return;
-
-        SpecialLayer *const sl = map->getSpecialLayer();
-        MapItem *item = nullptr;
-        if (sl)
-        {
-            item = sl->getTile(mMapItemX, mMapItemY);
-            if (item)
-                item->setComment(mDialog->getText());
-        }
-        item = map->findPortalXY(mMapItemX, mMapItemY);
-        if (item)
-            item->setComment(mDialog->getText());
-
-        if (socialWindow)
-            socialWindow->updatePortalNames();
-    }
-    mDialog = nullptr;
-}
-
 PlayerListener::PlayerListener() :
     ActionListener(),
     mNick(),
diff --git a/src/gui/popups/popupmenu.h b/src/gui/popups/popupmenu.h
index 94db12343..fbbb69cd0 100644
--- a/src/gui/popups/popupmenu.h
+++ b/src/gui/popups/popupmenu.h
@@ -27,6 +27,7 @@
 #include "gui/widgets/popup.h"
 
 #include "listeners/actionlistener.h"
+#include "listeners/renamelistener.h"
 
 #include "localconsts.h"
 
@@ -46,26 +47,6 @@ class TextField;
 class ProgressBar;
 class Window;
 
-class RenameListener final : public ActionListener
-{
-    public:
-        RenameListener();
-
-        A_DELETE_COPY(RenameListener)
-
-        void action(const ActionEvent &event) override final;
-
-        void setMapItem(const MapItem *const mapItem);
-
-        void setDialog(TextDialog *dialog)
-        { mDialog = dialog; }
-
-    private:
-        int mMapItemX;
-        int mMapItemY;
-        TextDialog *mDialog;
-};
-
 class PlayerListener : public ActionListener
 {
     public:
diff --git a/src/listeners/renamelistener.cpp b/src/listeners/renamelistener.cpp
new file mode 100644
index 000000000..2b928cdb0
--- /dev/null
+++ b/src/listeners/renamelistener.cpp
@@ -0,0 +1,86 @@
+/*
+ *  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/>.
+ */
+
+#include "listeners/renamelistener.h"
+
+#include "actormanager.h"
+
+#include "being/being.h"
+
+#include "gui/viewport.h"
+
+#include "gui/windows/socialwindow.h"
+#include "gui/windows/textdialog.h"
+
+#include "gui/popups/popupmenu.h"
+
+#include "resources/map/map.h"
+#include "resources/map/mapitem.h"
+#include "resources/map/speciallayer.h"
+
+#include "debug.h"
+
+RenameListener::RenameListener() :
+    ActionListener(),
+    mMapItemX(0),
+    mMapItemY(0),
+    mDialog(nullptr)
+{
+}
+
+void RenameListener::setMapItem(const MapItem *const mapItem)
+{
+    if (mapItem)
+    {
+        mMapItemX = mapItem->getX();
+        mMapItemY = mapItem->getY();
+    }
+    else
+    {
+        mMapItemX = 0;
+        mMapItemY = 0;
+    }
+}
+
+void RenameListener::action(const ActionEvent &event)
+{
+    if (event.getId() == "ok" && viewport && mDialog)
+    {
+        Map *const map = viewport->getMap();
+        if (!map)
+            return;
+
+        SpecialLayer *const sl = map->getSpecialLayer();
+        MapItem *item = nullptr;
+        if (sl)
+        {
+            item = sl->getTile(mMapItemX, mMapItemY);
+            if (item)
+                item->setComment(mDialog->getText());
+        }
+        item = map->findPortalXY(mMapItemX, mMapItemY);
+        if (item)
+            item->setComment(mDialog->getText());
+
+        if (socialWindow)
+            socialWindow->updatePortalNames();
+    }
+    mDialog = nullptr;
+}
diff --git a/src/listeners/renamelistener.h b/src/listeners/renamelistener.h
new file mode 100644
index 000000000..302830547
--- /dev/null
+++ b/src/listeners/renamelistener.h
@@ -0,0 +1,51 @@
+/*
+ *  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 LISTENERS_RENAMELISTENER_H
+#define LISTENERS_RENAMELISTENER_H
+
+#include "listeners/actionlistener.h"
+
+#include "localconsts.h"
+
+class MapItem;
+class TextDialog;
+
+class RenameListener final : public ActionListener
+{
+    public:
+        RenameListener();
+
+        A_DELETE_COPY(RenameListener)
+
+        void action(const ActionEvent &event) override final;
+
+        void setMapItem(const MapItem *const mapItem);
+
+        void setDialog(TextDialog *dialog)
+        { mDialog = dialog; }
+
+    private:
+        int mMapItemX;
+        int mMapItemY;
+        TextDialog *mDialog;
+};
+
+#endif  // LISTENERS_RENAMELISTENER_H