From a316d537dce50f4b4e1e10f5c26a7851baddbd8b Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 24 Aug 2012 18:29:30 +0300 Subject: Small style changes. Also fix overloaded methods visibility. --- src/gui/widgets/dropshortcutcontainer.h | 3 ++- src/gui/widgets/itemshortcutcontainer.h | 3 ++- src/gui/widgets/spellshortcutcontainer.h | 3 ++- src/gui/widgets/whispertab.h | 3 +-- 4 files changed, 7 insertions(+), 5 deletions(-) (limited to 'src/gui/widgets') diff --git a/src/gui/widgets/dropshortcutcontainer.h b/src/gui/widgets/dropshortcutcontainer.h index 91e436836..99ff8bd2e 100644 --- a/src/gui/widgets/dropshortcutcontainer.h +++ b/src/gui/widgets/dropshortcutcontainer.h @@ -71,10 +71,11 @@ class DropShortcutContainer : public ShortcutContainer void widgetHidden(const gcn::Event &event); - private: void mouseExited(gcn::MouseEvent &event); + void mouseMoved(gcn::MouseEvent &event); + private: bool mItemClicked; Item *mItemMoved; diff --git a/src/gui/widgets/itemshortcutcontainer.h b/src/gui/widgets/itemshortcutcontainer.h index 255a8090e..1ed0bf627 100644 --- a/src/gui/widgets/itemshortcutcontainer.h +++ b/src/gui/widgets/itemshortcutcontainer.h @@ -72,10 +72,11 @@ class ItemShortcutContainer : public ShortcutContainer void widgetHidden(const gcn::Event &event); - private: void mouseExited(gcn::MouseEvent &event); + void mouseMoved(gcn::MouseEvent &event); + private: bool mItemClicked; Item *mItemMoved; unsigned mNumber; diff --git a/src/gui/widgets/spellshortcutcontainer.h b/src/gui/widgets/spellshortcutcontainer.h index 72fec758f..e8f4cc2dc 100644 --- a/src/gui/widgets/spellshortcutcontainer.h +++ b/src/gui/widgets/spellshortcutcontainer.h @@ -71,10 +71,11 @@ class SpellShortcutContainer : public ShortcutContainer void widgetHidden(const gcn::Event &event); - private: void mouseExited(gcn::MouseEvent &event); + void mouseMoved(gcn::MouseEvent &event); + private: bool mSpellClicked; TextCommand *mSpellMoved; SpellPopup *mSpellPopup; diff --git a/src/gui/widgets/whispertab.h b/src/gui/widgets/whispertab.h index 226ebaf40..85c670db1 100644 --- a/src/gui/widgets/whispertab.h +++ b/src/gui/widgets/whispertab.h @@ -46,11 +46,10 @@ class WhisperTab : public ChatTab void saveToLogFile(std::string &msg); - void getAutoCompleteList(StringVect &names) const; - protected: friend class ChatWindow; + void getAutoCompleteList(StringVect &names) const; /** * Constructor. * -- cgit v1.2.3-60-g2f50