diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-08-17 21:05:17 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-08-17 21:05:17 +0300 |
commit | d119e4425f418afe1198839a57e7b186d717d587 (patch) | |
tree | 32f67704ac02e373161607946ca130cc5397535a /src/gui/windows | |
parent | c7f654988a90f377bea6cf04492c6577246a0549 (diff) | |
download | mv-d119e4425f418afe1198839a57e7b186d717d587.tar.gz mv-d119e4425f418afe1198839a57e7b186d717d587.tar.bz2 mv-d119e4425f418afe1198839a57e7b186d717d587.tar.xz mv-d119e4425f418afe1198839a57e7b186d717d587.zip |
Remove getters for mouse position and use direct variables.
Diffstat (limited to 'src/gui/windows')
-rw-r--r-- | src/gui/windows/chatwindow.cpp | 4 | ||||
-rw-r--r-- | src/gui/windows/itemamountwindow.cpp | 2 | ||||
-rw-r--r-- | src/gui/windows/minimap.cpp | 4 | ||||
-rw-r--r-- | src/gui/windows/npcdialog.cpp | 4 | ||||
-rw-r--r-- | src/gui/windows/outfitwindow.cpp | 4 | ||||
-rw-r--r-- | src/gui/windows/whoisonline.cpp | 8 |
6 files changed, 13 insertions, 13 deletions
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index 363af7284..2be4f7be5 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -678,8 +678,8 @@ void ChatWindow::mousePressed(MouseEvent &event) ChatTab *const cTab = dynamic_cast<ChatTab*>(tab); if (cTab) { - popupMenu->showChatPopup(viewport->getMouseX(), - viewport->getMouseY(), + popupMenu->showChatPopup(viewport->mMouseX, + viewport->mMouseY, cTab); } } diff --git a/src/gui/windows/itemamountwindow.cpp b/src/gui/windows/itemamountwindow.cpp index 5f0f063e1..67dc5ee75 100644 --- a/src/gui/windows/itemamountwindow.cpp +++ b/src/gui/windows/itemamountwindow.cpp @@ -275,7 +275,7 @@ void ItemAmountWindow::mouseMoved(MouseEvent &event) if (event.getSource() == mItemIcon) { itemPopup->setItem(mItem); - itemPopup->position(viewport->getMouseX(), viewport->getMouseY()); + itemPopup->position(viewport->mMouseX, viewport->mMouseY); } } diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp index 50e78666f..71689805f 100644 --- a/src/gui/windows/minimap.cpp +++ b/src/gui/windows/minimap.cpp @@ -456,8 +456,8 @@ void Minimap::mouseReleased(MouseEvent &event) int x = event.getX(); int y = event.getY(); screenToMap(x, y); - popupMenu->showMapPopup(viewport->getMouseX(), - viewport->getMouseY(), + popupMenu->showMapPopup(viewport->mMouseX, + viewport->mMouseY, x, y); } } diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp index 8b7a938b0..584776726 100644 --- a/src/gui/windows/npcdialog.cpp +++ b/src/gui/windows/npcdialog.cpp @@ -953,8 +953,8 @@ void NpcDialog::mousePressed(MouseEvent &event) if (popupMenu) { popupMenu->showNpcDialogPopup(mNpcId, - viewport->getMouseX(), - viewport->getMouseY()); + viewport->mMouseX, + viewport->mMouseY); } } } diff --git a/src/gui/windows/outfitwindow.cpp b/src/gui/windows/outfitwindow.cpp index 0cd35e289..8fda44a2b 100644 --- a/src/gui/windows/outfitwindow.cpp +++ b/src/gui/windows/outfitwindow.cpp @@ -426,8 +426,8 @@ void OutfitWindow::mousePressed(MouseEvent &event) const int index = getIndexFromGrid(event.getX(), event.getY()); if (event.getButton() == MouseButton::RIGHT && popupMenu) { - popupMenu->showOutfitsPopup(viewport->getMouseX(), - viewport->getMouseY()); + popupMenu->showOutfitsPopup(viewport->mMouseX, + viewport->mMouseY); event.consume(); return; } diff --git a/src/gui/windows/whoisonline.cpp b/src/gui/windows/whoisonline.cpp index c30f19b8e..61a588f00 100644 --- a/src/gui/windows/whoisonline.cpp +++ b/src/gui/windows/whoisonline.cpp @@ -210,14 +210,14 @@ void WhoIsOnline::handleLink(const std::string& link, MouseEvent *event) if (being && popupManager) { - popupMenu->showPopup(viewport->getMouseX(), - viewport->getMouseY(), + popupMenu->showPopup(viewport->mMouseX, + viewport->mMouseY, being); return; } } - popupMenu->showPlayerPopup(viewport->getMouseX(), - viewport->getMouseY(), + popupMenu->showPlayerPopup(viewport->mMouseX, + viewport->mMouseY, link); } } |