Use override

Adds C++11 override to overridden virtual functions and removes virtual from those functions as it is not required.
gfgit · Dec 1, 2020 · 9c436cb · 9c436cb
1 parent eaabbb0
commit 9c436cb
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/panel/lxqtpanellayout.cpp b/panel/lxqtpanellayout.cpp
@@ -59,7 +59,7 @@ class ItemMoveAnimation : public QVariantAnimation
         setDuration(ANIMATION_DURATION);
     }
 
-    void updateCurrentValue(const QVariant &current)
+    void updateCurrentValue(const QVariant &current) override
     {
         mItem->setGeometry(current.toRect());
     }

diff --git a/plugin-kbindicator/kbindicator-plugin.cpp b/plugin-kbindicator/kbindicator-plugin.cpp
@@ -36,10 +36,10 @@ class LXQtKbIndicatorPlugin: public QObject, public ILXQtPanelPluginLibrary
     Q_PLUGIN_METADATA(IID "lxqt.org/Panel/PluginInterface/3.0")
     Q_INTERFACES(ILXQtPanelPluginLibrary)
 public:
-    virtual ~LXQtKbIndicatorPlugin()
+    ~LXQtKbIndicatorPlugin() override
     {}
 
-    virtual ILXQtPanelPlugin *instance(const ILXQtPanelPluginStartupInfo &startupInfo) const
+    ILXQtPanelPlugin *instance(const ILXQtPanelPluginStartupInfo &startupInfo) const override
     {
         // Currently only X11 supported
         if (!QX11Info::connection()) {

diff --git a/plugin-kbindicator/src/x11/kbdlayout.cpp b/plugin-kbindicator/src/x11/kbdlayout.cpp
@@ -86,7 +86,7 @@ class X11Kbd: public QAbstractNativeEventFilter
         return true;
     }
 
-    virtual ~X11Kbd()
+    ~X11Kbd() override
     {
         xkb_state_unref(m_state);
         xkb_keymap_unref(m_keymap);
@@ -97,7 +97,7 @@ class X11Kbd: public QAbstractNativeEventFilter
     bool isEnabled() const
     { return true;  }
 
-    virtual bool nativeEventFilter(const QByteArray &eventType, void *message, long *)
+    bool nativeEventFilter(const QByteArray &eventType, void *message, long *) override
     {
         if (eventType != "xcb_generic_event_t")
             return false;

diff --git a/plugin-mainmenu/actionview.cpp b/plugin-mainmenu/actionview.cpp
@@ -79,7 +79,7 @@ namespace
     {
     public:
         using QProxyStyle::QProxyStyle;
-        virtual int styleHint(StyleHint hint, const QStyleOption * option = nullptr, const QWidget * widget = nullptr, QStyleHintReturn * returnData = nullptr) const override
+        int styleHint(StyleHint hint, const QStyleOption * option = nullptr, const QWidget * widget = nullptr, QStyleHintReturn * returnData = nullptr) const override
         {
             if(hint == QStyle::SH_ItemView_ActivateItemOnSingleClick)
                 return 1;
@@ -101,7 +101,7 @@ namespace
             mMaxItemWidth = max;
         }
 
-        virtual QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const override
+        QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const override
         {
             QIcon icon = index.data(Qt::DecorationRole).value<QIcon>();
             //the XdgCachedMenuAction/XdgAction does load the icon upon showing its menu

diff --git a/plugin-statusnotifier/statusnotifierbutton.cpp b/plugin-statusnotifier/statusnotifierbutton.cpp
@@ -46,7 +46,7 @@ namespace
         using DBusMenuImporter::DBusMenuImporter;
 
     protected:
-        virtual QIcon iconForName(const QString & name) override
+        QIcon iconForName(const QString & name) override
         {
             return XdgIcon::fromTheme(name);
         }