From 8abff8551a2c35c9e19c90eb4304db6195cf3575 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 17 Aug 2014 15:19:33 +0300
Subject: Use public item popup in itemlinkhandler.

---
 src/gui/widgets/itemlinkhandler.cpp | 15 ++++++---------
 src/gui/widgets/itemlinkhandler.h   |  3 ---
 2 files changed, 6 insertions(+), 12 deletions(-)

(limited to 'src/gui/widgets')

diff --git a/src/gui/widgets/itemlinkhandler.cpp b/src/gui/widgets/itemlinkhandler.cpp
index f63991f8d..433639944 100644
--- a/src/gui/widgets/itemlinkhandler.cpp
+++ b/src/gui/widgets/itemlinkhandler.cpp
@@ -49,15 +49,12 @@ namespace
 }  // namespace
 
 ItemLinkHandler::ItemLinkHandler() :
-    LinkHandler(),
-    mItemPopup(new ItemPopup)
+    LinkHandler()
 {
-    mItemPopup->postInit();
 }
 
 ItemLinkHandler::~ItemLinkHandler()
 {
-    delete2(mItemPopup);
 }
 
 void ItemLinkHandler::handleLink(const std::string &link, MouseEvent *event)
@@ -106,7 +103,7 @@ void ItemLinkHandler::handleLink(const std::string &link, MouseEvent *event)
     }
     else
     {
-        if (!mItemPopup || link.empty())
+        if (!itemPopup || link.empty())
             return;
 
         const char ch = link[0];
@@ -124,14 +121,14 @@ void ItemLinkHandler::handleLink(const std::string &link, MouseEvent *event)
         if (id > 0)
         {
             const ItemInfo &itemInfo = ItemDB::get(id);
-            mItemPopup->setItem(itemInfo, color, true);
-            if (mItemPopup->isPopupVisible())
+            itemPopup->setItem(itemInfo, color, true);
+            if (itemPopup->isPopupVisible())
             {
-                mItemPopup->setVisible(false);
+                itemPopup->setVisible(false);
             }
             else if (viewport)
             {
-                mItemPopup->position(viewport->getMouseX(),
+                itemPopup->position(viewport->getMouseX(),
                     viewport->getMouseY());
             }
         }
diff --git a/src/gui/widgets/itemlinkhandler.h b/src/gui/widgets/itemlinkhandler.h
index 39e811721..c07ede9ad 100644
--- a/src/gui/widgets/itemlinkhandler.h
+++ b/src/gui/widgets/itemlinkhandler.h
@@ -40,9 +40,6 @@ class ItemLinkHandler final : public LinkHandler
 
         void handleLink(const std::string &link,
                         MouseEvent *event) override final;
-
-    private:
-        ItemPopup *mItemPopup;
 };
 
 #endif  // GUI_WIDGETS_ITEMLINKHANDLER_H
-- 
cgit v1.2.3-60-g2f50