summaryrefslogtreecommitdiff
path: root/src/gui/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/widgets')
-rw-r--r--src/gui/widgets/browserbox.cpp2
-rw-r--r--src/gui/widgets/browserbox.h4
-rw-r--r--src/gui/widgets/characterdisplay.cpp2
-rw-r--r--src/gui/widgets/characterdisplay.h2
-rw-r--r--src/gui/widgets/dropdown.cpp2
-rw-r--r--src/gui/widgets/dropdown.h4
-rw-r--r--src/gui/widgets/emotepage.cpp2
-rw-r--r--src/gui/widgets/emotepage.h7
-rw-r--r--src/gui/widgets/guitable.cpp2
-rw-r--r--src/gui/widgets/guitable.h4
-rw-r--r--src/gui/widgets/itemcontainer.cpp2
-rw-r--r--src/gui/widgets/itemcontainer.h4
-rw-r--r--src/gui/widgets/linkhandler.h2
-rw-r--r--src/gui/widgets/popup.cpp2
-rw-r--r--src/gui/widgets/popup.h5
-rw-r--r--src/gui/widgets/shortcutcontainer.cpp2
-rw-r--r--src/gui/widgets/shortcutcontainer.h4
-rw-r--r--src/gui/widgets/sliderlist.cpp2
-rw-r--r--src/gui/widgets/sliderlist.h4
-rw-r--r--src/gui/widgets/tabbedarea.cpp2
-rw-r--r--src/gui/widgets/tabbedarea.h4
-rw-r--r--src/gui/widgets/tabs/tab.cpp2
-rw-r--r--src/gui/widgets/tabs/tab.h5
23 files changed, 37 insertions, 34 deletions
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp
index 024dde9c8..cfbc0ec41 100644
--- a/src/gui/widgets/browserbox.cpp
+++ b/src/gui/widgets/browserbox.cpp
@@ -55,7 +55,7 @@ BrowserBox::BrowserBox(const Widget2 *const widget,
const std::string &skin) :
gcn::Widget(),
Widget2(widget),
- gcn::MouseListener(),
+ MouseListener(),
mTextRows(),
mTextRowLinksCount(),
mLineParts(),
diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h
index 85ce9b96b..fa3b90963 100644
--- a/src/gui/widgets/browserbox.h
+++ b/src/gui/widgets/browserbox.h
@@ -26,7 +26,7 @@
#include "gui/widgets/widget2.h"
-#include "gui/base/mouselistener.hpp"
+#include "listeners/mouselistener.h"
#include "gui/base/widget.hpp"
#include <list>
@@ -104,7 +104,7 @@ class LinePart final
*/
class BrowserBox final : public gcn::Widget,
public Widget2,
- public gcn::MouseListener
+ public MouseListener
{
public:
/**
diff --git a/src/gui/widgets/characterdisplay.cpp b/src/gui/widgets/characterdisplay.cpp
index 5ae4e2f5b..54cb3b28d 100644
--- a/src/gui/widgets/characterdisplay.cpp
+++ b/src/gui/widgets/characterdisplay.cpp
@@ -40,7 +40,7 @@
CharacterDisplay::CharacterDisplay(const Widget2 *const widget,
CharSelectDialog *const charSelectDialog) :
Container(widget),
- gcn::MouseListener(),
+ MouseListener(),
gcn::WidgetListener(),
mCharacter(nullptr),
mPlayerBox(new PlayerBox(nullptr)),
diff --git a/src/gui/widgets/characterdisplay.h b/src/gui/widgets/characterdisplay.h
index ebb0d46da..0352a91a0 100644
--- a/src/gui/widgets/characterdisplay.h
+++ b/src/gui/widgets/characterdisplay.h
@@ -38,7 +38,7 @@ class Label;
class TextPopup;
class CharacterDisplay final : public Container,
- public gcn::MouseListener,
+ public MouseListener,
public gcn::WidgetListener
{
public:
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index e4e38aa90..efb3235a4 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -59,7 +59,7 @@ DropDown::DropDown(const Widget2 *const widget,
ActionListener(),
gcn::BasicContainer(),
KeyListener(),
- gcn::MouseListener(),
+ MouseListener(),
FocusListener(),
gcn::SelectionListener(),
Widget2(widget),
diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h
index 525ce83e3..7d645a478 100644
--- a/src/gui/widgets/dropdown.h
+++ b/src/gui/widgets/dropdown.h
@@ -31,7 +31,7 @@
#include "listeners/actionlistener.h"
#include "listeners/focuslistener.h"
#include "listeners/keylistener.h"
-#include "gui/base/mouselistener.hpp"
+#include "listeners/mouselistener.h"
#include "gui/base/selectionlistener.hpp"
#include "localconsts.h"
@@ -53,7 +53,7 @@ class Skin;
class DropDown final : public ActionListener,
public gcn::BasicContainer,
public KeyListener,
- public gcn::MouseListener,
+ public MouseListener,
public FocusListener,
public gcn::SelectionListener,
public Widget2
diff --git a/src/gui/widgets/emotepage.cpp b/src/gui/widgets/emotepage.cpp
index 6101c20ae..c086cd463 100644
--- a/src/gui/widgets/emotepage.cpp
+++ b/src/gui/widgets/emotepage.cpp
@@ -36,7 +36,7 @@ namespace
EmotePage::EmotePage(const Widget2 *const widget) :
gcn::Widget(),
Widget2(widget),
- gcn::MouseListener(),
+ MouseListener(),
gcn::WidgetListener(),
mEmotes(ResourceManager::getInstance()->getImageSet(
"graphics/sprites/chatemotes.png", emoteWidth, emoteHeight)),
diff --git a/src/gui/widgets/emotepage.h b/src/gui/widgets/emotepage.h
index 9cd2867aa..c773d9a66 100644
--- a/src/gui/widgets/emotepage.h
+++ b/src/gui/widgets/emotepage.h
@@ -23,15 +23,16 @@
#include "gui/widgets/widget2.h"
-#include "gui/base/mouselistener.hpp"
-#include "gui/base/widget.hpp"
+#include "listeners/mouselistener.h"
#include "gui/base/widgetlistener.hpp"
+#include "gui/base/widget.hpp"
+
#include "localconsts.h"
class EmotePage final : public gcn::Widget,
public Widget2,
- public gcn::MouseListener,
+ public MouseListener,
public gcn::WidgetListener
{
public:
diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp
index fff2416bf..3d987ed63 100644
--- a/src/gui/widgets/guitable.cpp
+++ b/src/gui/widgets/guitable.cpp
@@ -96,7 +96,7 @@ GuiTable::GuiTable(const Widget2 *const widget,
TableModel *const initial_model, const bool opacity) :
gcn::Widget(),
Widget2(widget),
- gcn::MouseListener(),
+ MouseListener(),
KeyListener(),
mModel(nullptr),
mTopWidget(nullptr),
diff --git a/src/gui/widgets/guitable.h b/src/gui/widgets/guitable.h
index 8d551de2b..a751cac59 100644
--- a/src/gui/widgets/guitable.h
+++ b/src/gui/widgets/guitable.h
@@ -29,7 +29,7 @@
#include "gui/widgets/widget2.h"
#include "listeners/keylistener.h"
-#include "gui/base/mouselistener.hpp"
+#include "listeners/mouselistener.h"
#include "gui/base/widget.hpp"
@@ -48,7 +48,7 @@ class GuiTableActionListener;
*/
class GuiTable final : public gcn::Widget,
public Widget2,
- public gcn::MouseListener,
+ public MouseListener,
public KeyListener,
public TableModelListener
{
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index 4fa8a2705..40c87d272 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -161,7 +161,7 @@ ItemContainer::ItemContainer(const Widget2 *const widget,
gcn::Widget(),
Widget2(widget),
KeyListener(),
- gcn::MouseListener(),
+ MouseListener(),
gcn::WidgetListener(),
mInventory(inventory),
mSelImg(Theme::getImageFromThemeXml("item_selection.xml", "")),
diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h
index 7757fa65c..77d7e1c28 100644
--- a/src/gui/widgets/itemcontainer.h
+++ b/src/gui/widgets/itemcontainer.h
@@ -26,7 +26,7 @@
#include "gui/widgets/widget2.h"
#include "listeners/keylistener.h"
-#include "gui/base/mouselistener.hpp"
+#include "listeners/mouselistener.h"
#include "gui/base/widgetlistener.hpp"
#include "gui/base/widget.hpp"
@@ -53,7 +53,7 @@ namespace gcn
class ItemContainer final : public gcn::Widget,
public Widget2,
public KeyListener,
- public gcn::MouseListener,
+ public MouseListener,
public gcn::WidgetListener
{
public:
diff --git a/src/gui/widgets/linkhandler.h b/src/gui/widgets/linkhandler.h
index f79f1bf50..2f3a6e53f 100644
--- a/src/gui/widgets/linkhandler.h
+++ b/src/gui/widgets/linkhandler.h
@@ -25,7 +25,7 @@
#include <string>
-#include "gui/base/mouselistener.hpp"
+#include "listeners/mouselistener.h"
/**
* A simple interface to windows that need to handle links from BrowserBox
diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp
index c1319737e..a4908c23b 100644
--- a/src/gui/widgets/popup.cpp
+++ b/src/gui/widgets/popup.cpp
@@ -34,7 +34,7 @@
Popup::Popup(const std::string &name,
std::string skin) :
Container(nullptr),
- gcn::MouseListener(),
+ MouseListener(),
gcn::WidgetListener(),
mPadding(3),
mSkin(nullptr),
diff --git a/src/gui/widgets/popup.h b/src/gui/widgets/popup.h
index f0fd1b932..d09331136 100644
--- a/src/gui/widgets/popup.h
+++ b/src/gui/widgets/popup.h
@@ -26,7 +26,7 @@
#include "gui/widgets/container.h"
-#include "gui/base/mouselistener.hpp"
+#include "listeners/mouselistener.h"
#include "gui/base/widgetlistener.hpp"
class ImageCollection;
@@ -45,7 +45,8 @@ class WindowContainer;
*
* \ingroup GUI
*/
-class Popup : public Container, public gcn::MouseListener,
+class Popup : public Container,
+ public MouseListener,
public gcn::WidgetListener
{
public:
diff --git a/src/gui/widgets/shortcutcontainer.cpp b/src/gui/widgets/shortcutcontainer.cpp
index a3030b035..dcb7d1138 100644
--- a/src/gui/widgets/shortcutcontainer.cpp
+++ b/src/gui/widgets/shortcutcontainer.cpp
@@ -32,7 +32,7 @@ ShortcutContainer::ShortcutContainer() :
gcn::Widget(),
Widget2(),
gcn::WidgetListener(),
- gcn::MouseListener(),
+ MouseListener(),
mBackgroundImg(nullptr),
mMaxItems(0),
mBoxWidth(1),
diff --git a/src/gui/widgets/shortcutcontainer.h b/src/gui/widgets/shortcutcontainer.h
index 4d4ff2389..1d734de6a 100644
--- a/src/gui/widgets/shortcutcontainer.h
+++ b/src/gui/widgets/shortcutcontainer.h
@@ -25,7 +25,7 @@
#include "gui/widgets/widget2.h"
-#include "gui/base/mouselistener.hpp"
+#include "listeners/mouselistener.h"
#include "gui/base/widget.hpp"
#include "gui/base/widgetlistener.hpp"
@@ -40,7 +40,7 @@ class ImageCollection;
class ShortcutContainer : public gcn::Widget,
public Widget2,
public gcn::WidgetListener,
- public gcn::MouseListener
+ public MouseListener
{
public:
A_DELETE_COPY(ShortcutContainer)
diff --git a/src/gui/widgets/sliderlist.cpp b/src/gui/widgets/sliderlist.cpp
index 0ae0890dc..d70977ff3 100644
--- a/src/gui/widgets/sliderlist.cpp
+++ b/src/gui/widgets/sliderlist.cpp
@@ -37,7 +37,7 @@ SliderList::SliderList(const Widget2 *const widget,
gcn::ListModel *const listModel) :
Container(widget),
ActionListener(),
- gcn::MouseListener(),
+ MouseListener(),
mLabel(new Label(this)),
mListModel(listModel),
mPrevEventId(),
diff --git a/src/gui/widgets/sliderlist.h b/src/gui/widgets/sliderlist.h
index 3d86f8735..144fa0cf1 100644
--- a/src/gui/widgets/sliderlist.h
+++ b/src/gui/widgets/sliderlist.h
@@ -22,9 +22,9 @@
#define GUI_WIDGETS_SLIDERLIST_H
#include "gui/base/listmodel.hpp"
-#include "gui/base/mouselistener.hpp"
#include "listeners/actionlistener.h"
+#include "listeners/mouselistener.h"
#include "gui/widgets/container.h"
@@ -35,7 +35,7 @@ class Label;
class SliderList final : public Container,
public ActionListener,
- public gcn::MouseListener
+ public MouseListener
{
public:
SliderList(const Widget2 *const widget,
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index 8841560e2..2c431c452 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -38,7 +38,7 @@ TabbedArea::TabbedArea(const Widget2 *const widget) :
ActionListener(),
gcn::BasicContainer(),
KeyListener(),
- gcn::MouseListener(),
+ MouseListener(),
gcn::WidgetListener(),
mSelectedTab(nullptr),
mTabContainer(new gcn::Container()),
diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h
index 03a9f6868..b8b075ade 100644
--- a/src/gui/widgets/tabbedarea.h
+++ b/src/gui/widgets/tabbedarea.h
@@ -26,7 +26,7 @@
#include "gui/widgets/widget2.h"
#include "listeners/keylistener.h"
-#include "gui/base/mouselistener.hpp"
+#include "listeners/mouselistener.h"
#include "gui/base/widgetlistener.hpp"
#include "gui/base/widgets/container.hpp"
@@ -44,7 +44,7 @@ class TabbedArea final : public Widget2,
public ActionListener,
public gcn::BasicContainer,
public KeyListener,
- public gcn::MouseListener,
+ public MouseListener,
public gcn::WidgetListener
{
public:
diff --git a/src/gui/widgets/tabs/tab.cpp b/src/gui/widgets/tabs/tab.cpp
index bba1ef7b6..877329cf8 100644
--- a/src/gui/widgets/tabs/tab.cpp
+++ b/src/gui/widgets/tabs/tab.cpp
@@ -46,7 +46,7 @@ Skin *Tab::tabImg[Tab::TAB_COUNT];
Tab::Tab(const Widget2 *const widget) :
gcn::BasicContainer(),
Widget2(widget),
- gcn::MouseListener(),
+ MouseListener(),
gcn::WidgetListener(),
mLabel(new Label(this)),
mTabbedArea(nullptr),
diff --git a/src/gui/widgets/tabs/tab.h b/src/gui/widgets/tabs/tab.h
index 66f7521d9..a67025842 100644
--- a/src/gui/widgets/tabs/tab.h
+++ b/src/gui/widgets/tabs/tab.h
@@ -26,7 +26,8 @@
#include "gui/widgets/widget2.h"
#include "gui/base/basiccontainer.hpp"
-#include "gui/base/mouselistener.hpp"
+
+#include "listeners/mouselistener.h"
#include "gui/base/widgetlistener.hpp"
#include "localconsts.h"
@@ -41,7 +42,7 @@ class TabbedArea;
*/
class Tab : public gcn::BasicContainer,
public Widget2,
- public gcn::MouseListener,
+ public MouseListener,
public gcn::WidgetListener
{
public:
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-07 11:33:43 +0000