summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-08-21 12:45:37 +0300
committerAndrei Karas <akaras@inbox.ru>2014-08-21 12:45:37 +0300
commit3e9f4cee927cd1e6d49d769883b0d42f91c1e5ad (patch)
treed1f46dba69ccd7b939c78a084fb2f6e4992e2ddd
parent35d0dbde1ddfda0a05c7607265c53d430ee3d3d0 (diff)
downloadmanaverse-3e9f4cee927cd1e6d49d769883b0d42f91c1e5ad.tar.gz
manaverse-3e9f4cee927cd1e6d49d769883b0d42f91c1e5ad.tar.bz2
manaverse-3e9f4cee927cd1e6d49d769883b0d42f91c1e5ad.tar.xz
manaverse-3e9f4cee927cd1e6d49d769883b0d42f91c1e5ad.zip
In popupmenu rename showOutfitsPopup into showOutfitsWindowPopup.
-rw-r--r--src/gui/popups/popupmenu.cpp2
-rw-r--r--src/gui/popups/popupmenu.h2
-rw-r--r--src/gui/windows/outfitwindow.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 0add7e10d..00256fcbe 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -565,7 +565,7 @@ void PopupMenu::showMapPopup(const int x, const int y,
showPopup(x, y);
}
-void PopupMenu::showOutfitsPopup(const int x, const int y)
+void PopupMenu::showOutfitsWindowPopup(const int x, const int y)
{
mX = x;
mY = y;
diff --git a/src/gui/popups/popupmenu.h b/src/gui/popups/popupmenu.h
index f9b8cc639..6a991c9e8 100644
--- a/src/gui/popups/popupmenu.h
+++ b/src/gui/popups/popupmenu.h
@@ -103,7 +103,7 @@ class PopupMenu final : public Popup, public LinkHandler
void showDropPopup(const int x, const int y, Item *const item);
- void showOutfitsPopup(const int x, const int y);
+ void showOutfitsWindowPopup(const int x, const int y);
void showSpellPopup(const int x, const int y, TextCommand *const cmd);
diff --git a/src/gui/windows/outfitwindow.cpp b/src/gui/windows/outfitwindow.cpp
index 8fda44a2b..cc162d0ca 100644
--- a/src/gui/windows/outfitwindow.cpp
+++ b/src/gui/windows/outfitwindow.cpp
@@ -426,7 +426,7 @@ void OutfitWindow::mousePressed(MouseEvent &event)
const int index = getIndexFromGrid(event.getX(), event.getY());
if (event.getButton() == MouseButton::RIGHT && popupMenu)
{
- popupMenu->showOutfitsPopup(viewport->mMouseX,
+ popupMenu->showOutfitsWindowPopup(viewport->mMouseX,
viewport->mMouseY);
event.consume();
return;