summaryrefslogtreecommitdiff
path: root/src/gui/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/widgets')
-rw-r--r--src/gui/widgets/button.h2
-rw-r--r--src/gui/widgets/characterdisplay.h2
-rw-r--r--src/gui/widgets/dropshortcutcontainer.h2
-rw-r--r--src/gui/widgets/emoteshortcutcontainer.h2
-rw-r--r--src/gui/widgets/guitable.cpp4
-rw-r--r--src/gui/widgets/guitable.h2
-rw-r--r--src/gui/widgets/itemcontainer.h2
-rw-r--r--src/gui/widgets/itemshortcutcontainer.h2
-rw-r--r--src/gui/widgets/layout.h2
-rw-r--r--src/gui/widgets/setuptouchitem.h2
-rw-r--r--src/gui/widgets/spellshortcutcontainer.h2
-rw-r--r--src/gui/widgets/tablemodel.h29
-rw-r--r--src/gui/widgets/vertcontainer.h8
13 files changed, 30 insertions, 31 deletions
diff --git a/src/gui/widgets/button.h b/src/gui/widgets/button.h
index 1d605469e..aa951ff7e 100644
--- a/src/gui/widgets/button.h
+++ b/src/gui/widgets/button.h
@@ -96,7 +96,7 @@ class Button final : public gcn::Button,
*/
void updateAlpha();
- virtual void mouseReleased(gcn::MouseEvent& mouseEvent) override;
+ void mouseReleased(gcn::MouseEvent& mouseEvent) override;
void setDescription(std::string text)
{ mDescription = text; }
diff --git a/src/gui/widgets/characterdisplay.h b/src/gui/widgets/characterdisplay.h
index e8a0be29d..d2fedb8b7 100644
--- a/src/gui/widgets/characterdisplay.h
+++ b/src/gui/widgets/characterdisplay.h
@@ -47,7 +47,7 @@ class CharacterDisplay final : public Container,
A_DELETE_COPY(CharacterDisplay)
- virtual ~CharacterDisplay();
+ ~CharacterDisplay();
void setCharacter(Net::Character *const character);
diff --git a/src/gui/widgets/dropshortcutcontainer.h b/src/gui/widgets/dropshortcutcontainer.h
index 55684a4f5..e57caf6aa 100644
--- a/src/gui/widgets/dropshortcutcontainer.h
+++ b/src/gui/widgets/dropshortcutcontainer.h
@@ -45,7 +45,7 @@ class DropShortcutContainer final : public ShortcutContainer
/**
* Destructor.
*/
- virtual ~DropShortcutContainer();
+ ~DropShortcutContainer();
/**
* Draws the items.
diff --git a/src/gui/widgets/emoteshortcutcontainer.h b/src/gui/widgets/emoteshortcutcontainer.h
index 87ea04bc4..7ec5badb6 100644
--- a/src/gui/widgets/emoteshortcutcontainer.h
+++ b/src/gui/widgets/emoteshortcutcontainer.h
@@ -48,7 +48,7 @@ class EmoteShortcutContainer final : public ShortcutContainer
/**
* Destructor.
*/
- virtual ~EmoteShortcutContainer();
+ ~EmoteShortcutContainer();
/**
* Draws the items.
diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp
index 030605ed5..42e68db55 100644
--- a/src/gui/widgets/guitable.cpp
+++ b/src/gui/widgets/guitable.cpp
@@ -45,9 +45,9 @@ public:
A_DELETE_COPY(GuiTableActionListener)
- virtual ~GuiTableActionListener();
+ ~GuiTableActionListener();
- virtual void action(const gcn::ActionEvent& actionEvent) override;
+ void action(const gcn::ActionEvent& actionEvent) override;
protected:
GuiTable *mTable;
diff --git a/src/gui/widgets/guitable.h b/src/gui/widgets/guitable.h
index 24360062f..fdc089721 100644
--- a/src/gui/widgets/guitable.h
+++ b/src/gui/widgets/guitable.h
@@ -61,7 +61,7 @@ public:
A_DELETE_COPY(GuiTable)
- virtual ~GuiTable();
+ ~GuiTable();
/**
* Retrieves the active table model
diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h
index 1d6df41e6..65d54f373 100644
--- a/src/gui/widgets/itemcontainer.h
+++ b/src/gui/widgets/itemcontainer.h
@@ -73,7 +73,7 @@ class ItemContainer final : public gcn::Widget,
/**
* Destructor.
*/
- virtual ~ItemContainer();
+ ~ItemContainer();
void hidePopup();
diff --git a/src/gui/widgets/itemshortcutcontainer.h b/src/gui/widgets/itemshortcutcontainer.h
index 99abc1b19..4a57e4292 100644
--- a/src/gui/widgets/itemshortcutcontainer.h
+++ b/src/gui/widgets/itemshortcutcontainer.h
@@ -46,7 +46,7 @@ class ItemShortcutContainer final : public ShortcutContainer
/**
* Destructor.
*/
- virtual ~ItemShortcutContainer();
+ ~ItemShortcutContainer();
/**
* Draws the items.
diff --git a/src/gui/widgets/layout.h b/src/gui/widgets/layout.h
index 8a33f03f6..1371420f7 100644
--- a/src/gui/widgets/layout.h
+++ b/src/gui/widgets/layout.h
@@ -173,7 +173,7 @@ class LayoutCell
FILL
};
- virtual ~LayoutCell();
+ ~LayoutCell();
/**
* Sets the padding around the cell content.
diff --git a/src/gui/widgets/setuptouchitem.h b/src/gui/widgets/setuptouchitem.h
index b5f921fb8..30a54ede7 100644
--- a/src/gui/widgets/setuptouchitem.h
+++ b/src/gui/widgets/setuptouchitem.h
@@ -31,7 +31,7 @@ class TouchActionsModel final : public NamesModel
A_DELETE_COPY(TouchActionsModel)
- virtual ~TouchActionsModel()
+ ~TouchActionsModel()
{ }
int getActionFromSelection(const int sel) const;
diff --git a/src/gui/widgets/spellshortcutcontainer.h b/src/gui/widgets/spellshortcutcontainer.h
index a4dbeb96e..f0ebc4ba5 100644
--- a/src/gui/widgets/spellshortcutcontainer.h
+++ b/src/gui/widgets/spellshortcutcontainer.h
@@ -45,7 +45,7 @@ class SpellShortcutContainer final : public ShortcutContainer
/**
* Destructor.
*/
- virtual ~SpellShortcutContainer();
+ ~SpellShortcutContainer();
/**
* Draws the items.
diff --git a/src/gui/widgets/tablemodel.h b/src/gui/widgets/tablemodel.h
index 7d7daacb9..231a5f5e1 100644
--- a/src/gui/widgets/tablemodel.h
+++ b/src/gui/widgets/tablemodel.h
@@ -118,15 +118,14 @@ public:
A_DELETE_COPY(StaticTableModel)
- virtual ~StaticTableModel();
+ ~StaticTableModel();
/**
* Inserts a widget into the table model.
* The model is resized to accomodate the widget's width and height,
* unless column width / row height have been fixed.
*/
- virtual void set(const int row, const int column,
- gcn::Widget *const widget);
+ void set(const int row, const int column, gcn::Widget *const widget);
/**
* Fixes the column width for a given column; this overrides dynamic width
@@ -134,28 +133,28 @@ public:
*
* Semantics are undefined for width 0.
*/
- virtual void fixColumnWidth(const int column, const int width);
+ void fixColumnWidth(const int column, const int width);
/**
* Fixes the row height; this overrides dynamic height inference.
*
* Semantics are undefined for width 0.
*/
- virtual void fixRowHeight(const int height);
+ void fixRowHeight(const int height);
/**
* Resizes the table model
*/
- virtual void resize();
-
- virtual int getRows() const override A_WARN_UNUSED;
- virtual int getColumns() const override A_WARN_UNUSED;
- virtual int getRowHeight() const override A_WARN_UNUSED;
- virtual int getWidth() const A_WARN_UNUSED;
- virtual int getHeight() const A_WARN_UNUSED;
- virtual int getColumnWidth(const int index) const override A_WARN_UNUSED;
- virtual gcn::Widget *getElementAt(const int row, const int column)
- const override A_WARN_UNUSED;
+ void resize();
+
+ int getRows() const override A_WARN_UNUSED;
+ int getColumns() const override A_WARN_UNUSED;
+ int getRowHeight() const override A_WARN_UNUSED;
+ int getWidth() const A_WARN_UNUSED;
+ int getHeight() const A_WARN_UNUSED;
+ int getColumnWidth(const int index) const override A_WARN_UNUSED;
+ gcn::Widget *getElementAt(const int row, const int column)
+ const override A_WARN_UNUSED;
protected:
int mRows, mColumns;
diff --git a/src/gui/widgets/vertcontainer.h b/src/gui/widgets/vertcontainer.h
index a03df0f8f..f48bb0e66 100644
--- a/src/gui/widgets/vertcontainer.h
+++ b/src/gui/widgets/vertcontainer.h
@@ -44,12 +44,12 @@ class VertContainer final : public Container, public gcn::WidgetListener
A_DELETE_COPY(VertContainer)
- virtual void add2(gcn::Widget *const widget, const bool resizable,
- const int spacing = -1);
+ void add2(gcn::Widget *const widget, const bool resizable,
+ const int spacing = -1);
- virtual void add1(gcn::Widget *const widget, const int spacing = -1);
+ void add1(gcn::Widget *const widget, const int spacing = -1);
- virtual void clear();
+ void clear();
void widgetResized(const gcn::Event &event) override;