summaryrefslogtreecommitdiff
path: root/src/gui/windows
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-16 14:22:57 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-16 15:19:51 +0300
commit8406b00588070266ae8af2bf25776f2fa716af69 (patch)
treef3515975feaf7dad0a7fa6ee33f6c88d1c6579b3 /src/gui/windows
parentf880384018ee23efdc5cc072789e176208956a06 (diff)
downloadmv-8406b00588070266ae8af2bf25776f2fa716af69.tar.gz
mv-8406b00588070266ae8af2bf25776f2fa716af69.tar.bz2
mv-8406b00588070266ae8af2bf25776f2fa716af69.tar.xz
mv-8406b00588070266ae8af2bf25776f2fa716af69.zip
move mouseevent into events directory.
Diffstat (limited to 'src/gui/windows')
-rw-r--r--src/gui/windows/chatwindow.cpp14
-rw-r--r--src/gui/windows/chatwindow.h10
-rw-r--r--src/gui/windows/didyouknowwindow.cpp2
-rw-r--r--src/gui/windows/didyouknowwindow.h2
-rw-r--r--src/gui/windows/equipmentwindow.cpp12
-rw-r--r--src/gui/windows/equipmentwindow.h8
-rw-r--r--src/gui/windows/helpwindow.cpp2
-rw-r--r--src/gui/windows/helpwindow.h2
-rw-r--r--src/gui/windows/inventorywindow.cpp18
-rw-r--r--src/gui/windows/inventorywindow.h6
-rw-r--r--src/gui/windows/itemamountwindow.cpp4
-rw-r--r--src/gui/windows/itemamountwindow.h4
-rw-r--r--src/gui/windows/minimap.cpp10
-rw-r--r--src/gui/windows/minimap.h6
-rw-r--r--src/gui/windows/ministatuswindow.cpp8
-rw-r--r--src/gui/windows/ministatuswindow.h6
-rw-r--r--src/gui/windows/npcdialog.cpp4
-rw-r--r--src/gui/windows/npcdialog.h2
-rw-r--r--src/gui/windows/outfitwindow.cpp12
-rw-r--r--src/gui/windows/outfitwindow.h6
-rw-r--r--src/gui/windows/serverdialog.cpp2
-rw-r--r--src/gui/windows/serverdialog.h2
-rw-r--r--src/gui/windows/shortcutwindow.cpp6
-rw-r--r--src/gui/windows/shortcutwindow.h4
-rw-r--r--src/gui/windows/skilldialog.cpp16
-rw-r--r--src/gui/windows/socialwindow.cpp2
-rw-r--r--src/gui/windows/updaterwindow.cpp2
-rw-r--r--src/gui/windows/updaterwindow.h2
-rw-r--r--src/gui/windows/whoisonline.cpp6
-rw-r--r--src/gui/windows/whoisonline.h2
30 files changed, 91 insertions, 91 deletions
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index 1e71c50ae..cbff544fc 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -771,12 +771,12 @@ void ChatWindow::scroll(const int amount) const
tab->scroll(amount);
}
-void ChatWindow::mousePressed(gcn::MouseEvent &event)
+void ChatWindow::mousePressed(MouseEvent &event)
{
if (event.isConsumed())
return;
- if (event.getButton() == gcn::MouseEvent::RIGHT)
+ if (event.getButton() == MouseEvent::RIGHT)
{
if (viewport)
{
@@ -805,7 +805,7 @@ void ChatWindow::mousePressed(gcn::MouseEvent &event)
if (event.isConsumed())
return;
- if (event.getButton() == gcn::MouseEvent::LEFT)
+ if (event.getButton() == MouseEvent::LEFT)
{
const ChatTab *const tab = getFocused();
if (tab)
@@ -816,7 +816,7 @@ void ChatWindow::mousePressed(gcn::MouseEvent &event)
mDragOffsetY = event.getY();
}
-void ChatWindow::mouseDragged(gcn::MouseEvent &event)
+void ChatWindow::mouseDragged(MouseEvent &event)
{
Window::mouseDragged(event);
@@ -1885,19 +1885,19 @@ void ChatWindow::optionChanged(const std::string &name)
parseGlobalsFilter();
}
-void ChatWindow::mouseMoved(gcn::MouseEvent &event)
+void ChatWindow::mouseMoved(MouseEvent &event)
{
mHaveMouse = true;
Window::mouseMoved(event);
}
-void ChatWindow::mouseEntered(gcn::MouseEvent& mouseEvent)
+void ChatWindow::mouseEntered(MouseEvent& mouseEvent)
{
mHaveMouse = true;
Window::mouseEntered(mouseEvent);
}
-void ChatWindow::mouseExited(gcn::MouseEvent& mouseEvent)
+void ChatWindow::mouseExited(MouseEvent& mouseEvent)
{
updateVisibility();
Window::mouseExited(mouseEvent);
diff --git a/src/gui/windows/chatwindow.h b/src/gui/windows/chatwindow.h
index e664e63ce..2ec4e6bec 100644
--- a/src/gui/windows/chatwindow.h
+++ b/src/gui/windows/chatwindow.h
@@ -186,12 +186,12 @@ class ChatWindow final : public Window,
/**
* Handles mouse when dragged.
*/
- void mouseDragged(gcn::MouseEvent &event) override final;
+ void mouseDragged(MouseEvent &event) override final;
/**
* Handles mouse when pressed.
*/
- void mousePressed(gcn::MouseEvent &event) override final;
+ void mousePressed(MouseEvent &event) override final;
void processEvent(const Channels channel,
const DepricatedEvent &event) override final;
@@ -274,11 +274,11 @@ class ChatWindow final : public Window,
void optionChanged(const std::string &name) override final;
- void mouseEntered(gcn::MouseEvent& mouseEvent) override final;
+ void mouseEntered(MouseEvent& mouseEvent) override final;
- void mouseMoved(gcn::MouseEvent &event) override final;
+ void mouseMoved(MouseEvent &event) override final;
- void mouseExited(gcn::MouseEvent& mouseEvent A_UNUSED) override final;
+ void mouseExited(MouseEvent& mouseEvent A_UNUSED) override final;
void draw(Graphics* graphics) override final;
diff --git a/src/gui/windows/didyouknowwindow.cpp b/src/gui/windows/didyouknowwindow.cpp
index 89b1eda26..9b3ba857c 100644
--- a/src/gui/windows/didyouknowwindow.cpp
+++ b/src/gui/windows/didyouknowwindow.cpp
@@ -129,7 +129,7 @@ void DidYouKnowWindow::action(const ActionEvent &event)
}
void DidYouKnowWindow::handleLink(const std::string &link,
- gcn::MouseEvent *event A_UNUSED)
+ MouseEvent *event A_UNUSED)
{
if (strStartWith(link, "http://") || strStartWith(link, "https://"))
openBrowser(link);
diff --git a/src/gui/windows/didyouknowwindow.h b/src/gui/windows/didyouknowwindow.h
index 4f88b3f1c..fd539e360 100644
--- a/src/gui/windows/didyouknowwindow.h
+++ b/src/gui/windows/didyouknowwindow.h
@@ -59,7 +59,7 @@ class DidYouKnowWindow final : public Window,
* Handles link action.
*/
void handleLink(const std::string &link,
- gcn::MouseEvent *event) override final;
+ MouseEvent *event) override final;
void loadData(int num = 0);
diff --git a/src/gui/windows/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp
index 68ef56826..5caf30df1 100644
--- a/src/gui/windows/equipmentwindow.cpp
+++ b/src/gui/windows/equipmentwindow.cpp
@@ -291,7 +291,7 @@ Item *EquipmentWindow::getItem(const int x, const int y) const
return nullptr;
}
-void EquipmentWindow::mousePressed(gcn::MouseEvent& mouseEvent)
+void EquipmentWindow::mousePressed(MouseEvent& mouseEvent)
{
if (!mEquipment)
{
@@ -302,7 +302,7 @@ void EquipmentWindow::mousePressed(gcn::MouseEvent& mouseEvent)
const int x = mouseEvent.getX();
const int y = mouseEvent.getY();
- if (mouseEvent.getButton() == gcn::MouseEvent::LEFT)
+ if (mouseEvent.getButton() == MouseEvent::LEFT)
{
if (mForing)
{
@@ -337,7 +337,7 @@ void EquipmentWindow::mousePressed(gcn::MouseEvent& mouseEvent)
return;
}
}
- else if (mouseEvent.getButton() == gcn::MouseEvent::RIGHT)
+ else if (mouseEvent.getButton() == MouseEvent::RIGHT)
{
if (Item *const item = getItem(x, y))
{
@@ -362,7 +362,7 @@ void EquipmentWindow::mousePressed(gcn::MouseEvent& mouseEvent)
Window::mousePressed(mouseEvent);
}
-void EquipmentWindow::mouseReleased(gcn::MouseEvent &mouseEvent)
+void EquipmentWindow::mouseReleased(MouseEvent &mouseEvent)
{
Window::mouseReleased(mouseEvent);
const DragDropSource src = dragDrop.getSource();
@@ -417,7 +417,7 @@ void EquipmentWindow::mouseReleased(gcn::MouseEvent &mouseEvent)
}
// Show ItemTooltip
-void EquipmentWindow::mouseMoved(gcn::MouseEvent &event)
+void EquipmentWindow::mouseMoved(MouseEvent &event)
{
Window::mouseMoved(event);
@@ -441,7 +441,7 @@ void EquipmentWindow::mouseMoved(gcn::MouseEvent &event)
}
// Hide ItemTooltip
-void EquipmentWindow::mouseExited(gcn::MouseEvent &event A_UNUSED)
+void EquipmentWindow::mouseExited(MouseEvent &event A_UNUSED)
{
if (mItemPopup)
mItemPopup->setVisible(false);
diff --git a/src/gui/windows/equipmentwindow.h b/src/gui/windows/equipmentwindow.h
index bade666ad..c9ca12bbd 100644
--- a/src/gui/windows/equipmentwindow.h
+++ b/src/gui/windows/equipmentwindow.h
@@ -86,7 +86,7 @@ class EquipmentWindow final : public Window,
void action(const ActionEvent &event) override final;
- void mousePressed(gcn::MouseEvent& mouseEvent) override final;
+ void mousePressed(MouseEvent& mouseEvent) override final;
const Item* getEquipment(const int i) const A_WARN_UNUSED
{ return mEquipment ? mEquipment->getEquipment(i) : nullptr; }
@@ -97,11 +97,11 @@ class EquipmentWindow final : public Window,
void resetBeing(const Being *const being);
- void mouseExited(gcn::MouseEvent &event) override final;
+ void mouseExited(MouseEvent &event) override final;
- void mouseMoved(gcn::MouseEvent &event) override final;
+ void mouseMoved(MouseEvent &event) override final;
- void mouseReleased(gcn::MouseEvent &event) override final;
+ void mouseReleased(MouseEvent &event) override final;
void recalcSize();
diff --git a/src/gui/windows/helpwindow.cpp b/src/gui/windows/helpwindow.cpp
index 9738378ea..95bea6e00 100644
--- a/src/gui/windows/helpwindow.cpp
+++ b/src/gui/windows/helpwindow.cpp
@@ -104,7 +104,7 @@ void HelpWindow::action(const ActionEvent &event)
}
void HelpWindow::handleLink(const std::string &link,
- gcn::MouseEvent *event A_UNUSED)
+ MouseEvent *event A_UNUSED)
{
if (!strStartWith(link, "http://") && !strStartWith(link, "https://"))
{
diff --git a/src/gui/windows/helpwindow.h b/src/gui/windows/helpwindow.h
index d8b873408..4290c99f9 100644
--- a/src/gui/windows/helpwindow.h
+++ b/src/gui/windows/helpwindow.h
@@ -65,7 +65,7 @@ class HelpWindow final : public Window,
* Handles link action.
*/
void handleLink(const std::string &link,
- gcn::MouseEvent *event A_UNUSED) override final;
+ MouseEvent *event A_UNUSED) override final;
/**
* Loads help in the dialog.
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp
index a1eb83e7a..09368e2ad 100644
--- a/src/gui/windows/inventorywindow.cpp
+++ b/src/gui/windows/inventorywindow.cpp
@@ -466,7 +466,7 @@ void InventoryWindow::widgetHidden(const Event &event)
mItems->hidePopup();
}
-void InventoryWindow::mouseClicked(gcn::MouseEvent &event)
+void InventoryWindow::mouseClicked(MouseEvent &event)
{
Window::mouseClicked(event);
@@ -482,7 +482,7 @@ void InventoryWindow::mouseClicked(gcn::MouseEvent &event)
&& inputManager.isActionActive(static_cast<int>(
Input::KEY_STOP_ATTACK)));
- if (!mod && !mod2 && event.getButton() == gcn::MouseEvent::RIGHT)
+ if (!mod && !mod2 && event.getButton() == MouseEvent::RIGHT)
{
Item *const item = mItems->getSelectedItem();
@@ -502,8 +502,8 @@ void InventoryWindow::mouseClicked(gcn::MouseEvent &event)
if (!mInventory)
return;
- if (event.getButton() == gcn::MouseEvent::LEFT
- || event.getButton() == gcn::MouseEvent::RIGHT)
+ if (event.getButton() == MouseEvent::LEFT
+ || event.getButton() == MouseEvent::RIGHT)
{
Item *const item = mItems->getSelectedItem();
@@ -514,7 +514,7 @@ void InventoryWindow::mouseClicked(gcn::MouseEvent &event)
{
if (mInventory->isMainInventory())
{
- if (event.getButton() == gcn::MouseEvent::RIGHT)
+ if (event.getButton() == MouseEvent::RIGHT)
{
ItemAmountWindow::showWindow(ItemAmountWindow::StoreAdd,
inventoryWindow, item);
@@ -528,7 +528,7 @@ void InventoryWindow::mouseClicked(gcn::MouseEvent &event)
}
else
{
- if (event.getButton() == gcn::MouseEvent::RIGHT)
+ if (event.getButton() == MouseEvent::RIGHT)
{
ItemAmountWindow::showWindow(ItemAmountWindow::StoreRemove,
inventoryWindow, item);
@@ -545,7 +545,7 @@ void InventoryWindow::mouseClicked(gcn::MouseEvent &event)
{
if (PlayerInfo::isItemProtected(item->getId()))
return;
- if (event.getButton() == gcn::MouseEvent::RIGHT)
+ if (event.getButton() == MouseEvent::RIGHT)
{
ItemAmountWindow::showWindow(ItemAmountWindow::TradeAdd,
tradeWindow, item);
@@ -589,7 +589,7 @@ void InventoryWindow::mouseClicked(gcn::MouseEvent &event)
}
}
-void InventoryWindow::mouseMoved(gcn::MouseEvent &event)
+void InventoryWindow::mouseMoved(MouseEvent &event)
{
Window::mouseMoved(event);
const gcn::Widget *const src = event.getSource();
@@ -608,7 +608,7 @@ void InventoryWindow::mouseMoved(gcn::MouseEvent &event)
}
}
-void InventoryWindow::mouseExited(gcn::MouseEvent &event A_UNUSED)
+void InventoryWindow::mouseExited(MouseEvent &event A_UNUSED)
{
mTextPopup->hide();
}
diff --git a/src/gui/windows/inventorywindow.h b/src/gui/windows/inventorywindow.h
index 03f64b562..96d9d04fb 100644
--- a/src/gui/windows/inventorywindow.h
+++ b/src/gui/windows/inventorywindow.h
@@ -97,7 +97,7 @@ class InventoryWindow final : public Window,
/**
* Handles the mouse clicks.
*/
- void mouseClicked(gcn::MouseEvent &event) override final;
+ void mouseClicked(MouseEvent &event) override final;
/**
* Handles the key presses.
@@ -147,9 +147,9 @@ class InventoryWindow final : public Window,
void widgetResized(const Event &event) override final;
- void mouseMoved(gcn::MouseEvent &event) override final;
+ void mouseMoved(MouseEvent &event) override final;
- void mouseExited(gcn::MouseEvent &event) override final;
+ void mouseExited(MouseEvent &event) override final;
void setVisible(bool visible) override final;
diff --git a/src/gui/windows/itemamountwindow.cpp b/src/gui/windows/itemamountwindow.cpp
index 2158c4dd9..6b7d10173 100644
--- a/src/gui/windows/itemamountwindow.cpp
+++ b/src/gui/windows/itemamountwindow.cpp
@@ -313,7 +313,7 @@ ItemAmountWindow::~ItemAmountWindow()
}
// Show ItemTooltip
-void ItemAmountWindow::mouseMoved(gcn::MouseEvent &event)
+void ItemAmountWindow::mouseMoved(MouseEvent &event)
{
Window::mouseMoved(event);
@@ -328,7 +328,7 @@ void ItemAmountWindow::mouseMoved(gcn::MouseEvent &event)
}
// Hide ItemTooltip
-void ItemAmountWindow::mouseExited(gcn::MouseEvent &event A_UNUSED)
+void ItemAmountWindow::mouseExited(MouseEvent &event A_UNUSED)
{
if (mItemPopup)
mItemPopup->setVisible(false);
diff --git a/src/gui/windows/itemamountwindow.h b/src/gui/windows/itemamountwindow.h
index 76d53eeeb..cf721ee30 100644
--- a/src/gui/windows/itemamountwindow.h
+++ b/src/gui/windows/itemamountwindow.h
@@ -73,9 +73,9 @@ class ItemAmountWindow final : public Window,
void resetAmount();
// MouseListener
- void mouseMoved(gcn::MouseEvent &event) override final;
+ void mouseMoved(MouseEvent &event) override final;
- void mouseExited(gcn::MouseEvent &event) override final;
+ void mouseExited(MouseEvent &event) override final;
/**
* Schedules the Item Amount window for deletion.
diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp
index 691506753..0f0938e20 100644
--- a/src/gui/windows/minimap.cpp
+++ b/src/gui/windows/minimap.cpp
@@ -434,14 +434,14 @@ void Minimap::draw(Graphics *graphics)
BLOCK_END("Minimap::draw")
}
-void Minimap::mouseReleased(gcn::MouseEvent &event)
+void Minimap::mouseReleased(MouseEvent &event)
{
Window::mouseReleased(event);
if (!player_node || !viewport)
return;
- if (event.getButton() == gcn::MouseEvent::LEFT)
+ if (event.getButton() == MouseEvent::LEFT)
{
int x = event.getX();
int y = event.getY();
@@ -449,7 +449,7 @@ void Minimap::mouseReleased(gcn::MouseEvent &event)
player_node->navigateTo(x, y);
}
- else if (event.getButton() == gcn::MouseEvent::RIGHT)
+ else if (event.getButton() == MouseEvent::RIGHT)
{
int x = event.getX();
int y = event.getY();
@@ -458,7 +458,7 @@ void Minimap::mouseReleased(gcn::MouseEvent &event)
}
}
-void Minimap::mouseMoved(gcn::MouseEvent &event)
+void Minimap::mouseMoved(MouseEvent &event)
{
Window::mouseMoved(event);
const int x = event.getX();
@@ -467,7 +467,7 @@ void Minimap::mouseMoved(gcn::MouseEvent &event)
mTextPopup->show(x + rect.x, y + rect.y, mCaption);
}
-void Minimap::mouseExited(gcn::MouseEvent &event)
+void Minimap::mouseExited(MouseEvent &event)
{
Window::mouseExited(event);
mTextPopup->hide();
diff --git a/src/gui/windows/minimap.h b/src/gui/windows/minimap.h
index 661412c57..d99aea13d 100644
--- a/src/gui/windows/minimap.h
+++ b/src/gui/windows/minimap.h
@@ -62,11 +62,11 @@ class Minimap final : public Window, public ConfigListener
*/
void draw(Graphics *graphics) override final;
- void mouseMoved(gcn::MouseEvent &event) override final;
+ void mouseMoved(MouseEvent &event) override final;
- void mouseReleased(gcn::MouseEvent &event) override final;
+ void mouseReleased(MouseEvent &event) override final;
- void mouseExited(gcn::MouseEvent &event) override final;
+ void mouseExited(MouseEvent &event) override final;
void screenToMap(int &x, int &y);
diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp
index 3513bb2ff..b8f2fd7ea 100644
--- a/src/gui/windows/ministatuswindow.cpp
+++ b/src/gui/windows/ministatuswindow.cpp
@@ -315,7 +315,7 @@ void MiniStatusWindow::draw(Graphics *graphics)
BLOCK_END("MiniStatusWindow::draw")
}
-void MiniStatusWindow::mouseMoved(gcn::MouseEvent &event)
+void MiniStatusWindow::mouseMoved(MouseEvent &event)
{
Popup::mouseMoved(event);
@@ -433,12 +433,12 @@ void MiniStatusWindow::mouseMoved(gcn::MouseEvent &event)
}
}
-void MiniStatusWindow::mousePressed(gcn::MouseEvent &event)
+void MiniStatusWindow::mousePressed(MouseEvent &event)
{
if (!viewport)
return;
- if (event.getButton() == gcn::MouseEvent::RIGHT)
+ if (event.getButton() == MouseEvent::RIGHT)
{
const ProgressBar *const bar = dynamic_cast<ProgressBar*>(
event.getSource());
@@ -452,7 +452,7 @@ void MiniStatusWindow::mousePressed(gcn::MouseEvent &event)
}
}
-void MiniStatusWindow::mouseExited(gcn::MouseEvent &event)
+void MiniStatusWindow::mouseExited(MouseEvent &event)
{
Popup::mouseExited(event);
diff --git a/src/gui/windows/ministatuswindow.h b/src/gui/windows/ministatuswindow.h
index 5fccae02e..bb1991c19 100644
--- a/src/gui/windows/ministatuswindow.h
+++ b/src/gui/windows/ministatuswindow.h
@@ -71,11 +71,11 @@ class MiniStatusWindow final : public Popup,
void draw(Graphics *graphics) override final;
- void mouseMoved(gcn::MouseEvent &mouseEvent) override final;
+ void mouseMoved(MouseEvent &mouseEvent) override final;
- void mousePressed(gcn::MouseEvent &event) override final;
+ void mousePressed(MouseEvent &event) override final;
- void mouseExited(gcn::MouseEvent &event) override final;
+ void mouseExited(MouseEvent &event) override final;
void showBar(const std::string &name, const bool visible);
diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp
index 4ee8f3b29..a883406e7 100644
--- a/src/gui/windows/npcdialog.cpp
+++ b/src/gui/windows/npcdialog.cpp
@@ -965,10 +965,10 @@ void NpcDialog::clearDialogs()
mNpcDialogs.clear();
}
-void NpcDialog::mousePressed(gcn::MouseEvent &event)
+void NpcDialog::mousePressed(MouseEvent &event)
{
Window::mousePressed(event);
- if (event.getButton() == gcn::MouseEvent::RIGHT
+ if (event.getButton() == MouseEvent::RIGHT
&& event.getSource() == mTextBox)
{
if (viewport)
diff --git a/src/gui/windows/npcdialog.h b/src/gui/windows/npcdialog.h
index 1fdd4a444..b7b036659 100644
--- a/src/gui/windows/npcdialog.h
+++ b/src/gui/windows/npcdialog.h
@@ -210,7 +210,7 @@ class NpcDialog final : public Window,
void clearRows();
- void mousePressed(gcn::MouseEvent &event);
+ void mousePressed(MouseEvent &event);
int isCloseState() const
{ return mActionState == NPC_ACTION_CLOSE; }
diff --git a/src/gui/windows/outfitwindow.cpp b/src/gui/windows/outfitwindow.cpp
index 6fbb34390..d1413cc0a 100644
--- a/src/gui/windows/outfitwindow.cpp
+++ b/src/gui/windows/outfitwindow.cpp
@@ -366,9 +366,9 @@ void OutfitWindow::draw(Graphics *graphics)
BLOCK_END("OutfitWindow::draw")
}
-void OutfitWindow::mouseDragged(gcn::MouseEvent &event)
+void OutfitWindow::mouseDragged(MouseEvent &event)
{
- if (event.getButton() == gcn::MouseEvent::LEFT)
+ if (event.getButton() == MouseEvent::LEFT)
{
if (dragDrop.isEmpty() && mItemClicked)
{
@@ -409,12 +409,12 @@ void OutfitWindow::mouseDragged(gcn::MouseEvent &event)
Window::mouseDragged(event);
}
-void OutfitWindow::mousePressed(gcn::MouseEvent &event)
+void OutfitWindow::mousePressed(MouseEvent &event)
{
const int index = getIndexFromGrid(event.getX(), event.getY());
if (index == -1)
{
- if (event.getButton() == gcn::MouseEvent::RIGHT && viewport)
+ if (event.getButton() == MouseEvent::RIGHT && viewport)
{
viewport->showOutfitsPopup();
event.consume();
@@ -446,9 +446,9 @@ void OutfitWindow::mousePressed(gcn::MouseEvent &event)
Window::mousePressed(event);
}
-void OutfitWindow::mouseReleased(gcn::MouseEvent &event)
+void OutfitWindow::mouseReleased(MouseEvent &event)
{
- if (event.getButton() == gcn::MouseEvent::LEFT)
+ if (event.getButton() == MouseEvent::LEFT)
{
if (mCurrentOutfit < 0 || mCurrentOutfit
>= static_cast<signed int>(OUTFITS_COUNT))
diff --git a/src/gui/windows/outfitwindow.h b/src/gui/windows/outfitwindow.h
index f27852a8c..909b84a41 100644
--- a/src/gui/windows/outfitwindow.h
+++ b/src/gui/windows/outfitwindow.h
@@ -54,11 +54,11 @@ class OutfitWindow final : public Window,
void draw(Graphics *graphics) override final;
- void mousePressed(gcn::MouseEvent &event) override final;
+ void mousePressed(MouseEvent &event) override final;
- void mouseDragged(gcn::MouseEvent &event) override final;
+ void mouseDragged(MouseEvent &event) override final;
- void mouseReleased(gcn::MouseEvent &event) override final;
+ void mouseReleased(MouseEvent &event) override final;
void load(const bool oldConfig = false);
diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp
index c4bd7c79f..4ad0e8360 100644
--- a/src/gui/windows/serverdialog.cpp
+++ b/src/gui/windows/serverdialog.cpp
@@ -506,7 +506,7 @@ void ServerDialog::valueChanged(const gcn::SelectionEvent &)
mDeleteButton->setEnabled(true);
}
-void ServerDialog::mouseClicked(gcn::MouseEvent &mouseEvent)
+void ServerDialog::mouseClicked(MouseEvent &mouseEvent)
{
if (mouseEvent.getClickCount() == 2 &&
mouseEvent.getSource() == mServersList)
diff --git a/src/gui/windows/serverdialog.h b/src/gui/windows/serverdialog.h
index d14360b88..41ef8bcf1 100644
--- a/src/gui/windows/serverdialog.h
+++ b/src/gui/windows/serverdialog.h
@@ -125,7 +125,7 @@ class ServerDialog final : public Window,
*/
void valueChanged(const gcn::SelectionEvent &event) override final;
- void mouseClicked(gcn::MouseEvent &mouseEvent) override final;
+ void mouseClicked(MouseEvent &mouseEvent) override final;
void logic() override final;
diff --git a/src/gui/windows/shortcutwindow.cpp b/src/gui/windows/shortcutwindow.cpp
index 7916ce8e4..50bc6fcd1 100644
--- a/src/gui/windows/shortcutwindow.cpp
+++ b/src/gui/windows/shortcutwindow.cpp
@@ -195,21 +195,21 @@ void ShortcutWindow::widgetHidden(const Event &event)
}
}
-void ShortcutWindow::mousePressed(gcn::MouseEvent &event)
+void ShortcutWindow::mousePressed(MouseEvent &event)
{
Window::mousePressed(event);
if (event.isConsumed())
return;
- if (event.getButton() == gcn::MouseEvent::LEFT)
+ if (event.getButton() == MouseEvent::LEFT)
{
mDragOffsetX = event.getX();
mDragOffsetY = event.getY();
}
}
-void ShortcutWindow::mouseDragged(gcn::MouseEvent &event)
+void ShortcutWindow::mouseDragged(MouseEvent &event)
{
Window::mouseDragged(event);
diff --git a/src/gui/windows/shortcutwindow.h b/src/gui/windows/shortcutwindow.h
index 707a0a1d7..5e36e68d7 100644
--- a/src/gui/windows/shortcutwindow.h
+++ b/src/gui/windows/shortcutwindow.h
@@ -64,9 +64,9 @@ class ShortcutWindow final : public Window
void widgetMoved(const Event& event) override final;
- void mousePressed(gcn::MouseEvent &event) override final;
+ void mousePressed(MouseEvent &event) override final;
- void mouseDragged(gcn::MouseEvent &event) override final;
+ void mouseDragged(MouseEvent &event) override final;
void nextTab();
diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp
index deeffb9a0..8ec8486e3 100644
--- a/src/gui/windows/skilldialog.cpp
+++ b/src/gui/windows/skilldialog.cpp
@@ -157,7 +157,7 @@ class SkillListBox final : public ListBox
unsigned int getRowHeight() const override
{ return mRowHeight; }
- const SkillInfo *getSkillByEvent(const gcn::MouseEvent &event) const
+ const SkillInfo *getSkillByEvent(const MouseEvent &event) const
{
const int y = (event.getY() + mPadding) / getRowHeight();
if (!mModel || y >= mModel->getNumberOfElements())
@@ -168,7 +168,7 @@ class SkillListBox final : public ListBox
return skill;
}
- void mouseMoved(gcn::MouseEvent &event) override
+ void mouseMoved(MouseEvent &event) override
{
ListBox::mouseMoved(event);
if (!viewport || !dragDrop.isEmpty())
@@ -182,9 +182,9 @@ class SkillListBox final : public ListBox
skill->data->dispName, skill->data->description);
}
- void mouseDragged(gcn::MouseEvent &event)
+ void mouseDragged(MouseEvent &event)
{
- if (event.getButton() == gcn::MouseEvent::LEFT)
+ if (event.getButton() == MouseEvent::LEFT)
{
if (dragDrop.isEmpty())
{
@@ -206,10 +206,10 @@ class SkillListBox final : public ListBox
}
}
- void mousePressed(gcn::MouseEvent &event)
+ void mousePressed(MouseEvent &event)
{
ListBox::mousePressed(event);
- if (event.getButton() == gcn::MouseEvent::LEFT)
+ if (event.getButton() == MouseEvent::LEFT)
{
const SkillInfo *const skill = getSkillByEvent(event);
if (!skill)
@@ -218,12 +218,12 @@ class SkillListBox final : public ListBox
}
}
- void mouseReleased(gcn::MouseEvent &event)
+ void mouseReleased(MouseEvent &event)
{
ListBox::mouseReleased(event);
}
- void mouseExited(gcn::MouseEvent &event A_UNUSED) override
+ void mouseExited(MouseEvent &event A_UNUSED) override
{
mPopup->hide();
}
diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp
index 4df0ab6f1..704bf0ca6 100644
--- a/src/gui/windows/socialwindow.cpp
+++ b/src/gui/windows/socialwindow.cpp
@@ -1242,7 +1242,7 @@ public:
A_DELETE_COPY(CreatePopup)
void handleLink(const std::string &link,
- gcn::MouseEvent *event A_UNUSED) override final
+ MouseEvent *event A_UNUSED) override final
{
if (link == "guild" && socialWindow)
{
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index 109858a07..8e31939ff 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -971,7 +971,7 @@ unsigned long UpdaterWindow::getFileHash(const std::string &filePath)
}
void UpdaterWindow::handleLink(const std::string &link,
- gcn::MouseEvent *event A_UNUSED)
+ MouseEvent *event A_UNUSED)
{
if (strStartWith(link, "http://") || strStartWith(link, "https://"))
openBrowser(link);
diff --git a/src/gui/windows/updaterwindow.h b/src/gui/windows/updaterwindow.h
index ffd5b3103..79d764752 100644
--- a/src/gui/windows/updaterwindow.h
+++ b/src/gui/windows/updaterwindow.h
@@ -126,7 +126,7 @@ class UpdaterWindow final : public Window,
void logic() override final;
void handleLink(const std::string &link,
- gcn::MouseEvent *event A_UNUSED) override final;
+ MouseEvent *event A_UNUSED) override final;
void loadFile(std::string file);
diff --git a/src/gui/windows/whoisonline.cpp b/src/gui/windows/whoisonline.cpp
index 201a5e11e..1af21866d 100644
--- a/src/gui/windows/whoisonline.cpp
+++ b/src/gui/windows/whoisonline.cpp
@@ -159,9 +159,9 @@ WhoIsOnline::~WhoIsOnline()
mOnlineNicks.clear();
}
-void WhoIsOnline::handleLink(const std::string& link, gcn::MouseEvent *event)
+void WhoIsOnline::handleLink(const std::string& link, MouseEvent *event)
{
- if (!event || event->getButton() == gcn::MouseEvent::LEFT)
+ if (!event || event->getButton() == MouseEvent::LEFT)
{
if (chatWindow)
{
@@ -177,7 +177,7 @@ void WhoIsOnline::handleLink(const std::string& link, gcn::MouseEvent *event)
}
}
}
- else if (event->getButton() == gcn::MouseEvent::RIGHT)
+ else if (event->getButton() == MouseEvent::RIGHT)
{
if (player_node && link == player_node->getName())
return;
diff --git a/src/gui/windows/whoisonline.h b/src/gui/windows/whoisonline.h
index 99eeb1911..bc04c8066 100644
--- a/src/gui/windows/whoisonline.h
+++ b/src/gui/windows/whoisonline.h
@@ -128,7 +128,7 @@ public:
void loadList(std::vector<OnlinePlayer*> &list);
void handleLink(const std::string& link,
- gcn::MouseEvent *event) override final;
+ MouseEvent *event) override final;
void logic() override final;