diff options
author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-04-09 00:16:28 +0200 |
---|---|---|
committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-04-09 17:54:13 +0200 |
commit | 404d3f7f2f9aa455bea423a6a00025df23cd6687 (patch) | |
tree | 27f6655b3345be1ab109433a55b0512dfe48cb34 /src/gui | |
parent | 1e1f619b9ae5aa26058c499c988f45d1fb1b6d53 (diff) | |
download | mana-client-404d3f7f2f9aa455bea423a6a00025df23cd6687.tar.gz mana-client-404d3f7f2f9aa455bea423a6a00025df23cd6687.tar.bz2 mana-client-404d3f7f2f9aa455bea423a6a00025df23cd6687.tar.xz mana-client-404d3f7f2f9aa455bea423a6a00025df23cd6687.zip |
Removed the Mana namespace
It's just an annoyance when it's only applied to a few classes. Either
we place everything in this namespace or nothing, and at the moment I
don't see any rationale for placing everything in a Mana namespace.
Acked-by: Jared Adams
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/chat.cpp | 22 | ||||
-rw-r--r-- | src/gui/chat.h | 4 | ||||
-rw-r--r-- | src/gui/equipmentwindow.cpp | 2 | ||||
-rw-r--r-- | src/gui/gui.cpp | 10 | ||||
-rw-r--r-- | src/gui/inventorywindow.cpp | 26 | ||||
-rw-r--r-- | src/gui/inventorywindow.h | 4 | ||||
-rw-r--r-- | src/gui/itemamount.cpp | 12 | ||||
-rw-r--r-- | src/gui/ministatus.cpp | 14 | ||||
-rw-r--r-- | src/gui/ministatus.h | 4 | ||||
-rw-r--r-- | src/gui/npcdialog.cpp | 40 | ||||
-rw-r--r-- | src/gui/npcdialog.h | 4 | ||||
-rw-r--r-- | src/gui/outfitwindow.cpp | 4 | ||||
-rw-r--r-- | src/gui/popupmenu.cpp | 6 | ||||
-rw-r--r-- | src/gui/skilldialog.cpp | 6 | ||||
-rw-r--r-- | src/gui/skilldialog.h | 4 | ||||
-rw-r--r-- | src/gui/statuswindow.cpp | 10 | ||||
-rw-r--r-- | src/gui/statuswindow.h | 4 | ||||
-rw-r--r-- | src/gui/viewport.cpp | 14 | ||||
-rw-r--r-- | src/gui/viewport.h | 4 | ||||
-rw-r--r-- | src/gui/widgets/itemcontainer.cpp | 12 |
20 files changed, 103 insertions, 103 deletions
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp index 17eb8af3..491542a8 100644 --- a/src/gui/chat.cpp +++ b/src/gui/chat.cpp @@ -90,8 +90,8 @@ ChatWindow::ChatWindow(): mAutoComplete(new ChatAutoComplete), mTmpVisible(false) { - listen(Mana::Event::ChatChannel); - listen(Mana::Event::NoticesChannel); + listen(Event::ChatChannel); + listen(Event::NoticesChannel); setWindowName("Chat"); @@ -375,33 +375,33 @@ void ChatWindow::mouseDragged(gcn::MouseEvent &event) } } -void ChatWindow::event(Mana::Event::Channel channel, const Mana::Event &event) +void ChatWindow::event(Event::Channel channel, const Event &event) { - if (channel == Mana::Event::NoticesChannel) + if (channel == Event::NoticesChannel) { - if (event.getType() == Mana::Event::ServerNotice) + if (event.getType() == Event::ServerNotice) localChatTab->chatLog(event.getString("message"), BY_SERVER); } - else if (channel == Mana::Event::ChatChannel) + else if (channel == Event::ChatChannel) { - if (event.getType() == Mana::Event::Whisper) + if (event.getType() == Event::Whisper) { whisper(event.getString("nick"), event.getString("message")); } - else if (event.getType() == Mana::Event::WhisperError) + else if (event.getType() == Event::WhisperError) { whisper(event.getString("nick"), event.getString("error"), BY_SERVER); } - else if (event.getType() == Mana::Event::Player) + else if (event.getType() == Event::Player) { localChatTab->chatLog(event.getString("message"), BY_PLAYER); } - else if (event.getType() == Mana::Event::Announcement) + else if (event.getType() == Event::Announcement) { localChatTab->chatLog(event.getString("message"), BY_GM); } - else if (event.getType() == Mana::Event::Being) + else if (event.getType() == Event::Being) { if (event.getInt("permissions") & PlayerRelation::SPEECH_LOG) localChatTab->chatLog(event.getString("message"), BY_OTHER); diff --git a/src/gui/chat.h b/src/gui/chat.h index 4ec2a179..bba3a477 100644 --- a/src/gui/chat.h +++ b/src/gui/chat.h @@ -77,7 +77,7 @@ struct CHATLOG */ class ChatWindow : public Window, public gcn::ActionListener, - public Mana::Listener + public Listener { public: /** @@ -158,7 +158,7 @@ class ChatWindow : public Window, void mousePressed(gcn::MouseEvent &event); void mouseDragged(gcn::MouseEvent &event); - void event(Mana::Event::Channel channel, const Mana::Event &event); + void event(Event::Channel channel, const Event &event); /** * Scrolls the chat window diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp index 09ad6207..339cf717 100644 --- a/src/gui/equipmentwindow.cpp +++ b/src/gui/equipmentwindow.cpp @@ -113,7 +113,7 @@ void EquipmentWindow::action(const gcn::ActionEvent &event) if (event.getId() == "unequip" && mSelected > -1) { Item *item = mEquipment->getEquipment(mSelected); - item->doEvent(Mana::Event::DoUnequip); + item->doEvent(Event::DoUnequip); setSelected(-1); } } diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index b8ce7989..2aca60bf 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -50,18 +50,18 @@ SDLInput *guiInput = 0; // Bolded font gcn::Font *boldFont = 0; -class GuiConfigListener : public Mana::Listener +class GuiConfigListener : public Listener { public: GuiConfigListener(Gui *g): mGui(g) {} - void event(Mana::Event::Channel channel, const Mana::Event &event) + void event(Event::Channel channel, const Event &event) { - if (channel == Mana::Event::ConfigChannel) + if (channel == Event::ConfigChannel) { - if (event.getType() == Mana::Event::ConfigOptionChanged && + if (event.getType() == Event::ConfigOptionChanged && event.getString("option") == "customcursor") { bool bCustomCursor = config.getBoolValue("customcursor"); @@ -141,7 +141,7 @@ Gui::Gui(Graphics *graphics): // Initialize mouse cursor and listen for changes to the option setUseCustomCursor(config.getBoolValue("customcursor")); mConfigListener = new GuiConfigListener(this); - mConfigListener->listen(Mana::Event::ConfigChannel); + mConfigListener->listen(Event::ConfigChannel); } Gui::~Gui() diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp index 7a8d5f09..4ebcce8b 100644 --- a/src/gui/inventorywindow.cpp +++ b/src/gui/inventorywindow.cpp @@ -61,7 +61,7 @@ InventoryWindow::InventoryWindow(Inventory *inventory): mFilterText(new TextField), mSplit(false) { - listen(Mana::Event::AttributesChannel); + listen(Event::AttributesChannel); setWindowName(isMainInventory() ? "Inventory" : "Storage"); setupWindow->registerWindowForReset(this); @@ -195,19 +195,19 @@ void InventoryWindow::action(const gcn::ActionEvent &event) return; if (event.getId() == "activate") - item->doEvent(Mana::Event::DoUse); + item->doEvent(Event::DoUse); else if (event.getId() == "equip") { if (item->isEquippable()) { if (item->isEquipped()) - item->doEvent(Mana::Event::DoUnequip); + item->doEvent(Event::DoUnequip); else - item->doEvent(Mana::Event::DoEquip); + item->doEvent(Event::DoEquip); } else { - item->doEvent(Mana::Event::DoUse); + item->doEvent(Event::DoUse); } } else if (event.getId() == "drop") @@ -265,21 +265,21 @@ void InventoryWindow::mouseClicked(gcn::MouseEvent &event) return; if (mInventory->isMainInventory()) { - Mana::Event event(Mana::Event::DoMove); + Event event(Event::DoMove); event.setItem("item", item); event.setInt("amount", item->getQuantity()); event.setInt("source", Inventory::INVENTORY); event.setInt("destination", Inventory::STORAGE); - event.trigger(Mana::Event::ItemChannel); + event.trigger(Event::ItemChannel); } else { - Mana::Event event(Mana::Event::DoMove); + Event event(Event::DoMove); event.setItem("item", item); event.setInt("amount", item->getQuantity()); event.setInt("source", Inventory::STORAGE); event.setInt("destination", Inventory::INVENTORY); - event.trigger(Mana::Event::ItemChannel); + event.trigger(Event::ItemChannel); } } } @@ -383,16 +383,16 @@ void InventoryWindow::close() } else { - Mana::Event event(Mana::Event::DoCloseInventory); + Event event(Event::DoCloseInventory); event.setInt("type", mInventory->getType()); - event.trigger(Mana::Event::ItemChannel); + event.trigger(Event::ItemChannel); scheduleDelete(); } } -void InventoryWindow::event(Mana::Event::Channel channel, const Mana::Event &event) +void InventoryWindow::event(Event::Channel channel, const Event &event) { - if (event.getType() == Mana::Event::UpdateAttribute) + if (event.getType() == Event::UpdateAttribute) { int id = event.getInt("id"); if (id == TOTAL_WEIGHT || diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h index c1f6ec57..d192fafa 100644 --- a/src/gui/inventorywindow.h +++ b/src/gui/inventorywindow.h @@ -49,7 +49,7 @@ class InventoryWindow : public Window, public gcn::KeyListener, public gcn::SelectionListener, public InventoryListener, - public Mana::Listener + public Listener { public: /** @@ -116,7 +116,7 @@ class InventoryWindow : public Window, bool isMainInventory() { return mInventory->isMainInventory(); } - void event(Mana::Event::Channel channel, const Mana::Event &event); + void event(Event::Channel channel, const Event &event); private: /** diff --git a/src/gui/itemamount.cpp b/src/gui/itemamount.cpp index 7782466d..43cdf1cf 100644 --- a/src/gui/itemamount.cpp +++ b/src/gui/itemamount.cpp @@ -47,29 +47,29 @@ void ItemAmountWindow::finish(Item *item, int amount, Usage usage) tradeWindow->tradeItem(item, amount); break; case ItemDrop: - item->doEvent(Mana::Event::DoDrop, amount); + item->doEvent(Event::DoDrop, amount); break; case ItemSplit: - item->doEvent(Mana::Event::DoSplit, amount); + item->doEvent(Event::DoSplit, amount); break; case StoreAdd: { - Mana::Event event(Mana::Event::DoMove); + Event event(Event::DoMove); event.setItem("item", item); event.setInt("amount", amount); event.setInt("source", Inventory::INVENTORY); event.setInt("destination", Inventory::STORAGE); - event.trigger(Mana::Event::ItemChannel); + event.trigger(Event::ItemChannel); } break; case StoreRemove: { - Mana::Event event(Mana::Event::DoMove); + Event event(Event::DoMove); event.setItem("item", item); event.setInt("amount", amount); event.setInt("source", Inventory::STORAGE); event.setInt("destination", Inventory::INVENTORY); - event.trigger(Mana::Event::ItemChannel); + event.trigger(Event::ItemChannel); } break; default: diff --git a/src/gui/ministatus.cpp b/src/gui/ministatus.cpp index 5791b4fb..0fdf59b1 100644 --- a/src/gui/ministatus.cpp +++ b/src/gui/ministatus.cpp @@ -47,7 +47,7 @@ extern volatile int tick_time; MiniStatusWindow::MiniStatusWindow(): Popup("MiniStatus") { - listen(Mana::Event::AttributesChannel); + listen(Event::AttributesChannel); mHpBar = new ProgressBar(0, 100, 20, Theme::PROG_HP); StatusWindow::updateHPBar(mHpBar); @@ -119,12 +119,12 @@ void MiniStatusWindow::drawIcons(Graphics *graphics) } } -void MiniStatusWindow::event(Mana::Event::Channel channel, - const Mana::Event &event) +void MiniStatusWindow::event(Event::Channel channel, + const Event &event) { - if (channel == Mana::Event::AttributesChannel) + if (channel == Event::AttributesChannel) { - if (event.getType() == Mana::Event::UpdateAttribute) + if (event.getType() == Event::UpdateAttribute) { int id = event.getInt("id"); if (id == HP || id == MAX_HP) @@ -141,9 +141,9 @@ void MiniStatusWindow::event(Mana::Event::Channel channel, } } } - else if (channel == Mana::Event::ActorSpriteChannel) + else if (channel == Event::ActorSpriteChannel) { - if (event.getType() == Mana::Event::UpdateStatusEffect) + if (event.getType() == Event::UpdateStatusEffect) { int index = event.getInt("index"); bool newStatus = event.getBool("newStatus"); diff --git a/src/gui/ministatus.h b/src/gui/ministatus.h index 88d2d88a..7fbb8597 100644 --- a/src/gui/ministatus.h +++ b/src/gui/ministatus.h @@ -38,14 +38,14 @@ class TextPopup; * * \ingroup Interface */ -class MiniStatusWindow : public Popup, public Mana::Listener +class MiniStatusWindow : public Popup, public Listener { public: MiniStatusWindow(); void drawIcons(Graphics *graphics); - void event(Mana::Event::Channel channel, const Mana::Event &event); + void event(Event::Channel channel, const Event &event); void logic(); // Updates icons diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp index 8322a735..a8f61a1a 100644 --- a/src/gui/npcdialog.cpp +++ b/src/gui/npcdialog.cpp @@ -52,10 +52,10 @@ typedef std::map<int, NpcDialog*> NpcDialogs; -class NpcEventListener : public Mana::Listener +class NpcEventListener : public Listener { public: - void event(Mana::Event::Channel channel, const Mana::Event &event); + void event(Event::Channel channel, const Event &event); NpcDialog *getDialog(int id, bool make = true); @@ -143,7 +143,7 @@ NpcDialog::NpcDialog(int npcId) setVisible(true); requestFocus(); - listen(Mana::Event::ConfigChannel); + listen(Event::ConfigChannel); PlayerInfo::setNPCInteractionCount(PlayerInfo::getNPCInteractionCount() + 1); } @@ -387,12 +387,12 @@ void NpcDialog::setVisible(bool visible) } } -void NpcDialog::event(Mana::Event::Channel channel, const Mana::Event &event) +void NpcDialog::event(Event::Channel channel, const Event &event) { - if (channel != Mana::Event::ConfigChannel) + if (channel != Event::ConfigChannel) return; - if (event.getType() == Mana::Event::ConfigOptionChanged && + if (event.getType() == Event::ConfigOptionChanged && event.getString("option") == "logNpcInGui") { mLogInteraction = config.getBoolValue("logNpcInGui"); @@ -436,7 +436,7 @@ void NpcDialog::setup() npcListener = new NpcEventListener(); - npcListener->listen(Mana::Event::NpcChannel); + npcListener->listen(Event::NpcChannel); } void NpcDialog::buildLayout() @@ -506,19 +506,19 @@ void NpcDialog::buildLayout() mScrollArea->setVerticalScrollAmount(mScrollArea->getVerticalMaxScroll()); } -void NpcEventListener::event(Mana::Event::Channel channel, - const Mana::Event &event) +void NpcEventListener::event(Event::Channel channel, + const Event &event) { - if (channel != Mana::Event::NpcChannel) + if (channel != Event::NpcChannel) return; - if (event.getType() == Mana::Event::Message) + if (event.getType() == Event::Message) { NpcDialog *dialog = getDialog(event.getInt("id")); dialog->addText(event.getString("text")); } - else if (event.getType() == Mana::Event::Menu) + else if (event.getType() == Event::Menu) { NpcDialog *dialog = getDialog(event.getInt("id")); @@ -528,7 +528,7 @@ void NpcEventListener::event(Mana::Event::Channel channel, for (int i = 1; i <= count; i++) dialog->addChoice(event.getString("choice" + toString(i))); } - else if (event.getType() == Mana::Event::IntegerInput) + else if (event.getType() == Event::IntegerInput) { NpcDialog *dialog = getDialog(event.getInt("id")); @@ -538,7 +538,7 @@ void NpcEventListener::event(Mana::Event::Channel channel, dialog->integerRequest(defaultValue, min, max); } - else if (event.getType() == Mana::Event::StringInput) + else if (event.getType() == Event::StringInput) { NpcDialog *dialog = getDialog(event.getInt("id")); @@ -546,12 +546,12 @@ void NpcEventListener::event(Mana::Event::Channel channel, { dialog->textRequest(event.getString("default")); } - catch (Mana::BadEvent) + catch (BadEvent) { dialog->textRequest(""); } } - else if (event.getType() == Mana::Event::Next) + else if (event.getType() == Event::Next) { int id = event.getInt("id"); NpcDialog *dialog = getDialog(id, false); @@ -565,7 +565,7 @@ void NpcEventListener::event(Mana::Event::Channel channel, dialog->showNextButton(); } - else if (event.getType() == Mana::Event::Close) + else if (event.getType() == Event::Close) { int id = event.getInt("id"); NpcDialog *dialog = getDialog(id, false); @@ -579,11 +579,11 @@ void NpcEventListener::event(Mana::Event::Channel channel, dialog->showCloseButton(); } - else if (event.getType() == Mana::Event::CloseAll) + else if (event.getType() == Event::CloseAll) { NpcDialog::closeAll(); } - else if (event.getType() == Mana::Event::End) + else if (event.getType() == Event::End) { int id = event.getInt("id"); NpcDialog *dialog = getDialog(id, false); @@ -591,7 +591,7 @@ void NpcEventListener::event(Mana::Event::Channel channel, if (dialog) dialog->close(); } - else if (event.getType() == Mana::Event::Post) + else if (event.getType() == Event::Post) { new NpcPostDialog(event.getInt("id")); } diff --git a/src/gui/npcdialog.h b/src/gui/npcdialog.h index 7923cfa3..9981e088 100644 --- a/src/gui/npcdialog.h +++ b/src/gui/npcdialog.h @@ -45,7 +45,7 @@ class Button; * \ingroup Interface */ class NpcDialog : public Window, public gcn::ActionListener, - public gcn::ListModel, public Mana::Listener + public gcn::ListModel, public Listener { public: /** @@ -145,7 +145,7 @@ class NpcDialog : public Window, public gcn::ActionListener, void setVisible(bool visible); - void event(Mana::Event::Channel channel, const Mana::Event &event); + void event(Event::Channel channel, const Event &event); /** * Returns the first active instance. Useful for pushing user diff --git a/src/gui/outfitwindow.cpp b/src/gui/outfitwindow.cpp index e54fed04..efa0e08b 100644 --- a/src/gui/outfitwindow.cpp +++ b/src/gui/outfitwindow.cpp @@ -172,7 +172,7 @@ void OutfitWindow::wearOutfit(int outfit) if (item && !item->isEquipped() && item->getQuantity()) { if (item->isEquippable()) - item->doEvent(Mana::Event::DoEquip); + item->doEvent(Event::DoEquip); } } } @@ -341,7 +341,7 @@ void OutfitWindow::unequipNotInOutfit(int outfit) Item *item = inventory->getItem(i); if (item) - item->doEvent(Mana::Event::DoUnequip); + item->doEvent(Event::DoUnequip); } } } diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp index 6c8662a0..7e648311 100644 --- a/src/gui/popupmenu.cpp +++ b/src/gui/popupmenu.cpp @@ -269,13 +269,13 @@ void PopupMenu::handleLink(const std::string &link) if (mItem->isEquippable()) { if (mItem->isEquipped()) - mItem->doEvent(Mana::Event::DoUnequip); + mItem->doEvent(Event::DoUnequip); else - mItem->doEvent(Mana::Event::DoEquip); + mItem->doEvent(Event::DoEquip); } else { - mItem->doEvent(Mana::Event::DoUse); + mItem->doEvent(Event::DoUse); } } else if (link == "chat") diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp index 95324e98..4c405254 100644 --- a/src/gui/skilldialog.cpp +++ b/src/gui/skilldialog.cpp @@ -212,7 +212,7 @@ private: SkillDialog::SkillDialog(): Window(_("Skills")) { - listen(Mana::Event::AttributesChannel); + listen(Event::AttributesChannel); setWindowName("Skills"); setCloseButton(true); @@ -280,9 +280,9 @@ void SkillDialog::update() } } -void SkillDialog::event(Mana::Event::Channel channel, const Mana::Event &event) +void SkillDialog::event(Event::Channel channel, const Event &event) { - if (event.getType() == Mana::Event::UpdateAttribute) + if (event.getType() == Event::UpdateAttribute) { if (event.getInt("id") == SKILL_POINTS) { diff --git a/src/gui/skilldialog.h b/src/gui/skilldialog.h index b6d1d4ae..d83210b5 100644 --- a/src/gui/skilldialog.h +++ b/src/gui/skilldialog.h @@ -42,14 +42,14 @@ struct SkillInfo; * * \ingroup Interface */ -class SkillDialog : public Window, public gcn::ActionListener, public Mana::Listener +class SkillDialog : public Window, public gcn::ActionListener, public Listener { public: SkillDialog(); ~SkillDialog(); - void event(Mana::Event::Channel channel, const Mana::Event &event); + void event(Event::Channel channel, const Event &event); /** * Called when receiving actions from widget. diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp index b124a883..28ed6c68 100644 --- a/src/gui/statuswindow.cpp +++ b/src/gui/statuswindow.cpp @@ -96,7 +96,7 @@ class ChangeDisplay : public AttrDisplay, gcn::ActionListener StatusWindow::StatusWindow(): Window(player_node->getName()) { - listen(Mana::Event::AttributesChannel); + listen(Event::AttributesChannel); setWindowName("Status"); setupWindow->registerWindowForReset(this); @@ -217,10 +217,10 @@ StatusWindow::StatusWindow(): mLvlLabel->adjustSize(); } -void StatusWindow::event(Mana::Event::Channel channel, - const Mana::Event &event) +void StatusWindow::event(Event::Channel channel, + const Event &event) { - if (event.getType() == Mana::Event::UpdateAttribute) + if (event.getType() == Event::UpdateAttribute) { switch(event.getInt("id")) { @@ -266,7 +266,7 @@ void StatusWindow::event(Mana::Event::Channel channel, break; } } - else if (event.getType() == Mana::Event::UpdateStat) + else if (event.getType() == Event::UpdateStat) { int id = event.getInt("id"); diff --git a/src/gui/statuswindow.h b/src/gui/statuswindow.h index 6a08fd09..d52dbd72 100644 --- a/src/gui/statuswindow.h +++ b/src/gui/statuswindow.h @@ -40,7 +40,7 @@ class VertContainer; * * \ingroup Interface */ -class StatusWindow : public Window, public Mana::Listener +class StatusWindow : public Window, public Listener { public: /** @@ -48,7 +48,7 @@ class StatusWindow : public Window, public Mana::Listener */ StatusWindow(); - void event(Mana::Event::Channel channel, const Mana::Event &event); + void event(Event::Channel channel, const Event &event); void updateAttrs(); diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index 3ec88102..e5211baa 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -71,8 +71,8 @@ Viewport::Viewport(): setFocusable(true); - listen(Mana::Event::ConfigChannel); - listen(Mana::Event::ActorSpriteChannel); + listen(Event::ConfigChannel); + listen(Event::ActorSpriteChannel); } Viewport::~Viewport() @@ -584,10 +584,10 @@ void Viewport::hideBeingPopup() mBeingPopup->setVisible(false); } -void Viewport::event(Mana::Event::Channel channel, const Mana::Event &event) +void Viewport::event(Event::Channel channel, const Event &event) { - if (channel == Mana::Event::ActorSpriteChannel - && event.getType() == Mana::Event::Destroyed) + if (channel == Event::ActorSpriteChannel + && event.getType() == Event::Destroyed) { ActorSprite *actor = event.getActor("source"); @@ -597,8 +597,8 @@ void Viewport::event(Mana::Event::Channel channel, const Mana::Event &event) if (mHoverItem == actor) mHoverItem = 0; } - else if (channel == Mana::Event::ConfigChannel && - event.getType() == Mana::Event::ConfigOptionChanged) + else if (channel == Event::ConfigChannel && + event.getType() == Event::ConfigOptionChanged) { const std::string option = event.getString("option"); if (option == "ScrollLaziness" || option == "ScrollRadius") diff --git a/src/gui/viewport.h b/src/gui/viewport.h index eec09478..feb521d7 100644 --- a/src/gui/viewport.h +++ b/src/gui/viewport.h @@ -54,7 +54,7 @@ const int walkingMouseDelay = 500; * coordinates. */ class Viewport : public WindowContainer, public gcn::MouseListener, - public Mana::Listener + public Listener { public: /** @@ -171,7 +171,7 @@ class Viewport : public WindowContainer, public gcn::MouseListener, void shakeScreenStop() { mShakeEffects.clear(); } - void event(Mana::Event::Channel channel, const Mana::Event &event); + void event(Event::Channel channel, const Event &event); private: /** diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp index 59f7934e..0967055b 100644 --- a/src/gui/widgets/itemcontainer.cpp +++ b/src/gui/widgets/itemcontainer.cpp @@ -346,10 +346,10 @@ void ItemContainer::mouseReleased(gcn::MouseEvent &event) Item *item = getSelectedItem(); { - Mana::Event event(Mana::Event::DoMove); + Event event(Event::DoMove); event.setItem("item", item); event.setInt("newIndex", index); - event.trigger(Mana::Event::ItemChannel); + event.trigger(Event::ItemChannel); } selectNone(); } @@ -418,10 +418,10 @@ void ItemContainer::keyAction() mHighlightedIndex != -1) { Item *item = getSelectedItem(); - Mana::Event event(Mana::Event::DoMove); + Event event(Event::DoMove); event.setItem("item", item); event.setInt("newIndex", mHighlightedIndex); - event.trigger(Mana::Event::ItemChannel); + event.trigger(Event::ItemChannel); setSelectedIndex(mHighlightedIndex); } // If the highlight is on an item then select it. @@ -434,10 +434,10 @@ void ItemContainer::keyAction() else if (mSelectedIndex != -1) { Item *item = getSelectedItem(); - Mana::Event event(Mana::Event::DoMove); + Event event(Event::DoMove); event.setItem("item", item); event.setInt("newIndex", mHighlightedIndex); - event.trigger(Mana::Event::ItemChannel); + event.trigger(Event::ItemChannel); selectNone(); } } |