diff options
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/chatwindow.cpp | 2 | ||||
-rw-r--r-- | src/gui/chatwindow.h | 2 | ||||
-rw-r--r-- | src/gui/inventorywindow.cpp | 5 | ||||
-rw-r--r-- | src/gui/inventorywindow.h | 2 | ||||
-rw-r--r-- | src/gui/killstats.cpp | 4 | ||||
-rw-r--r-- | src/gui/killstats.h | 4 | ||||
-rw-r--r-- | src/gui/ministatuswindow.cpp | 4 | ||||
-rw-r--r-- | src/gui/ministatuswindow.h | 2 | ||||
-rw-r--r-- | src/gui/statuswindow.cpp | 4 | ||||
-rw-r--r-- | src/gui/statuswindow.h | 2 |
10 files changed, 15 insertions, 16 deletions
diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp index 1b9877363..c52511189 100644 --- a/src/gui/chatwindow.cpp +++ b/src/gui/chatwindow.cpp @@ -822,7 +822,7 @@ void ChatWindow::keyPressed(gcn::KeyEvent &event) addInputText(Temp, false); } -void ChatWindow::event(Mana::Channels channel, const Mana::Event &event) +void ChatWindow::processEvent(Mana::Channels channel, const Mana::Event &event) { if (channel == Mana::CHANNEL_NOTICES) { diff --git a/src/gui/chatwindow.h b/src/gui/chatwindow.h index 6e1d548a3..97e366701 100644 --- a/src/gui/chatwindow.h +++ b/src/gui/chatwindow.h @@ -196,7 +196,7 @@ class ChatWindow : public Window, */ void mousePressed(gcn::MouseEvent &event); - void event(Mana::Channels channel, const Mana::Event &event); + void processEvent(Mana::Channels channel, const Mana::Event &event); /** * Scrolls the chat window diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp index 7a70135fd..da1c45782 100644 --- a/src/gui/inventorywindow.cpp +++ b/src/gui/inventorywindow.cpp @@ -564,7 +564,6 @@ void InventoryWindow::updateButtons(Item *item) else mSplitButton->setEnabled(false); } - } void InventoryWindow::setSplitAllowed(bool allowed) @@ -585,8 +584,8 @@ void InventoryWindow::close() } } -void InventoryWindow::event(Mana::Channels channel A_UNUSED, - const Mana::Event &event) +void InventoryWindow::processEvent(Mana::Channels channel A_UNUSED, + const Mana::Event &event) { if (event.getName() == Mana::EVENT_UPDATEATTRIBUTE) { diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h index 14a53a179..c32fd8905 100644 --- a/src/gui/inventorywindow.h +++ b/src/gui/inventorywindow.h @@ -127,7 +127,7 @@ class InventoryWindow : public Window, void updateDropButton(); - void event(Mana::Channels channel, const Mana::Event &event); + void processEvent(Mana::Channels channel, const Mana::Event &event); void updateButtons(Item *item = 0); diff --git a/src/gui/killstats.cpp b/src/gui/killstats.cpp index 7d0a9fe11..0cadc765b 100644 --- a/src/gui/killstats.cpp +++ b/src/gui/killstats.cpp @@ -437,8 +437,8 @@ void KillStats::validateJacko() } } -void KillStats::event(Mana::Channels channel A_UNUSED, - const Mana::Event &event) +void KillStats::processEvent(Mana::Channels channel A_UNUSED, + const Mana::Event &event) { if (event.getName() == Mana::EVENT_UPDATEATTRIBUTE) { diff --git a/src/gui/killstats.h b/src/gui/killstats.h index ff2a8f010..8562e67a4 100644 --- a/src/gui/killstats.h +++ b/src/gui/killstats.h @@ -78,8 +78,8 @@ class KillStats : public Window, gcn::ActionListener, public Mana::Listener void addLog(std::string str); - void event(Mana::Channels channel A_UNUSED, - const Mana::Event &event); + void processEvent(Mana::Channels channel A_UNUSED, + const Mana::Event &event); private: void validateJacko(); diff --git a/src/gui/ministatuswindow.cpp b/src/gui/ministatuswindow.cpp index da39eb24c..b325bcef6 100644 --- a/src/gui/ministatuswindow.cpp +++ b/src/gui/ministatuswindow.cpp @@ -218,8 +218,8 @@ void MiniStatusWindow::drawIcons(Graphics *graphics) } } -void MiniStatusWindow::event(Mana::Channels channel A_UNUSED, - const Mana::Event &event) +void MiniStatusWindow::processEvent(Mana::Channels channel A_UNUSED, + const Mana::Event &event) { if (event.getName() == Mana::EVENT_UPDATEATTRIBUTE) { diff --git a/src/gui/ministatuswindow.h b/src/gui/ministatuswindow.h index 19517326b..91aebcfac 100644 --- a/src/gui/ministatuswindow.h +++ b/src/gui/ministatuswindow.h @@ -66,7 +66,7 @@ class MiniStatusWindow : public Popup, void drawIcons(Graphics *graphics); - void event(Mana::Channels channel, const Mana::Event &event); + void processEvent(Mana::Channels channel, const Mana::Event &event); void updateStatus(); diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp index a85f60133..97130b103 100644 --- a/src/gui/statuswindow.cpp +++ b/src/gui/statuswindow.cpp @@ -276,8 +276,8 @@ StatusWindow::StatusWindow(): mLvlLabel->adjustSize(); } -void StatusWindow::event(Mana::Channels channel A_UNUSED, - const Mana::Event &event) +void StatusWindow::processEvent(Mana::Channels channel A_UNUSED, + const Mana::Event &event) { static bool blocked = false; if (blocked) diff --git a/src/gui/statuswindow.h b/src/gui/statuswindow.h index 44d052004..fa957d059 100644 --- a/src/gui/statuswindow.h +++ b/src/gui/statuswindow.h @@ -58,7 +58,7 @@ class StatusWindow : public Window, */ StatusWindow(); - void event(Mana::Channels channel, const Mana::Event &event); + void processEvent(Mana::Channels channel, const Mana::Event &event); void setPointsNeeded(int id, int needed); |