From d0d0ddfeb0bd6cb199e3ac571c876d6bbaaf4b42 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 17 Aug 2014 13:47:55 +0300 Subject: Create public variable for beingpopup. --- src/gui/popupmanager.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'src/gui/popupmanager.cpp') diff --git a/src/gui/popupmanager.cpp b/src/gui/popupmanager.cpp index dc9bdc32f..429958e5c 100644 --- a/src/gui/popupmanager.cpp +++ b/src/gui/popupmanager.cpp @@ -37,16 +37,13 @@ PopupManager *popupManager = nullptr; PopupManager::PopupManager() : - mBeingPopup(new BeingPopup), mTextPopup(new TextPopup) { - mBeingPopup->postInit(); mTextPopup->postInit(); } PopupManager::~PopupManager() { - delete2(mBeingPopup); delete2(mTextPopup); } @@ -58,8 +55,8 @@ void PopupManager::closePopupMenu() void PopupManager::hideBeingPopup() { - if (mBeingPopup) - mBeingPopup->setVisible(false); + if (beingPopup) + beingPopup->setVisible(false); } void PopupManager::hideTextPopup() @@ -88,8 +85,8 @@ void PopupManager::clearPopup() void PopupManager::showBeingPopup(const int x, const int y, Being *const b) { - if (mBeingPopup) - mBeingPopup->show(x, y, b); + if (beingPopup) + beingPopup->show(x, y, b); } void PopupManager::showTextPopup(const int x, const int y, @@ -106,5 +103,5 @@ bool PopupManager::isTextPopupVisible() const bool PopupManager::isBeingPopupVisible() const { - return mBeingPopup ? mBeingPopup->isPopupVisible() : false; + return beingPopup ? beingPopup->isPopupVisible() : false; } -- cgit v1.2.3-70-g09d2