From df05f66206b2e1f0af1444f91d0885f331af22a6 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 17 Aug 2014 15:46:11 +0300
Subject: Use public item popup in itemamountwindow.

---
 src/gui/windows/itemamountwindow.cpp | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'src/gui/windows/itemamountwindow.cpp')

diff --git a/src/gui/windows/itemamountwindow.cpp b/src/gui/windows/itemamountwindow.cpp
index 4d49eedd9..5f0f063e1 100644
--- a/src/gui/windows/itemamountwindow.cpp
+++ b/src/gui/windows/itemamountwindow.cpp
@@ -102,7 +102,6 @@ ItemAmountWindow::ItemAmountWindow(const Usage usage, Window *const parent,
     mGPLabel(nullptr),
     mItem(item),
     mItemIcon(new Icon(this, item ? item->getImage() : nullptr)),
-    mItemPopup(new ItemPopup),
     mItemAmountSlide(new Slider(this, 1.0, maxRange, 1.0)),
     mItemPriceSlide(nullptr),
     mItemDropDown(nullptr),
@@ -112,8 +111,6 @@ ItemAmountWindow::ItemAmountWindow(const Usage usage, Window *const parent,
     mUsage(usage),
     mEnabledKeyboard(keyboard.isEnabled())
 {
-    mItemPopup->postInit();
-
     if (!mItem)
         return;
 
@@ -265,7 +262,6 @@ void ItemAmountWindow::postInit()
 
 ItemAmountWindow::~ItemAmountWindow()
 {
-    delete2(mItemPopup);
 }
 
 // Show ItemTooltip
@@ -273,21 +269,21 @@ void ItemAmountWindow::mouseMoved(MouseEvent &event)
 {
     Window::mouseMoved(event);
 
-    if (!viewport || !mItemPopup)
+    if (!viewport || !itemPopup)
         return;
 
     if (event.getSource() == mItemIcon)
     {
-        mItemPopup->setItem(mItem);
-        mItemPopup->position(viewport->getMouseX(), viewport->getMouseY());
+        itemPopup->setItem(mItem);
+        itemPopup->position(viewport->getMouseX(), viewport->getMouseY());
     }
 }
 
 // Hide ItemTooltip
 void ItemAmountWindow::mouseExited(MouseEvent &event A_UNUSED)
 {
-    if (mItemPopup)
-        mItemPopup->setVisible(false);
+    if (itemPopup)
+        itemPopup->setVisible(false);
 }
 
 void ItemAmountWindow::resetAmount()
-- 
cgit v1.2.3-60-g2f50