2 files changed, 1 insertions, 68 deletions
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: