summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-09-26 13:54:12 +0300
committerAndrei Karas <akaras@inbox.ru>2013-09-26 14:41:36 +0300
commit851cc4e95093cb7bd1adce99be95a864d68f8d38 (patch)
tree50096efbfea146de63432ca95d1faacdbd62df80 /src/gui
parent476a73f07d4dae7f0cc3c79a44fbd2c2f8c4bf5f (diff)
downloadManaVerse-851cc4e95093cb7bd1adce99be95a864d68f8d38.tar.gz
ManaVerse-851cc4e95093cb7bd1adce99be95a864d68f8d38.tar.bz2
ManaVerse-851cc4e95093cb7bd1adce99be95a864d68f8d38.tar.xz
ManaVerse-851cc4e95093cb7bd1adce99be95a864d68f8d38.zip
remove useless virtual keywords.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/botcheckerwindow.cpp14
-rw-r--r--src/gui/buydialog.cpp6
-rw-r--r--src/gui/buyselldialog.h2
-rw-r--r--src/gui/chatwindow.cpp6
-rw-r--r--src/gui/inventorywindow.cpp6
-rw-r--r--src/gui/itemamountwindow.cpp6
-rw-r--r--src/gui/logindialog.cpp12
-rw-r--r--src/gui/questswindow.cpp2
-rw-r--r--src/gui/selldialog.h2
-rw-r--r--src/gui/setup_audio.cpp2
-rw-r--r--src/gui/setup_relations.cpp30
-rw-r--r--src/gui/setup_relations.h8
-rw-r--r--src/gui/setup_theme.cpp12
-rw-r--r--src/gui/setup_video.cpp8
-rw-r--r--src/gui/socialwindow.cpp2
-rw-r--r--src/gui/statuswindow.cpp4
-rw-r--r--src/gui/textcommandeditor.cpp19
-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
-rw-r--r--src/gui/worldselectdialog.cpp2
31 files changed, 101 insertions, 103 deletions
diff --git a/src/gui/botcheckerwindow.cpp b/src/gui/botcheckerwindow.cpp
index 74af1142d..58321b12f 100644
--- a/src/gui/botcheckerwindow.cpp
+++ b/src/gui/botcheckerwindow.cpp
@@ -66,27 +66,27 @@ public:
A_DELETE_COPY(UsersTableModel)
- virtual ~UsersTableModel()
+ ~UsersTableModel()
{
freeWidgets();
}
- virtual int getRows() const
+ int getRows() const
{
return static_cast<int>(mPlayers.size());
}
- virtual int getColumns() const
+ int getColumns() const
{
return COLUMNS_NR;
}
- virtual int getRowHeight() const
+ int getRowHeight() const
{
return ROW_HEIGHT;
}
- virtual int getColumnWidth(const int index) const
+ int getColumnWidth(const int index) const
{
if (index == NAME_COLUMN)
return NAME_COLUMN_WIDTH;
@@ -231,11 +231,11 @@ public:
signalAfterUpdate();
}
- virtual void updateModelInRow(const int row A_UNUSED) const
+ void updateModelInRow(const int row A_UNUSED) const
{
}
- virtual gcn::Widget *getElementAt(const int row, const int column) const
+ gcn::Widget *getElementAt(const int row, const int column) const
{
return mWidgets[WIDGET_AT(row, column)];
}
diff --git a/src/gui/buydialog.cpp b/src/gui/buydialog.cpp
index ce7c32ba2..309a2922c 100644
--- a/src/gui/buydialog.cpp
+++ b/src/gui/buydialog.cpp
@@ -71,13 +71,13 @@ static const char *const SORT_NAME_BUY[7] =
class SortListModelBuy final : public gcn::ListModel
{
public:
- virtual ~SortListModelBuy()
+ ~SortListModelBuy()
{ }
- virtual int getNumberOfElements()
+ int getNumberOfElements()
{ return 7; }
- virtual std::string getElementAt(int i)
+ std::string getElementAt(int i)
{
if (i >= getNumberOfElements() || i < 0)
return "???";
diff --git a/src/gui/buyselldialog.h b/src/gui/buyselldialog.h
index 74cf5d932..193364ff8 100644
--- a/src/gui/buyselldialog.h
+++ b/src/gui/buyselldialog.h
@@ -49,7 +49,7 @@ class BuySellDialog final : public Window, public gcn::ActionListener
A_DELETE_COPY(BuySellDialog)
- virtual ~BuySellDialog();
+ ~BuySellDialog();
void init();
diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp
index 9fca48e7d..1f3ff51bb 100644
--- a/src/gui/chatwindow.cpp
+++ b/src/gui/chatwindow.cpp
@@ -172,15 +172,15 @@ const char *COLOR_NAME[14] =
class ColorListModel final : public gcn::ListModel
{
public:
- virtual ~ColorListModel()
+ ~ColorListModel()
{ }
- virtual int getNumberOfElements()
+ int getNumberOfElements()
{
return 14;
}
- virtual std::string getElementAt(int i)
+ std::string getElementAt(int i)
{
if (i >= getNumberOfElements() || i < 0)
return "???";
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index a1c4287c8..f8b688dee 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -82,13 +82,13 @@ static const char *const SORT_NAME_INVENTORY[6] =
class SortListModelInv final : public gcn::ListModel
{
public:
- virtual ~SortListModelInv()
+ ~SortListModelInv()
{ }
- virtual int getNumberOfElements() override
+ int getNumberOfElements() override
{ return 6; }
- virtual std::string getElementAt(int i) override
+ std::string getElementAt(int i) override
{
if (i >= getNumberOfElements() || i < 0)
return "???";
diff --git a/src/gui/itemamountwindow.cpp b/src/gui/itemamountwindow.cpp
index e9a178b02..1fd15e351 100644
--- a/src/gui/itemamountwindow.cpp
+++ b/src/gui/itemamountwindow.cpp
@@ -79,15 +79,15 @@ public:
A_DELETE_COPY(ItemsModal)
- virtual ~ItemsModal()
+ ~ItemsModal()
{ }
- virtual int getNumberOfElements() override
+ int getNumberOfElements() override
{
return static_cast<int>(mStrings.size());
}
- virtual std::string getElementAt(int i) override
+ std::string getElementAt(int i) override
{
if (i < 0 || i >= getNumberOfElements())
return "???";
diff --git a/src/gui/logindialog.cpp b/src/gui/logindialog.cpp
index 9af26b6ae..e4c19e604 100644
--- a/src/gui/logindialog.cpp
+++ b/src/gui/logindialog.cpp
@@ -88,15 +88,15 @@ class UpdateTypeModel final : public gcn::ListModel
A_DELETE_COPY(UpdateTypeModel)
- virtual ~UpdateTypeModel()
+ ~UpdateTypeModel()
{ }
- virtual int getNumberOfElements() override
+ int getNumberOfElements() override
{
return 3;
}
- virtual std::string getElementAt(int i) override
+ std::string getElementAt(int i) override
{
if (i >= getNumberOfElements() || i < 0)
return "???";
@@ -115,17 +115,17 @@ class UpdateListModel final : public gcn::ListModel
A_DELETE_COPY(UpdateListModel)
- virtual ~UpdateListModel()
+ ~UpdateListModel()
{ }
- virtual int getNumberOfElements() override
+ int getNumberOfElements() override
{
if (!mLoginData)
return 0;
return static_cast<int>(mLoginData->updateHosts.size());
}
- virtual std::string getElementAt(int i) override
+ std::string getElementAt(int i) override
{
if (!mLoginData || i >= getNumberOfElements() || i < 0)
return "???";
diff --git a/src/gui/questswindow.cpp b/src/gui/questswindow.cpp
index 3013da0ff..e77d2bbd7 100644
--- a/src/gui/questswindow.cpp
+++ b/src/gui/questswindow.cpp
@@ -96,7 +96,7 @@ class QuestsModel final : public ExtendedNamesModel
A_DELETE_COPY(QuestsModel)
- virtual ~QuestsModel()
+ ~QuestsModel()
{ }
};
diff --git a/src/gui/selldialog.h b/src/gui/selldialog.h
index c114253ba..532244845 100644
--- a/src/gui/selldialog.h
+++ b/src/gui/selldialog.h
@@ -63,7 +63,7 @@ class SellDialog final : public Window,
/**
* Destructor
*/
- virtual ~SellDialog();
+ ~SellDialog();
void init();
diff --git a/src/gui/setup_audio.cpp b/src/gui/setup_audio.cpp
index f99ca862b..eb4240585 100644
--- a/src/gui/setup_audio.cpp
+++ b/src/gui/setup_audio.cpp
@@ -48,7 +48,7 @@ public:
Theme::fillSoundsList(mNames);
}
- virtual ~SoundsModel()
+ ~SoundsModel()
{ }
};
diff --git a/src/gui/setup_relations.cpp b/src/gui/setup_relations.cpp
index 7e97800d5..f675d1045 100644
--- a/src/gui/setup_relations.cpp
+++ b/src/gui/setup_relations.cpp
@@ -81,15 +81,15 @@ static const char *const RELATION_NAMES[PlayerRelation::RELATIONS_NR] =
class PlayerRelationListModel final : public gcn::ListModel
{
public:
- virtual ~PlayerRelationListModel()
+ ~PlayerRelationListModel()
{ }
- virtual int getNumberOfElements() override
+ int getNumberOfElements() override
{
return PlayerRelation::RELATIONS_NR;
}
- virtual std::string getElementAt(int i) override
+ std::string getElementAt(int i) override
{
if (i >= getNumberOfElements() || i < 0)
return "";
@@ -112,7 +112,7 @@ public:
A_DELETE_COPY(PlayerTableModel)
- virtual ~PlayerTableModel()
+ ~PlayerTableModel()
{
freeWidgets();
delete mListModel;
@@ -121,7 +121,7 @@ public:
mPlayers = nullptr;
}
- virtual int getRows() const override
+ int getRows() const override
{
if (mPlayers)
return static_cast<int>(mPlayers->size());
@@ -129,17 +129,17 @@ public:
return 0;
}
- virtual int getColumns() const override
+ int getColumns() const override
{
return COLUMNS_NR;
}
- virtual int getRowHeight() const override
+ int getRowHeight() const override
{
return ROW_HEIGHT;
}
- virtual int getColumnWidth(const int index) const override
+ int getColumnWidth(const int index) const override
{
if (index == NAME_COLUMN)
return NAME_COLUMN_WIDTH;
@@ -147,7 +147,7 @@ public:
return RELATION_CHOICE_COLUMN_WIDTH;
}
- virtual void playerRelationsUpdated()
+ void playerRelationsUpdated()
{
signalBeforeUpdate();
@@ -176,7 +176,7 @@ public:
signalAfterUpdate();
}
- virtual void updateModelInRow(const int row) const
+ void updateModelInRow(const int row) const
{
const DropDown *const choicebox = static_cast<DropDown *>(
getElementAt(row, RELATION_CHOICE_COLUMN));
@@ -186,12 +186,12 @@ public:
}
- virtual gcn::Widget *getElementAt(int row, int column) const override
+ gcn::Widget *getElementAt(int row, int column) const override
{
return mWidgets[WIDGET_AT(row, column)];
}
- virtual void freeWidgets()
+ void freeWidgets()
{
delete mPlayers;
mPlayers = nullptr;
@@ -219,16 +219,16 @@ protected:
class IgnoreChoicesListModel final : public gcn::ListModel
{
public:
- virtual ~IgnoreChoicesListModel()
+ ~IgnoreChoicesListModel()
{ }
- virtual int getNumberOfElements() override
+ int getNumberOfElements() override
{
return static_cast<int>(player_relations.getPlayerIgnoreStrategies()
->size());
}
- virtual std::string getElementAt(int i) override
+ std::string getElementAt(int i) override
{
if (i >= getNumberOfElements() || i < 0)
return "???";
diff --git a/src/gui/setup_relations.h b/src/gui/setup_relations.h
index dc387d5c1..b1e1f8ab0 100644
--- a/src/gui/setup_relations.h
+++ b/src/gui/setup_relations.h
@@ -48,7 +48,7 @@ public:
A_DELETE_COPY(Setup_Relations)
- virtual ~Setup_Relations();
+ ~Setup_Relations();
void apply() override;
@@ -58,11 +58,11 @@ public:
void action(const gcn::ActionEvent &event) override;
- virtual void updatedPlayer(const std::string &name);
+ void updatedPlayer(const std::string &name);
- virtual void updateAll();
+ void updateAll();
- virtual void externalUpdated() override;
+ void externalUpdated() override;
private:
StaticTableModel *mPlayerTableTitleModel;
diff --git a/src/gui/setup_theme.cpp b/src/gui/setup_theme.cpp
index 4715eacf0..850068fd9 100644
--- a/src/gui/setup_theme.cpp
+++ b/src/gui/setup_theme.cpp
@@ -60,7 +60,7 @@ public:
Theme::fillSkinsList(mNames);
}
- virtual ~ThemesModel()
+ ~ThemesModel()
{ }
};
@@ -71,7 +71,7 @@ public:
NamesModel()
{ Theme::fillFontsList(mNames); }
- virtual ~FontsModel()
+ ~FontsModel()
{ }
};
@@ -116,13 +116,13 @@ const char *SIZE_NAME[maxFontSizes] =
class FontSizeChoiceListModel final : public gcn::ListModel
{
public:
- virtual ~FontSizeChoiceListModel()
+ ~FontSizeChoiceListModel()
{ }
- virtual int getNumberOfElements() override A_WARN_UNUSED
+ int getNumberOfElements() override A_WARN_UNUSED
{ return maxFontSizes; }
- virtual std::string getElementAt(int i) override A_WARN_UNUSED
+ std::string getElementAt(int i) override A_WARN_UNUSED
{
if (i >= getNumberOfElements() || i < 0)
return "???";
@@ -193,7 +193,7 @@ public:
A_DELETE_COPY(LangListModel)
- virtual ~LangListModel()
+ ~LangListModel()
{
for (int f = 0; f < langs_count; f ++)
{
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 4c285a879..881aa69d4 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -61,7 +61,7 @@ class ModeListModel final : public gcn::ListModel
A_DELETE_COPY(ModeListModel)
- virtual ~ModeListModel()
+ ~ModeListModel()
{ }
/**
@@ -158,13 +158,13 @@ int ModeListModel::getIndexOf(const std::string &widthXHeightMode)
class OpenGLListModel final : public gcn::ListModel
{
public:
- virtual ~OpenGLListModel()
+ ~OpenGLListModel()
{ }
- virtual int getNumberOfElements() override
+ int getNumberOfElements() override
{ return renderModesListSize; }
- virtual std::string getElementAt(int i) override
+ std::string getElementAt(int i) override
{
if (i >= getNumberOfElements() || i < 0)
return "???";
diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp
index 7d03c1441..f8a1650a4 100644
--- a/src/gui/socialwindow.cpp
+++ b/src/gui/socialwindow.cpp
@@ -513,7 +513,7 @@ public:
return &mMembers;
}
- virtual Avatar *getAvatarAt(int index) override
+ Avatar *getAvatarAt(int index) override
{
return mMembers[index];
}
diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp
index b8d4f0c6a..0f00cb95c 100644
--- a/src/gui/statuswindow.cpp
+++ b/src/gui/statuswindow.cpp
@@ -106,7 +106,7 @@ class DerDisplay final : public AttrDisplay
A_DELETE_COPY(DerDisplay)
- virtual Type getType() const override
+ Type getType() const override
{ return DERIVED; }
};
@@ -121,7 +121,7 @@ class ChangeDisplay final : public AttrDisplay, gcn::ActionListener
std::string update() override;
- virtual Type getType() const override
+ Type getType() const override
{ return CHANGEABLE; }
void setPointsNeeded(int needed);
diff --git a/src/gui/textcommandeditor.cpp b/src/gui/textcommandeditor.cpp
index e947a09de..d960f20f7 100644
--- a/src/gui/textcommandeditor.cpp
+++ b/src/gui/textcommandeditor.cpp
@@ -73,15 +73,15 @@ public:
A_DELETE_COPY(IconsModal)
- virtual ~IconsModal()
+ ~IconsModal()
{ }
- virtual int getNumberOfElements() override
+ int getNumberOfElements() override
{
return static_cast<int>(mStrings.size());
}
- virtual std::string getElementAt(int i) override
+ std::string getElementAt(int i) override
{
if (i < 0 || i >= getNumberOfElements())
return "???";
@@ -121,15 +121,15 @@ const char *MAGIC_SCHOOL_TEXT[6] =
class TargetTypeModel final : public gcn::ListModel
{
public:
- virtual ~TargetTypeModel()
+ ~TargetTypeModel()
{ }
- virtual int getNumberOfElements() override
+ int getNumberOfElements() override
{
return 3;
}
- virtual std::string getElementAt(int i) override
+ std::string getElementAt(int i) override
{
if (i >= getNumberOfElements() || i < 0)
return "???";
@@ -140,15 +140,15 @@ public:
class MagicSchoolModel final : public gcn::ListModel
{
public:
- virtual ~MagicSchoolModel()
+ ~MagicSchoolModel()
{ }
- virtual int getNumberOfElements() override
+ int getNumberOfElements() override
{
return 6;
}
- virtual std::string getElementAt(int i) override
+ std::string getElementAt(int i) override
{
if (i >= getNumberOfElements() || i < 0)
return "???";
@@ -156,7 +156,6 @@ public:
}
};
-
TextCommandEditor::TextCommandEditor(TextCommand *const command) :
// TRANSLATORS: command editor name
Window(_("Command Editor"), false, nullptr, "commandeditor.xml"),
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;
diff --git a/src/gui/worldselectdialog.cpp b/src/gui/worldselectdialog.cpp
index d65bd3d34..d65c02e4f 100644
--- a/src/gui/worldselectdialog.cpp
+++ b/src/gui/worldselectdialog.cpp
@@ -54,7 +54,7 @@ class WorldListModel final : public gcn::ListModel
A_DELETE_COPY(WorldListModel)
- virtual ~WorldListModel()
+ ~WorldListModel()
{ }
int getNumberOfElements() override