From 65f9e9e985509e0ab32877670151de30ea679571 Mon Sep 17 00:00:00 2001 From: Nils Fenner Date: Mon, 25 Sep 2023 13:50:39 +0200 Subject: [PATCH] Correct destructor and virtual method overrides --- panel/config/addplugindialog.h | 2 +- panel/config/configplacement.h | 2 +- panel/config/configpluginswidget.h | 2 +- panel/config/configstyling.h | 2 +- panel/lxqtpanel.h | 2 +- panel/lxqtpanelapplication.h | 2 +- panel/lxqtpanelapplication_p.h | 2 +- panel/lxqtpanellayout.h | 2 +- panel/lxqtpanelpluginconfigdialog.h | 4 +-- panel/panelpluginsmodel.h | 8 +++--- panel/plugin.h | 4 +-- panel/pluginmoveprocessor.h | 2 +- panel/pluginsettings.h | 2 +- panel/popupmenu.h | 2 +- panel/windownotifier.h | 2 +- plugin-backlight/backlight.h | 8 +++--- plugin-colorpicker/colorpicker.h | 12 ++++----- plugin-cpuload/lxqtcpuload.h | 8 +++--- plugin-cpuload/lxqtcpuloadconfiguration.h | 2 +- plugin-cpuload/lxqtcpuloadplugin.h | 10 +++---- plugin-customcommand/custombutton.h | 2 +- plugin-customcommand/lxqtcustomcommand.h | 14 +++++----- .../lxqtcustomcommandconfiguration.h | 4 +-- plugin-desktopswitch/desktopswitch.h | 16 ++++++------ .../desktopswitchconfiguration.h | 4 +-- plugin-directorymenu/directorymenu.h | 12 ++++----- .../directorymenuconfiguration.h | 2 +- plugin-dom/domplugin.h | 6 ++--- plugin-dom/treewindow.h | 2 +- plugin-kbindicator/src/content.h | 4 +-- plugin-kbindicator/src/kbdkeeper.h | 18 ++++++------- plugin-kbindicator/src/kbdstate.h | 14 +++++----- plugin-kbindicator/src/kbdstateconfig.h | 2 +- plugin-kbindicator/src/x11/kbdlayout.h | 2 +- plugin-mainmenu/actionview.h | 6 ++--- plugin-mainmenu/lxqtmainmenu.h | 12 ++++----- plugin-mainmenu/lxqtmainmenuconfiguration.h | 4 +-- plugin-mainmenu/xdgcachedmenu.h | 2 +- plugin-mount/actions/deviceaction.h | 2 +- plugin-mount/actions/deviceaction_info.h | 2 +- plugin-mount/actions/deviceaction_menu.h | 2 +- plugin-mount/actions/deviceaction_nothing.h | 2 +- plugin-mount/actions/ejectaction.h | 2 +- plugin-mount/actions/ejectaction_nothing.h | 2 +- plugin-mount/actions/ejectaction_optical.h | 2 +- plugin-mount/button.h | 2 +- plugin-mount/configuration.h | 4 +-- plugin-mount/lxqtmountplugin.h | 18 ++++++------- plugin-mount/menudiskitem.h | 2 +- plugin-networkmonitor/lxqtnetworkmonitor.h | 10 +++---- .../lxqtnetworkmonitorconfiguration.h | 2 +- .../lxqtnetworkmonitorplugin.h | 14 +++++----- plugin-qeyes/qeyes.h | 12 ++++----- plugin-qeyes/qeyesimagewidget.h | 2 +- plugin-qeyes/qeyesvectorwidget.h | 6 ++--- plugin-qeyes/qeyeswidget.h | 2 +- plugin-quicklaunch/lxqtquicklaunch.h | 2 +- plugin-quicklaunch/lxqtquicklaunchplugin.h | 8 +++--- plugin-quicklaunch/quicklaunchbutton.h | 2 +- plugin-sensors/lxqtsensors.h | 2 +- plugin-sensors/lxqtsensorsconfiguration.h | 2 +- plugin-sensors/lxqtsensorsplugin.h | 16 ++++++------ plugin-showdesktop/showdesktop.h | 4 +-- plugin-spacer/spacer.h | 10 +++---- plugin-spacer/spacerconfiguration.h | 2 +- plugin-statusnotifier/statusnotifierbutton.h | 2 +- .../statusnotifierconfiguration.h | 2 +- .../statusnotifieriteminterface.h | 2 +- plugin-statusnotifier/statusnotifierwatcher.h | 2 +- plugin-sysstat/lxqtsysstat.h | 20 +++++++------- plugin-sysstat/lxqtsysstatcolours.h | 2 +- plugin-sysstat/lxqtsysstatconfiguration.h | 2 +- plugin-taskbar/lxqtgrouppopup.h | 2 +- plugin-taskbar/lxqttaskbar.h | 6 ++--- plugin-taskbar/lxqttaskbarconfiguration.h | 2 +- plugin-taskbar/lxqttaskbarplugin.h | 18 ++++++------- plugin-taskbar/lxqttaskbutton.h | 26 +++++++++---------- plugin-tray/lxqttrayplugin.h | 10 +++---- plugin-volume/alsaengine.h | 2 +- plugin-volume/audiodevice.h | 2 +- plugin-volume/audioengine.h | 2 +- plugin-volume/lxqtvolume.h | 14 +++++----- plugin-volume/lxqtvolumeconfiguration.h | 4 +-- plugin-volume/ossengine.h | 12 ++++----- plugin-volume/pulseaudioengine.h | 12 ++++----- plugin-volume/volumebutton.h | 2 +- plugin-worldclock/lxqtworldclock.h | 22 ++++++++-------- .../lxqtworldclockconfiguration.h | 2 +- .../lxqtworldclockconfigurationmanualformat.h | 2 +- .../lxqtworldclockconfigurationtimezones.h | 2 +- 90 files changed, 258 insertions(+), 258 deletions(-) diff --git a/panel/config/addplugindialog.h b/panel/config/addplugindialog.h index a77659390..41a35bb8c 100644 --- a/panel/config/addplugindialog.h +++ b/panel/config/addplugindialog.h @@ -45,7 +45,7 @@ class AddPluginDialog : public QDialog public: AddPluginDialog(QWidget *parent = nullptr); - ~AddPluginDialog(); + ~AddPluginDialog() override; signals: void pluginSelected(const LXQt::PluginInfo &plugin); diff --git a/panel/config/configplacement.h b/panel/config/configplacement.h index 6a928135b..6d5506f1a 100644 --- a/panel/config/configplacement.h +++ b/panel/config/configplacement.h @@ -45,7 +45,7 @@ class ConfigPlacement : public QWidget public: explicit ConfigPlacement(LXQtPanel *panel, QWidget *parent = nullptr); - ~ConfigPlacement(); + ~ConfigPlacement() override; int screenNum() const { return mScreenNum; } ILXQtPanel::Position position() const { return mPosition; } diff --git a/panel/config/configpluginswidget.h b/panel/config/configpluginswidget.h index 2d3bfbda0..4f025ea46 100644 --- a/panel/config/configpluginswidget.h +++ b/panel/config/configpluginswidget.h @@ -43,7 +43,7 @@ class ConfigPluginsWidget : public QWidget public: ConfigPluginsWidget(LXQtPanel *panel, QWidget* parent = nullptr); - ~ConfigPluginsWidget(); + ~ConfigPluginsWidget() override; signals: void changed(); diff --git a/panel/config/configstyling.h b/panel/config/configstyling.h index 12f0974a1..2bc022d85 100644 --- a/panel/config/configstyling.h +++ b/panel/config/configstyling.h @@ -45,7 +45,7 @@ class ConfigStyling : public QWidget public: explicit ConfigStyling(LXQtPanel *panel, QWidget *parent = nullptr); - ~ConfigStyling(); + ~ConfigStyling() override; void updateIconThemeSettings(); diff --git a/panel/lxqtpanel.h b/panel/lxqtpanel.h index f3be5cd96..8cdf5d822 100644 --- a/panel/lxqtpanel.h +++ b/panel/lxqtpanel.h @@ -115,7 +115,7 @@ class LXQT_PANEL_API LXQtPanel : public QFrame, public ILXQtPanel * @param parent Parent QWidget, can be omitted. */ LXQtPanel(const QString &configGroup, LXQt::Settings *settings, QWidget *parent = nullptr); - virtual ~LXQtPanel(); + ~LXQtPanel() override; /** * @brief Returns the name of this panel which is also used as identifier diff --git a/panel/lxqtpanelapplication.h b/panel/lxqtpanelapplication.h index a672e7e46..fef2856cd 100644 --- a/panel/lxqtpanelapplication.h +++ b/panel/lxqtpanelapplication.h @@ -67,7 +67,7 @@ class LXQtPanelApplication : public LXQt::Application * \param argv */ explicit LXQtPanelApplication(int& argc, char** argv); - ~LXQtPanelApplication(); + ~LXQtPanelApplication() override; void setIconTheme(const QString &iconTheme); diff --git a/panel/lxqtpanelapplication_p.h b/panel/lxqtpanelapplication_p.h index 4dd26182c..6b5e176fa 100644 --- a/panel/lxqtpanelapplication_p.h +++ b/panel/lxqtpanelapplication_p.h @@ -32,7 +32,7 @@ class LXQtPanelApplicationPrivate { public: LXQtPanelApplicationPrivate(LXQtPanelApplication *q); - ~LXQtPanelApplicationPrivate() {}; + ~LXQtPanelApplicationPrivate() {} LXQt::Settings *mSettings; diff --git a/panel/lxqtpanellayout.h b/panel/lxqtpanellayout.h index bdba39ea5..38c2492df 100644 --- a/panel/lxqtpanellayout.h +++ b/panel/lxqtpanellayout.h @@ -48,7 +48,7 @@ class LXQT_PANEL_API LXQtPanelLayout : public QLayout Q_OBJECT public: explicit LXQtPanelLayout(QWidget *parent); - ~LXQtPanelLayout(); + ~LXQtPanelLayout() override; void addItem(QLayoutItem *item); QLayoutItem *itemAt(int index) const; diff --git a/panel/lxqtpanelpluginconfigdialog.h b/panel/lxqtpanelpluginconfigdialog.h index 8fdb14e7b..f93e8257a 100644 --- a/panel/lxqtpanelpluginconfigdialog.h +++ b/panel/lxqtpanelpluginconfigdialog.h @@ -43,12 +43,12 @@ class LXQT_PANEL_API LXQtPanelPluginConfigDialog : public QDialog public: explicit LXQtPanelPluginConfigDialog(PluginSettings &settings, QWidget *parent = nullptr); explicit LXQtPanelPluginConfigDialog(PluginSettings *settings, QWidget *parent = nullptr) : LXQtPanelPluginConfigDialog(*settings, parent) {} - virtual ~LXQtPanelPluginConfigDialog(); + ~LXQtPanelPluginConfigDialog() override; PluginSettings &settings() const; protected: - virtual void closeEvent(QCloseEvent *event) override; + void closeEvent(QCloseEvent *event) override; protected slots: /* diff --git a/panel/panelpluginsmodel.h b/panel/panelpluginsmodel.h index d76e9346f..d9adc0172 100644 --- a/panel/panelpluginsmodel.h +++ b/panel/panelpluginsmodel.h @@ -53,7 +53,7 @@ class PanelPluginsModel : public QAbstractListModel QString const & namesKey, QStringList const & desktopDirs, QObject * parent = nullptr); - ~PanelPluginsModel(); + ~PanelPluginsModel() override; /*! * \brief rowCount returns the number of Plugins. It overrides/implements @@ -62,7 +62,7 @@ class PanelPluginsModel : public QAbstractListModel * Plugins. If it is given and a valid model index, the method returns 0 * because PanelPluginsModel is not a hierarchical model. */ - virtual int rowCount(const QModelIndex & parent = QModelIndex()) const override; + int rowCount(const QModelIndex & parent = QModelIndex()) const override; /*! * \brief data returns the Plugin data as defined by the Model/View * architecture. The Plugins itself can be accessed with the role @@ -78,13 +78,13 @@ class PanelPluginsModel : public QAbstractListModel * 3. Qt::UserRole to return a Plugin*. * \return The data as determined by index and role. */ - virtual QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const override; + QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const override; /*! * \brief flags returns the item flags for the given model index. For * all Plugins, this is the same: * Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemNeverHasChildren. */ - virtual Qt::ItemFlags flags(const QModelIndex & index) const override; + Qt::ItemFlags flags(const QModelIndex & index) const override; /*! * \brief pluginNames returns a list of names for all the Plugins in diff --git a/panel/plugin.h b/panel/plugin.h index fdb3e48f6..3147ba23a 100644 --- a/panel/plugin.h +++ b/panel/plugin.h @@ -59,7 +59,7 @@ class LXQT_PANEL_API Plugin : public QFrame explicit Plugin(const LXQt::PluginInfo &desktopFile, LXQt::Settings *settings, const QString &settingsGroup, LXQtPanel *panel); - ~Plugin(); + ~Plugin() override; bool isLoaded() const { return mPlugin != 0; } Alignment alignment() const { return mAlignment; } @@ -81,7 +81,7 @@ class LXQT_PANEL_API Plugin : public QFrame QString name() const { return mName; } - virtual bool eventFilter(QObject * watched, QEvent * event); + bool eventFilter(QObject * watched, QEvent * event) override; // For QSS properties .................. static QColor moveMarkerColor() { return mMoveMarkerColor; } diff --git a/panel/pluginmoveprocessor.h b/panel/pluginmoveprocessor.h index 009c682dc..bda5a63a7 100644 --- a/panel/pluginmoveprocessor.h +++ b/panel/pluginmoveprocessor.h @@ -44,7 +44,7 @@ class LXQT_PANEL_API PluginMoveProcessor : public QWidget Q_OBJECT public: explicit PluginMoveProcessor(LXQtPanelLayout *layout, Plugin *plugin); - ~PluginMoveProcessor(); + ~PluginMoveProcessor() override; Plugin *plugin() const { return mPlugin; } diff --git a/panel/pluginsettings.h b/panel/pluginsettings.h index 13faa8573..9916b4c77 100644 --- a/panel/pluginsettings.h +++ b/panel/pluginsettings.h @@ -58,7 +58,7 @@ class LXQT_PANEL_API PluginSettings : public QObject friend class PluginSettingsFactory; public: - ~PluginSettings(); + ~PluginSettings() override; QString group() const; diff --git a/panel/popupmenu.h b/panel/popupmenu.h index b533a95b7..465cb2fcd 100644 --- a/panel/popupmenu.h +++ b/panel/popupmenu.h @@ -44,7 +44,7 @@ class LXQT_PANEL_API PopupMenu: public QMenu bool eventFilter(QObject *object, QEvent *event); protected: - virtual void keyPressEvent(QKeyEvent* e); + void keyPressEvent(QKeyEvent* e) override; }; #endif // POPUPMENU_H diff --git a/panel/windownotifier.h b/panel/windownotifier.h index 700954a35..b805c9175 100644 --- a/panel/windownotifier.h +++ b/panel/windownotifier.h @@ -41,7 +41,7 @@ class WindowNotifier : public QObject void observeWindow(QWidget * w); inline bool isAnyWindowShown() const { return !mShownWindows.isEmpty(); } - virtual bool eventFilter(QObject * watched, QEvent * event) override; + bool eventFilter(QObject * watched, QEvent * event) override; signals: void lastHidden(); void firstShown(); diff --git a/plugin-backlight/backlight.h b/plugin-backlight/backlight.h index c803a3e8f..6aeadc23e 100644 --- a/plugin-backlight/backlight.h +++ b/plugin-backlight/backlight.h @@ -47,11 +47,11 @@ class LXQtBacklight : public QObject, public ILXQtPanelPlugin Q_OBJECT public: LXQtBacklight(const ILXQtPanelPluginStartupInfo &startupInfo); - ~LXQtBacklight(); + ~LXQtBacklight() override; - virtual QWidget *widget(); - virtual QString themeId() const { return QStringLiteral("Backlight"); } - virtual ILXQtPanelPlugin::Flags flags() const { return PreferRightAlignment ; } + QWidget *widget() override; + QString themeId() const override { return QStringLiteral("Backlight"); } + ILXQtPanelPlugin::Flags flags() const override { return PreferRightAlignment ; } protected Q_SLOTS: void showSlider(bool); diff --git a/plugin-colorpicker/colorpicker.h b/plugin-colorpicker/colorpicker.h index 919f42490..c074980a8 100644 --- a/plugin-colorpicker/colorpicker.h +++ b/plugin-colorpicker/colorpicker.h @@ -43,7 +43,7 @@ class ColorPickerWidget : public QWidget public: ColorPickerWidget(QWidget* parent = nullptr); - ~ColorPickerWidget(); + ~ColorPickerWidget() override; QMenu* popupMenu() { return mColorsMenu; } QToolButton* pickerButton() { return mPickerButton; } @@ -82,14 +82,14 @@ class ColorPicker : public QObject, public ILXQtPanelPlugin Q_OBJECT public: ColorPicker(const ILXQtPanelPluginStartupInfo &startupInfo); - ~ColorPicker(); + ~ColorPicker() override; - virtual QWidget *widget() override { return &mWidget; } - virtual QString themeId() const override { return QStringLiteral("ColorPicker"); } + QWidget *widget() override { return &mWidget; } + QString themeId() const override { return QStringLiteral("ColorPicker"); } - virtual bool isSeparate() const override { return true; } + bool isSeparate() const override { return true; } - virtual void realign() override; + void realign() override; private: ColorPickerWidget mWidget; diff --git a/plugin-cpuload/lxqtcpuload.h b/plugin-cpuload/lxqtcpuload.h index 3651e655f..fb639e0a8 100644 --- a/plugin-cpuload/lxqtcpuload.h +++ b/plugin-cpuload/lxqtcpuload.h @@ -49,7 +49,7 @@ class LXQtCpuLoad: public QFrame }; LXQtCpuLoad(ILXQtPanelPlugin *plugin, QWidget* parent = nullptr); - ~LXQtCpuLoad(); + ~LXQtCpuLoad() override; void settingsChanged(); @@ -58,9 +58,9 @@ class LXQtCpuLoad: public QFrame QColor getFontColor() const { return fontColor; } protected: - void virtual timerEvent(QTimerEvent *event); - void virtual paintEvent ( QPaintEvent * event ); - void virtual resizeEvent(QResizeEvent *); + void timerEvent(QTimerEvent *event) override; + void paintEvent ( QPaintEvent * event ) override; + void resizeEvent(QResizeEvent *) override; private: double getLoadCpu() const; diff --git a/plugin-cpuload/lxqtcpuloadconfiguration.h b/plugin-cpuload/lxqtcpuloadconfiguration.h index 4746825bd..8f0e1fded 100644 --- a/plugin-cpuload/lxqtcpuloadconfiguration.h +++ b/plugin-cpuload/lxqtcpuloadconfiguration.h @@ -45,7 +45,7 @@ class LXQtCpuLoadConfiguration : public LXQtPanelPluginConfigDialog public: explicit LXQtCpuLoadConfiguration(PluginSettings *settings, QWidget *parent = nullptr); - ~LXQtCpuLoadConfiguration(); + ~LXQtCpuLoadConfiguration() override; private: Ui::LXQtCpuLoadConfiguration *ui; diff --git a/plugin-cpuload/lxqtcpuloadplugin.h b/plugin-cpuload/lxqtcpuloadplugin.h index 9954ce9ef..1f1648fcd 100644 --- a/plugin-cpuload/lxqtcpuloadplugin.h +++ b/plugin-cpuload/lxqtcpuloadplugin.h @@ -39,17 +39,17 @@ class LXQtCpuLoadPlugin: public QObject, public ILXQtPanelPlugin Q_OBJECT public: explicit LXQtCpuLoadPlugin(const ILXQtPanelPluginStartupInfo &startupInfo); - ~LXQtCpuLoadPlugin(); + ~LXQtCpuLoadPlugin() override; - virtual ILXQtPanelPlugin::Flags flags() const { return PreferRightAlignment | HaveConfigDialog; } - virtual QWidget *widget(); - virtual QString themeId() const { return QStringLiteral("CpuLoad"); } + ILXQtPanelPlugin::Flags flags() const override { return PreferRightAlignment | HaveConfigDialog; } + QWidget *widget() override ; + QString themeId() const override { return QStringLiteral("CpuLoad"); } bool isSeparate() const { return true; } QDialog *configureDialog(); protected: - virtual void settingsChanged(); + void settingsChanged() override; private: QWidget *mWidget; diff --git a/plugin-customcommand/custombutton.h b/plugin-customcommand/custombutton.h index 5a24e9304..50d0081f4 100644 --- a/plugin-customcommand/custombutton.h +++ b/plugin-customcommand/custombutton.h @@ -37,7 +37,7 @@ class CustomButton : public QToolButton public: CustomButton(ILXQtPanelPlugin *plugin, QWidget* parent = nullptr); - ~CustomButton(); + ~CustomButton() override; public slots: void setAutoRotation(bool value); diff --git a/plugin-customcommand/lxqtcustomcommand.h b/plugin-customcommand/lxqtcustomcommand.h index d37cf03ef..22371608c 100644 --- a/plugin-customcommand/lxqtcustomcommand.h +++ b/plugin-customcommand/lxqtcustomcommand.h @@ -42,16 +42,16 @@ class LXQtCustomCommand : public QObject, public ILXQtPanelPlugin Q_OBJECT public: LXQtCustomCommand(const ILXQtPanelPluginStartupInfo &startupInfo); - ~LXQtCustomCommand(); + ~LXQtCustomCommand() override; - virtual QWidget *widget(); - virtual QString themeId() const { return QStringLiteral("Custom"); } - virtual ILXQtPanelPlugin::Flags flags() const { return PreferRightAlignment | HaveConfigDialog ; } - void realign(); - QDialog *configureDialog(); + QWidget *widget() override; + QString themeId() const override { return QStringLiteral("Custom"); } + ILXQtPanelPlugin::Flags flags() const override { return PreferRightAlignment | HaveConfigDialog ; } + void realign() override; + QDialog *configureDialog() override; protected slots: - virtual void settingsChanged(); + void settingsChanged() override; private slots: void handleClick(); diff --git a/plugin-customcommand/lxqtcustomcommandconfiguration.h b/plugin-customcommand/lxqtcustomcommandconfiguration.h index 26dc9e114..f80f8e84a 100644 --- a/plugin-customcommand/lxqtcustomcommandconfiguration.h +++ b/plugin-customcommand/lxqtcustomcommandconfiguration.h @@ -39,7 +39,7 @@ class LXQtCustomCommandConfiguration : public LXQtPanelPluginConfigDialog public: explicit LXQtCustomCommandConfiguration(PluginSettings *settings, QWidget *parent = nullptr); - ~LXQtCustomCommandConfiguration(); + ~LXQtCustomCommandConfiguration() override; private slots: void autoRotateChanged(bool autoRotate); @@ -57,7 +57,7 @@ private slots: void wheelDownLineEditChanged(QString wheelDown); protected slots: - virtual void loadSettings(); + void loadSettings() override; private: Ui::LXQtCustomCommandConfiguration *ui; diff --git a/plugin-desktopswitch/desktopswitch.h b/plugin-desktopswitch/desktopswitch.h index 73d7a9e78..95ee28040 100644 --- a/plugin-desktopswitch/desktopswitch.h +++ b/plugin-desktopswitch/desktopswitch.h @@ -66,15 +66,15 @@ class DesktopSwitch : public QObject, public ILXQtPanelPlugin Q_OBJECT public: DesktopSwitch(const ILXQtPanelPluginStartupInfo &startupInfo); - ~DesktopSwitch(); + ~DesktopSwitch() override; - QString themeId() const { return QStringLiteral("DesktopSwitch"); } - QWidget *widget() { return &mWidget; } - bool isSeparate() const { return true; } - void realign(); + QString themeId() const override { return QStringLiteral("DesktopSwitch"); } + QWidget *widget() override { return &mWidget; } + bool isSeparate() const override { return true; } + void realign() override; - virtual ILXQtPanelPlugin::Flags flags() const { return HaveConfigDialog; } - QDialog *configureDialog(); + ILXQtPanelPlugin::Flags flags() const override { return HaveConfigDialog; } + QDialog *configureDialog() override; private: QButtonGroup * m_buttons; @@ -96,7 +96,7 @@ private slots: void onNumberOfDesktopsChanged(int); void onCurrentDesktopChanged(int); void onDesktopNamesChanged(); - virtual void settingsChanged(); + void settingsChanged() override; void registerShortcuts(); void shortcutRegistered(); void onWindowChanged(WId id, NET::Properties properties, NET::Properties2 properties2); diff --git a/plugin-desktopswitch/desktopswitchconfiguration.h b/plugin-desktopswitch/desktopswitchconfiguration.h index 3defaadc3..440815931 100644 --- a/plugin-desktopswitch/desktopswitchconfiguration.h +++ b/plugin-desktopswitch/desktopswitchconfiguration.h @@ -46,7 +46,7 @@ class DesktopSwitchConfiguration : public LXQtPanelPluginConfigDialog public: explicit DesktopSwitchConfiguration(PluginSettings *settings, QWidget *parent = nullptr); - ~DesktopSwitchConfiguration(); + ~DesktopSwitchConfiguration() override; private: Ui::DesktopSwitchConfiguration *ui; @@ -55,7 +55,7 @@ private slots: /* Saves settings in conf file. */ - void loadSettings(); + void loadSettings() override; void loadDesktopsNames(); void rowsChanged(int value); void labelTypeChanged(int type); diff --git a/plugin-directorymenu/directorymenu.h b/plugin-directorymenu/directorymenu.h index fabfc542b..0f5926fb0 100644 --- a/plugin-directorymenu/directorymenu.h +++ b/plugin-directorymenu/directorymenu.h @@ -47,13 +47,13 @@ class DirectoryMenu : public QObject, public ILXQtPanelPlugin public: DirectoryMenu(const ILXQtPanelPluginStartupInfo &startupInfo); - ~DirectoryMenu(); + ~DirectoryMenu() override; - virtual QWidget *widget() { return &mButton; } - virtual QString themeId() const { return QStringLiteral("DirectoryMenu"); } - virtual ILXQtPanelPlugin::Flags flags() const { return HaveConfigDialog; } - QDialog *configureDialog(); - void settingsChanged(); + QWidget *widget() override { return &mButton; } + QString themeId() const override { return QStringLiteral("DirectoryMenu"); } + ILXQtPanelPlugin::Flags flags() const override { return HaveConfigDialog; } + QDialog *configureDialog() override; + void settingsChanged() override; private slots: void showMenu(); diff --git a/plugin-directorymenu/directorymenuconfiguration.h b/plugin-directorymenu/directorymenuconfiguration.h index 188a74b15..94e4d609c 100644 --- a/plugin-directorymenu/directorymenuconfiguration.h +++ b/plugin-directorymenu/directorymenuconfiguration.h @@ -48,7 +48,7 @@ class DirectoryMenuConfiguration : public LXQtPanelPluginConfigDialog public: explicit DirectoryMenuConfiguration(PluginSettings *settings, QWidget *parent = nullptr); - ~DirectoryMenuConfiguration(); + ~DirectoryMenuConfiguration() override; private: Ui::DirectoryMenuConfiguration *ui; diff --git a/plugin-dom/domplugin.h b/plugin-dom/domplugin.h index cc8614e0b..aae0d3212 100644 --- a/plugin-dom/domplugin.h +++ b/plugin-dom/domplugin.h @@ -39,9 +39,9 @@ class DomPlugin: public QObject, public ILXQtPanelPlugin public: DomPlugin(const ILXQtPanelPluginStartupInfo &startupInfo); - virtual QWidget *widget() { return &mButton; } - virtual QString themeId() const { return QStringLiteral("Dom"); } - virtual ILXQtPanelPlugin::Flags flags() const { return PreferRightAlignment; } + QWidget *widget() override { return &mButton; } + QString themeId() const override { return QStringLiteral("Dom"); } + ILXQtPanelPlugin::Flags flags() const override { return PreferRightAlignment; } private slots: void showDialog(); diff --git a/plugin-dom/treewindow.h b/plugin-dom/treewindow.h index 11bd51790..6fbaac127 100644 --- a/plugin-dom/treewindow.h +++ b/plugin-dom/treewindow.h @@ -47,7 +47,7 @@ class TreeWindow : public QMainWindow public: explicit TreeWindow(QWidget *parent = nullptr); - ~TreeWindow(); + ~TreeWindow() override; private slots: void updatePropertiesView(); diff --git a/plugin-kbindicator/src/content.h b/plugin-kbindicator/src/content.h index 239d5b50c..6e3d2a41f 100644 --- a/plugin-kbindicator/src/content.h +++ b/plugin-kbindicator/src/content.h @@ -38,14 +38,14 @@ class Content : public QWidget Q_OBJECT public: Content(bool layoutEnabled); - ~Content(); + ~Content() override; public: void setEnabled(Controls cnt, bool enabled); QWidget* widget(Controls cnt) const; bool setup(); - virtual bool eventFilter(QObject *object, QEvent *event); + bool eventFilter(QObject *object, QEvent *event) override; void showHorizontal(); void showVertical(); diff --git a/plugin-kbindicator/src/kbdkeeper.h b/plugin-kbindicator/src/kbdkeeper.h index 2e51a61a6..24dfc67b4 100644 --- a/plugin-kbindicator/src/kbdkeeper.h +++ b/plugin-kbindicator/src/kbdkeeper.h @@ -40,7 +40,7 @@ class KbdKeeper: public QObject Q_OBJECT public: KbdKeeper(const KbdLayout & layout, KeeperType type = KeeperType::Global); - virtual ~KbdKeeper(); + ~KbdKeeper() override; virtual bool setup(); const QString & sym() const @@ -76,11 +76,11 @@ class WinKbdKeeper: public KbdKeeper Q_OBJECT public: WinKbdKeeper(const KbdLayout & layout); - virtual ~WinKbdKeeper(); - virtual void switchToGroup(uint group); + ~WinKbdKeeper() override; + void switchToGroup(uint group) override; protected slots: - virtual void layoutChanged(uint group); - virtual void checkState(); + void layoutChanged(uint group) override; + void checkState() override; private: QHash m_mapping; WId m_active; @@ -93,11 +93,11 @@ class AppKbdKeeper: public KbdKeeper Q_OBJECT public: AppKbdKeeper(const KbdLayout & layout); - virtual ~AppKbdKeeper(); - virtual void switchToGroup(uint group); + ~AppKbdKeeper() override; + void switchToGroup(uint group) override; protected slots: - virtual void layoutChanged(uint group); - virtual void checkState(); + void layoutChanged(uint group) override; + void checkState() override; private: QHash m_mapping; QString m_active; diff --git a/plugin-kbindicator/src/kbdstate.h b/plugin-kbindicator/src/kbdstate.h index d4691f359..7a903e7bc 100644 --- a/plugin-kbindicator/src/kbdstate.h +++ b/plugin-kbindicator/src/kbdstate.h @@ -39,22 +39,22 @@ class KbdState : public QObject, public ILXQtPanelPlugin Q_OBJECT public: KbdState(const ILXQtPanelPluginStartupInfo &startupInfo); - virtual ~KbdState(); + ~KbdState() override; - virtual QString themeId() const + QString themeId() const override { return QStringLiteral("KbIndicator"); } - virtual ILXQtPanelPlugin::Flags flags() const + ILXQtPanelPlugin::Flags flags() const override { return PreferRightAlignment | HaveConfigDialog; } - virtual bool isSeparate() const + bool isSeparate() const override { return false; } - virtual QWidget *widget() + QWidget *widget() override { return &m_content; } QDialog *configureDialog(); - virtual void realign(); + void realign() override; const Settings & prefs() const { return m_settings; } @@ -63,7 +63,7 @@ class KbdState : public QObject, public ILXQtPanelPlugin { return m_settings; } protected slots: - virtual void settingsChanged(); + void settingsChanged() override; private: Settings m_settings; diff --git a/plugin-kbindicator/src/kbdstateconfig.h b/plugin-kbindicator/src/kbdstateconfig.h index 3e3a7d855..293727f42 100644 --- a/plugin-kbindicator/src/kbdstateconfig.h +++ b/plugin-kbindicator/src/kbdstateconfig.h @@ -39,7 +39,7 @@ class KbdStateConfig : public QDialog public: explicit KbdStateConfig(QWidget *parent = nullptr); - ~KbdStateConfig(); + ~KbdStateConfig() override; private: void save(); void load(); diff --git a/plugin-kbindicator/src/x11/kbdlayout.h b/plugin-kbindicator/src/x11/kbdlayout.h index fdb4df2f1..078ba6721 100644 --- a/plugin-kbindicator/src/x11/kbdlayout.h +++ b/plugin-kbindicator/src/x11/kbdlayout.h @@ -40,7 +40,7 @@ class X11Kbd: public QObject Q_OBJECT public: X11Kbd(); - virtual ~X11Kbd(); + ~X11Kbd() override; bool init(); bool isEnabled() const; diff --git a/plugin-mainmenu/actionview.h b/plugin-mainmenu/actionview.h index dedc376a6..7fa5c2147 100644 --- a/plugin-mainmenu/actionview.h +++ b/plugin-mainmenu/actionview.h @@ -43,7 +43,7 @@ class FilterProxyModel : public QSortFilterProxyModel Q_OBJECT public: explicit FilterProxyModel(QObject* parent = nullptr); - virtual ~FilterProxyModel(); + ~FilterProxyModel() override; void setfilerString(const QString &str) { filterStr_ = str; @@ -101,8 +101,8 @@ public slots: void activateCurrent(); protected: - virtual QSize viewportSizeHint() const override; - virtual QSize minimumSizeHint() const override; + QSize viewportSizeHint() const override; + QSize minimumSizeHint() const override; void mousePressEvent(QMouseEvent *event) override; void mouseMoveEvent(QMouseEvent *event) override; diff --git a/plugin-mainmenu/lxqtmainmenu.h b/plugin-mainmenu/lxqtmainmenu.h index 7dedb297c..fba7532f7 100644 --- a/plugin-mainmenu/lxqtmainmenu.h +++ b/plugin-mainmenu/lxqtmainmenu.h @@ -67,13 +67,13 @@ class LXQtMainMenu : public QObject, public ILXQtPanelPlugin Q_OBJECT public: LXQtMainMenu(const ILXQtPanelPluginStartupInfo &startupInfo); - ~LXQtMainMenu(); + ~LXQtMainMenu() override; - QString themeId() const { return QStringLiteral("MainMenu"); } - virtual ILXQtPanelPlugin::Flags flags() const { return HaveConfigDialog ; } + QString themeId() const override { return QStringLiteral("MainMenu"); } + ILXQtPanelPlugin::Flags flags() const override { return HaveConfigDialog ; } - QWidget *widget() { return &mButton; } - QDialog *configureDialog(); + QWidget *widget() override { return &mButton; } + QDialog *configureDialog() override; bool isSeparate() const { return true; } @@ -118,7 +118,7 @@ class LXQtMainMenu : public QObject, public ILXQtPanelPlugin protected slots: - virtual void settingsChanged(); + void settingsChanged() override; void buildMenu(); private slots: diff --git a/plugin-mainmenu/lxqtmainmenuconfiguration.h b/plugin-mainmenu/lxqtmainmenuconfiguration.h index 7774737bb..c641b6a9d 100644 --- a/plugin-mainmenu/lxqtmainmenuconfiguration.h +++ b/plugin-mainmenu/lxqtmainmenuconfiguration.h @@ -51,7 +51,7 @@ class LXQtMainMenuConfiguration : public LXQtPanelPluginConfigDialog GlobalKeyShortcut::Action *shortcut, const QString &defaultShortcut, QWidget *parent = nullptr); - ~LXQtMainMenuConfiguration(); + ~LXQtMainMenuConfiguration() override; private: Ui::LXQtMainMenuConfiguration *ui; @@ -65,7 +65,7 @@ private slots: /* Saves settings in conf file. */ - void loadSettings(); + void loadSettings() override; void textButtonChanged(const QString &value); void showTextChanged(bool value); void chooseIcon(); diff --git a/plugin-mainmenu/xdgcachedmenu.h b/plugin-mainmenu/xdgcachedmenu.h index 456e562e5..1b018840e 100644 --- a/plugin-mainmenu/xdgcachedmenu.h +++ b/plugin-mainmenu/xdgcachedmenu.h @@ -33,7 +33,7 @@ class XdgCachedMenu : public QMenu public: XdgCachedMenu(QWidget* parent = nullptr); XdgCachedMenu(MenuCache* menuCache, QWidget* parent); - virtual ~XdgCachedMenu(); + ~XdgCachedMenu() override; protected: bool event(QEvent* event); diff --git a/plugin-mount/actions/deviceaction.h b/plugin-mount/actions/deviceaction.h index 42b706970..04653f5dc 100644 --- a/plugin-mount/actions/deviceaction.h +++ b/plugin-mount/actions/deviceaction.h @@ -46,7 +46,7 @@ class DeviceAction: public QObject ActionMenu }; - virtual ~DeviceAction(); + ~DeviceAction() override; virtual ActionId Type() const throw () = 0; static DeviceAction *create(ActionId id, LXQtMountPlugin *plugin, QObject *parent = nullptr); diff --git a/plugin-mount/actions/deviceaction_info.h b/plugin-mount/actions/deviceaction_info.h index 58ff5a5b6..c4abb2926 100644 --- a/plugin-mount/actions/deviceaction_info.h +++ b/plugin-mount/actions/deviceaction_info.h @@ -40,7 +40,7 @@ class DeviceActionInfo : public DeviceAction Q_OBJECT public: explicit DeviceActionInfo(LXQtMountPlugin *plugin, QObject *parent = nullptr); - virtual ActionId Type() const throw () { return ActionInfo; } + ActionId Type() const throw () override { return ActionInfo; } protected: void doDeviceAdded(Solid::Device device); diff --git a/plugin-mount/actions/deviceaction_menu.h b/plugin-mount/actions/deviceaction_menu.h index 8ad14366e..9d4f1ee2c 100644 --- a/plugin-mount/actions/deviceaction_menu.h +++ b/plugin-mount/actions/deviceaction_menu.h @@ -40,7 +40,7 @@ class DeviceActionMenu : public DeviceAction Q_OBJECT public: explicit DeviceActionMenu(LXQtMountPlugin *plugin, QObject *parent = nullptr); - virtual ActionId Type() const throw () { return ActionMenu; } + ActionId Type() const throw () override { return ActionMenu; } protected: void doDeviceAdded(Solid::Device device); diff --git a/plugin-mount/actions/deviceaction_nothing.h b/plugin-mount/actions/deviceaction_nothing.h index 0136b860d..7c1541fad 100644 --- a/plugin-mount/actions/deviceaction_nothing.h +++ b/plugin-mount/actions/deviceaction_nothing.h @@ -38,7 +38,7 @@ class DeviceActionNothing : public DeviceAction public: explicit DeviceActionNothing(LXQtMountPlugin *plugin, QObject *parent = nullptr); - virtual ActionId Type() const throw () { return ActionNothing; }; + ActionId Type() const throw () override { return ActionNothing; }; protected: void doDeviceAdded(Solid::Device device); diff --git a/plugin-mount/actions/ejectaction.h b/plugin-mount/actions/ejectaction.h index 90ed5b288..2a288e70b 100644 --- a/plugin-mount/actions/ejectaction.h +++ b/plugin-mount/actions/ejectaction.h @@ -45,7 +45,7 @@ class EjectAction: public QObject ActionOptical }; - virtual ~EjectAction(); + ~EjectAction() override; virtual ActionId Type() const throw () = 0; static EjectAction *create(ActionId id, LXQtMountPlugin *plugin, QObject *parent = nullptr); diff --git a/plugin-mount/actions/ejectaction_nothing.h b/plugin-mount/actions/ejectaction_nothing.h index f0729437b..90b877f10 100644 --- a/plugin-mount/actions/ejectaction_nothing.h +++ b/plugin-mount/actions/ejectaction_nothing.h @@ -38,7 +38,7 @@ class EjectActionNothing : public EjectAction public: explicit EjectActionNothing(LXQtMountPlugin *plugin, QObject *parent = nullptr); - virtual ActionId Type() const throw () { return ActionNothing; }; + ActionId Type() const throw () override { return ActionNothing; } protected: void doEjectPressed(void); diff --git a/plugin-mount/actions/ejectaction_optical.h b/plugin-mount/actions/ejectaction_optical.h index 82eee10c7..75ced98fb 100644 --- a/plugin-mount/actions/ejectaction_optical.h +++ b/plugin-mount/actions/ejectaction_optical.h @@ -37,7 +37,7 @@ class EjectActionOptical : public EjectAction Q_OBJECT public: explicit EjectActionOptical(LXQtMountPlugin *plugin, QObject *parent = nullptr); - virtual ActionId Type() const throw () { return ActionOptical; } + ActionId Type() const throw () override { return ActionOptical; } protected: void doEjectPressed(void); diff --git a/plugin-mount/button.h b/plugin-mount/button.h index 2e5023c20..561138d12 100644 --- a/plugin-mount/button.h +++ b/plugin-mount/button.h @@ -37,7 +37,7 @@ class Button : public QToolButton Q_OBJECT public: Button(QWidget *parent = nullptr); - ~Button(); + ~Button() override; }; #endif diff --git a/plugin-mount/configuration.h b/plugin-mount/configuration.h index 8da1d3796..13059da77 100644 --- a/plugin-mount/configuration.h +++ b/plugin-mount/configuration.h @@ -47,10 +47,10 @@ class Configuration : public LXQtPanelPluginConfigDialog public: explicit Configuration(PluginSettings *settings, QWidget *parent = nullptr); - ~Configuration(); + ~Configuration() override; protected slots: - virtual void loadSettings(); + void loadSettings() override; void devAddedChanged(int index); void ejectPressedChanged(int index); diff --git a/plugin-mount/lxqtmountplugin.h b/plugin-mount/lxqtmountplugin.h index b2aef9355..a665d254c 100644 --- a/plugin-mount/lxqtmountplugin.h +++ b/plugin-mount/lxqtmountplugin.h @@ -52,21 +52,21 @@ class LXQtMountPlugin : public QObject, public ILXQtPanelPlugin public: LXQtMountPlugin(const ILXQtPanelPluginStartupInfo &startupInfo); - ~LXQtMountPlugin(); + ~LXQtMountPlugin() override; - virtual QWidget *widget() { return mButton; } - virtual QString themeId() const { return QLatin1String("LXQtMount"); } - virtual ILXQtPanelPlugin::Flags flags() const { return PreferRightAlignment | HaveConfigDialog; } + QWidget *widget() override { return mButton; } + QString themeId() const override { return QLatin1String("LXQtMount"); } + ILXQtPanelPlugin::Flags flags() const override { return PreferRightAlignment | HaveConfigDialog; } - Popup *popup() { return mPopup; } - QIcon icon() { return mButton->icon(); }; - QDialog *configureDialog(); + Popup *popup() override { return mPopup; } + QIcon icon() override { return mButton->icon(); } + QDialog *configureDialog() override; public slots: - void realign(); + void realign() override; protected slots: - virtual void settingsChanged(); + void settingsChanged() override; void shortcutRegistered(); private: diff --git a/plugin-mount/menudiskitem.h b/plugin-mount/menudiskitem.h index 52ffa3405..91bcda3d3 100644 --- a/plugin-mount/menudiskitem.h +++ b/plugin-mount/menudiskitem.h @@ -41,7 +41,7 @@ class MenuDiskItem : public QFrame public: explicit MenuDiskItem(Solid::Device device, Popup *popup); - ~MenuDiskItem(); + ~MenuDiskItem() override; QString deviceUdi() const { return mDevice.udi(); } void setMountStatus(bool mounted); diff --git a/plugin-networkmonitor/lxqtnetworkmonitor.h b/plugin-networkmonitor/lxqtnetworkmonitor.h index 25c560a0f..e58ee13de 100644 --- a/plugin-networkmonitor/lxqtnetworkmonitor.h +++ b/plugin-networkmonitor/lxqtnetworkmonitor.h @@ -39,14 +39,14 @@ class LXQtNetworkMonitor: public QFrame Q_OBJECT public: LXQtNetworkMonitor(ILXQtPanelPlugin *plugin, QWidget* parent = nullptr); - ~LXQtNetworkMonitor(); + ~LXQtNetworkMonitor() override; virtual void settingsChanged(); protected: - void virtual timerEvent(QTimerEvent *event); - void virtual paintEvent(QPaintEvent * event); - void virtual resizeEvent(QResizeEvent *); - bool virtual event(QEvent *event); + void timerEvent(QTimerEvent *event) override; + void paintEvent(QPaintEvent * event) override; + void resizeEvent(QResizeEvent *) override; + bool event(QEvent *event) override; private: diff --git a/plugin-networkmonitor/lxqtnetworkmonitorconfiguration.h b/plugin-networkmonitor/lxqtnetworkmonitorconfiguration.h index 33c963e6d..0e672567d 100644 --- a/plugin-networkmonitor/lxqtnetworkmonitorconfiguration.h +++ b/plugin-networkmonitor/lxqtnetworkmonitorconfiguration.h @@ -45,7 +45,7 @@ class LXQtNetworkMonitorConfiguration : public LXQtPanelPluginConfigDialog public: explicit LXQtNetworkMonitorConfiguration(PluginSettings *settings, QWidget *parent = nullptr); - ~LXQtNetworkMonitorConfiguration(); + ~LXQtNetworkMonitorConfiguration() override; private: Ui::LXQtNetworkMonitorConfiguration *ui; diff --git a/plugin-networkmonitor/lxqtnetworkmonitorplugin.h b/plugin-networkmonitor/lxqtnetworkmonitorplugin.h index 7d71e895d..f049ac36b 100644 --- a/plugin-networkmonitor/lxqtnetworkmonitorplugin.h +++ b/plugin-networkmonitor/lxqtnetworkmonitorplugin.h @@ -39,17 +39,17 @@ class LXQtNetworkMonitorPlugin: public QObject, public ILXQtPanelPlugin Q_OBJECT public: explicit LXQtNetworkMonitorPlugin(const ILXQtPanelPluginStartupInfo &startupInfo); - ~LXQtNetworkMonitorPlugin(); + ~LXQtNetworkMonitorPlugin() override; - virtual ILXQtPanelPlugin::Flags flags() const { return PreferRightAlignment | HaveConfigDialog; } - virtual QWidget *widget(); - virtual QString themeId() const { return QStringLiteral("NetworkMonitor"); } + ILXQtPanelPlugin::Flags flags() const override { return PreferRightAlignment | HaveConfigDialog; } + QWidget *widget() override; + QString themeId() const override { return QStringLiteral("NetworkMonitor"); } - bool isSeparate() const { return false; } - QDialog *configureDialog(); + bool isSeparate() const override { return false; } + QDialog *configureDialog() override; protected: - virtual void settingsChanged(); + void settingsChanged() override; private: LXQtNetworkMonitor *mWidget; diff --git a/plugin-qeyes/qeyes.h b/plugin-qeyes/qeyes.h index 9599f6da1..f1a0b4375 100644 --- a/plugin-qeyes/qeyes.h +++ b/plugin-qeyes/qeyes.h @@ -37,14 +37,14 @@ class QEyesPlugin : public QObject, public ILXQtPanelPlugin public: QEyesPlugin(const ILXQtPanelPluginStartupInfo &startupInfo); - virtual QWidget *widget() override { return w0; } - virtual QString themeId() const override{ + QWidget *widget() override { return w0; } + QString themeId() const override{ return QStringLiteral("QEyesPlugin"); } - virtual void realign() override; - virtual Flags flags() const override { return HaveConfigDialog ; } - virtual QDialog * configureDialog() override; - virtual void settingsChanged() override; + void realign() override; + Flags flags() const override { return HaveConfigDialog ; } + QDialog * configureDialog() override; + void settingsChanged() override; static const QString internalEye; private: diff --git a/plugin-qeyes/qeyesimagewidget.h b/plugin-qeyes/qeyesimagewidget.h index d0b6bf019..330ef603a 100644 --- a/plugin-qeyes/qeyesimagewidget.h +++ b/plugin-qeyes/qeyesimagewidget.h @@ -42,7 +42,7 @@ class QEyesImageWidget : public QAbstractEyesWidget { private: void drawEye(QPainter &painter, int x, int y, int dx, int dy) override; void drawPupil(QPainter &painter, int x, int y) override; - virtual void eyeBorder(float &bx, float &by) override; + void eyeBorder(float &bx, float &by) override; void paintEvent(QPaintEvent *event) override; ImageStretcher pupil, background; diff --git a/plugin-qeyes/qeyesvectorwidget.h b/plugin-qeyes/qeyesvectorwidget.h index bc53edf99..6a920ddb8 100644 --- a/plugin-qeyes/qeyesvectorwidget.h +++ b/plugin-qeyes/qeyesvectorwidget.h @@ -35,9 +35,9 @@ class QEyesVectorWidget : public QAbstractEyesWidget QString centerColor = QString::fromUtf8("white"); QString peripheralColor = QString::fromUtf8("light-gray"); - virtual void drawEye(QPainter &painter, int x, int y, int dx, int dy) override; - virtual void drawPupil(QPainter &painter, int x, int y) override; - virtual void eyeBorder(float &bx, float &by) override; + void drawEye(QPainter &painter, int x, int y, int dx, int dy) override; + void drawPupil(QPainter &painter, int x, int y) override; + void eyeBorder(float &bx, float &by) override; public: QEyesVectorWidget(QWidget *parent = nullptr); diff --git a/plugin-qeyes/qeyeswidget.h b/plugin-qeyes/qeyeswidget.h index 85118dafe..2a14eb73a 100644 --- a/plugin-qeyes/qeyeswidget.h +++ b/plugin-qeyes/qeyeswidget.h @@ -56,7 +56,7 @@ private slots: public: QAbstractEyesWidget(QWidget *parent = nullptr); - ~QAbstractEyesWidget(); + ~QAbstractEyesWidget() override; void setNumEyes(int n) { numEyes = n; } int getNumEyes() { return numEyes; } void setBGColor(const QString &color) { bgColor = color; } diff --git a/plugin-quicklaunch/lxqtquicklaunch.h b/plugin-quicklaunch/lxqtquicklaunch.h index 732d800dc..e829f674e 100644 --- a/plugin-quicklaunch/lxqtquicklaunch.h +++ b/plugin-quicklaunch/lxqtquicklaunch.h @@ -56,7 +56,7 @@ class LXQtQuickLaunch : public QFrame public: LXQtQuickLaunch(ILXQtPanelPlugin *plugin, QWidget* parent = nullptr); - ~LXQtQuickLaunch(); + ~LXQtQuickLaunch() override; int indexOfButton(QuickLaunchButton* button) const; int countOfButtons() const; diff --git a/plugin-quicklaunch/lxqtquicklaunchplugin.h b/plugin-quicklaunch/lxqtquicklaunchplugin.h index 52f5fd642..404cb5fae 100644 --- a/plugin-quicklaunch/lxqtquicklaunchplugin.h +++ b/plugin-quicklaunch/lxqtquicklaunchplugin.h @@ -39,11 +39,11 @@ class LXQtQuickLaunchPlugin: public QObject, public ILXQtPanelPlugin Q_OBJECT public: explicit LXQtQuickLaunchPlugin(const ILXQtPanelPluginStartupInfo &startupInfo); - ~LXQtQuickLaunchPlugin(); + ~LXQtQuickLaunchPlugin() override; - virtual QWidget *widget(); - virtual QString themeId() const { return QStringLiteral("QuickLaunch"); } - virtual Flags flags() const { return NeedsHandle; } + QWidget *widget() override; + QString themeId() const override { return QStringLiteral("QuickLaunch"); } + Flags flags() const override { return NeedsHandle; } void realign(); diff --git a/plugin-quicklaunch/quicklaunchbutton.h b/plugin-quicklaunch/quicklaunchbutton.h index d039c5f8d..b090b9f73 100644 --- a/plugin-quicklaunch/quicklaunchbutton.h +++ b/plugin-quicklaunch/quicklaunchbutton.h @@ -42,7 +42,7 @@ class QuickLaunchButton : public QToolButton public: QuickLaunchButton(QuickLaunchAction * act, ILXQtPanelPlugin * plugin, QWidget* parent = nullptr); - ~QuickLaunchButton(); + ~QuickLaunchButton() override; QHash settingsMap(); diff --git a/plugin-sensors/lxqtsensors.h b/plugin-sensors/lxqtsensors.h index 1b328864c..6e58a9e60 100644 --- a/plugin-sensors/lxqtsensors.h +++ b/plugin-sensors/lxqtsensors.h @@ -56,7 +56,7 @@ class LXQtSensors : public QFrame Q_OBJECT public: LXQtSensors(ILXQtPanelPlugin *plugin, QWidget* parent = nullptr); - ~LXQtSensors(); + ~LXQtSensors() override; void settingsChanged(); void realign(); diff --git a/plugin-sensors/lxqtsensorsconfiguration.h b/plugin-sensors/lxqtsensorsconfiguration.h index 690cefa20..84363695c 100644 --- a/plugin-sensors/lxqtsensorsconfiguration.h +++ b/plugin-sensors/lxqtsensorsconfiguration.h @@ -45,7 +45,7 @@ class LXQtSensorsConfiguration : public LXQtPanelPluginConfigDialog public: explicit LXQtSensorsConfiguration(PluginSettings *settings, QWidget *parent = nullptr); - ~LXQtSensorsConfiguration(); + ~LXQtSensorsConfiguration() override; private: Ui::LXQtSensorsConfiguration *ui; diff --git a/plugin-sensors/lxqtsensorsplugin.h b/plugin-sensors/lxqtsensorsplugin.h index b725b6d90..4ad761abf 100644 --- a/plugin-sensors/lxqtsensorsplugin.h +++ b/plugin-sensors/lxqtsensorsplugin.h @@ -40,19 +40,19 @@ class LXQtSensorsPlugin: public QObject, public ILXQtPanelPlugin Q_OBJECT public: explicit LXQtSensorsPlugin(const ILXQtPanelPluginStartupInfo &startupInfo); - ~LXQtSensorsPlugin(); + ~LXQtSensorsPlugin() override; - virtual ILXQtPanelPlugin::Flags flags() const { return PreferRightAlignment | HaveConfigDialog; } - virtual QWidget *widget(); - virtual QString themeId() const { return QStringLiteral("Sensors"); } + ILXQtPanelPlugin::Flags flags() const override { return PreferRightAlignment | HaveConfigDialog; } + QWidget *widget() override; + QString themeId() const override { return QStringLiteral("Sensors"); } - bool isSeparate() const { return true; } - QDialog *configureDialog(); + bool isSeparate() const override { return true; } + QDialog *configureDialog() override; - void realign(); + void realign() override; protected: - virtual void settingsChanged(); + void settingsChanged() override; private: LXQtSensors *mWidget; diff --git a/plugin-showdesktop/showdesktop.h b/plugin-showdesktop/showdesktop.h index 517cba57a..3de629545 100644 --- a/plugin-showdesktop/showdesktop.h +++ b/plugin-showdesktop/showdesktop.h @@ -45,8 +45,8 @@ class ShowDesktop : public QObject, public ILXQtPanelPlugin public: ShowDesktop(const ILXQtPanelPluginStartupInfo &startupInfo); - virtual QWidget *widget() { return &mButton; } - virtual QString themeId() const { return QStringLiteral("ShowDesktop"); } + QWidget *widget() override { return &mButton; } + QString themeId() const override { return QStringLiteral("ShowDesktop"); } private: GlobalKeyShortcut::Action * m_key; diff --git a/plugin-spacer/spacer.h b/plugin-spacer/spacer.h index 9242f1843..829badda1 100644 --- a/plugin-spacer/spacer.h +++ b/plugin-spacer/spacer.h @@ -57,19 +57,19 @@ class Spacer : public QObject, public ILXQtPanelPlugin public: Spacer(const ILXQtPanelPluginStartupInfo &startupInfo); - virtual QWidget *widget() override { return &mSpacer; } - virtual QString themeId() const override { return QStringLiteral("Spacer"); } + QWidget *widget() override { return &mSpacer; } + QString themeId() const override { return QStringLiteral("Spacer"); } bool isSeparate() const override { return true; } bool isExpandable() const override { return mExpandable; } - virtual ILXQtPanelPlugin::Flags flags() const override { return HaveConfigDialog; } + ILXQtPanelPlugin::Flags flags() const override { return HaveConfigDialog; } QDialog *configureDialog() override; - virtual void realign() override; + void realign() override; private slots: - virtual void settingsChanged() override; + void settingsChanged() override; private: void setSizes(); diff --git a/plugin-spacer/spacerconfiguration.h b/plugin-spacer/spacerconfiguration.h index 89c9a648a..4b5e8bce5 100644 --- a/plugin-spacer/spacerconfiguration.h +++ b/plugin-spacer/spacerconfiguration.h @@ -43,7 +43,7 @@ class SpacerConfiguration : public LXQtPanelPluginConfigDialog public: explicit SpacerConfiguration(PluginSettings *settings, QWidget *parent = nullptr); - ~SpacerConfiguration(); + ~SpacerConfiguration() override; public: static const QStringList msTypes; diff --git a/plugin-statusnotifier/statusnotifierbutton.h b/plugin-statusnotifier/statusnotifierbutton.h index 7f0f45f68..999968c7d 100644 --- a/plugin-statusnotifier/statusnotifierbutton.h +++ b/plugin-statusnotifier/statusnotifierbutton.h @@ -47,7 +47,7 @@ class StatusNotifierButton : public QToolButton public: StatusNotifierButton(QString service, QString objectPath, ILXQtPanelPlugin* plugin, QWidget *parent = nullptr); - ~StatusNotifierButton(); + ~StatusNotifierButton() override; enum Status { diff --git a/plugin-statusnotifier/statusnotifierconfiguration.h b/plugin-statusnotifier/statusnotifierconfiguration.h index 3e2d5205d..cd6cd6d10 100644 --- a/plugin-statusnotifier/statusnotifierconfiguration.h +++ b/plugin-statusnotifier/statusnotifierconfiguration.h @@ -39,7 +39,7 @@ class StatusNotifierConfiguration : public LXQtPanelPluginConfigDialog public: explicit StatusNotifierConfiguration(PluginSettings *settings, QWidget *parent = nullptr); - ~StatusNotifierConfiguration(); + ~StatusNotifierConfiguration() override; void addItems(const QStringList &items); diff --git a/plugin-statusnotifier/statusnotifieriteminterface.h b/plugin-statusnotifier/statusnotifieriteminterface.h index 4d91a3d76..c7ef6f32e 100644 --- a/plugin-statusnotifier/statusnotifieriteminterface.h +++ b/plugin-statusnotifier/statusnotifieriteminterface.h @@ -62,7 +62,7 @@ class StatusNotifierItemInterface: public QDBusAbstractInterface public: StatusNotifierItemInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = nullptr); - ~StatusNotifierItemInterface(); + ~StatusNotifierItemInterface() override; Q_PROPERTY(QString AttentionIconName READ attentionIconName) inline QString attentionIconName() const diff --git a/plugin-statusnotifier/statusnotifierwatcher.h b/plugin-statusnotifier/statusnotifierwatcher.h index 5b248c1a4..22a471610 100644 --- a/plugin-statusnotifier/statusnotifierwatcher.h +++ b/plugin-statusnotifier/statusnotifierwatcher.h @@ -47,7 +47,7 @@ class StatusNotifierWatcher : public QObject, protected QDBusContext public: explicit StatusNotifierWatcher(QObject *parent = nullptr); - ~StatusNotifierWatcher(); + ~StatusNotifierWatcher() override; bool isStatusNotifierHostRegistered() { return mHosts.count() > 0; } int protocolVersion() const { return 0; } diff --git a/plugin-sysstat/lxqtsysstat.h b/plugin-sysstat/lxqtsysstat.h index bdb90a805..860ca0a7f 100644 --- a/plugin-sysstat/lxqtsysstat.h +++ b/plugin-sysstat/lxqtsysstat.h @@ -47,20 +47,20 @@ class LXQtSysStat : public QObject, public ILXQtPanelPlugin Q_OBJECT public: LXQtSysStat(const ILXQtPanelPluginStartupInfo &startupInfo); - ~LXQtSysStat(); + ~LXQtSysStat() override; - virtual QWidget *widget() { return mWidget; } - virtual QString themeId() const { return QStringLiteral("SysStat"); } - virtual ILXQtPanelPlugin::Flags flags() const { return PreferRightAlignment | HaveConfigDialog; } - virtual bool isSeparate() const { return true; } + QWidget *widget() override { return mWidget; } + QString themeId() const override { return QStringLiteral("SysStat"); } + ILXQtPanelPlugin::Flags flags() const override { return PreferRightAlignment | HaveConfigDialog; } + bool isSeparate() const override { return true; } - QDialog *configureDialog(); + QDialog *configureDialog() override; - void realign(); + void realign() override; protected slots: virtual void lateInit(); - virtual void settingsChanged(); + void settingsChanged() override; private: QWidget *mWidget; @@ -74,7 +74,7 @@ class LXQtSysStatTitle : public QLabel Q_OBJECT public: LXQtSysStatTitle(QWidget *parent = nullptr); - ~LXQtSysStatTitle(); + ~LXQtSysStatTitle() override; protected: bool event(QEvent *e); @@ -103,7 +103,7 @@ class LXQtSysStatContent : public QWidget public: LXQtSysStatContent(ILXQtPanelPlugin *plugin, QWidget *parent = nullptr); - ~LXQtSysStatContent(); + ~LXQtSysStatContent() override; void updateSettings(const PluginSettings *); diff --git a/plugin-sysstat/lxqtsysstatcolours.h b/plugin-sysstat/lxqtsysstatcolours.h index 0bd7f8be2..b514c8501 100644 --- a/plugin-sysstat/lxqtsysstatcolours.h +++ b/plugin-sysstat/lxqtsysstatcolours.h @@ -50,7 +50,7 @@ class LXQtSysStatColours : public QDialog public: explicit LXQtSysStatColours(QWidget *parent = nullptr); - ~LXQtSysStatColours(); + ~LXQtSysStatColours() override; typedef QMap Colours; diff --git a/plugin-sysstat/lxqtsysstatconfiguration.h b/plugin-sysstat/lxqtsysstatconfiguration.h index 32c2de328..fdb8565c3 100644 --- a/plugin-sysstat/lxqtsysstatconfiguration.h +++ b/plugin-sysstat/lxqtsysstatconfiguration.h @@ -50,7 +50,7 @@ class LXQtSysStatConfiguration : public LXQtPanelPluginConfigDialog public: explicit LXQtSysStatConfiguration(PluginSettings *settings, QWidget *parent = nullptr); - ~LXQtSysStatConfiguration(); + ~LXQtSysStatConfiguration() override; public slots: void saveSettings(); diff --git a/plugin-taskbar/lxqtgrouppopup.h b/plugin-taskbar/lxqtgrouppopup.h index 515236c79..79d487ea8 100644 --- a/plugin-taskbar/lxqtgrouppopup.h +++ b/plugin-taskbar/lxqtgrouppopup.h @@ -47,7 +47,7 @@ class LXQtGroupPopup: public QFrame public: LXQtGroupPopup(LXQtTaskGroup *group); - ~LXQtGroupPopup(); + ~LXQtGroupPopup() override; void hide(bool fast = false); void show(); diff --git a/plugin-taskbar/lxqttaskbar.h b/plugin-taskbar/lxqttaskbar.h index 5b2e79e7a..d45b895e1 100644 --- a/plugin-taskbar/lxqttaskbar.h +++ b/plugin-taskbar/lxqttaskbar.h @@ -61,7 +61,7 @@ class LXQtTaskBar : public QFrame public: explicit LXQtTaskBar(ILXQtPanelPlugin *plugin, QWidget* parent = nullptr); - virtual ~LXQtTaskBar(); + ~LXQtTaskBar() override; void realign(); @@ -94,8 +94,8 @@ public slots: void popupShown(LXQtTaskGroup* sender); protected: - virtual void dragEnterEvent(QDragEnterEvent * event); - virtual void dragMoveEvent(QDragMoveEvent * event); + void dragEnterEvent(QDragEnterEvent * event) override; + void dragMoveEvent(QDragMoveEvent * event) override; private slots: void refreshTaskList(); diff --git a/plugin-taskbar/lxqttaskbarconfiguration.h b/plugin-taskbar/lxqttaskbarconfiguration.h index e559508b7..ec9d8e60b 100644 --- a/plugin-taskbar/lxqttaskbarconfiguration.h +++ b/plugin-taskbar/lxqttaskbarconfiguration.h @@ -42,7 +42,7 @@ class LXQtTaskbarConfiguration : public LXQtPanelPluginConfigDialog public: explicit LXQtTaskbarConfiguration(PluginSettings *settings, QWidget *parent = nullptr); - ~LXQtTaskbarConfiguration(); + ~LXQtTaskbarConfiguration() override; private: Ui::LXQtTaskbarConfiguration *ui; diff --git a/plugin-taskbar/lxqttaskbarplugin.h b/plugin-taskbar/lxqttaskbarplugin.h index 9c3076990..b54ec772b 100644 --- a/plugin-taskbar/lxqttaskbarplugin.h +++ b/plugin-taskbar/lxqttaskbarplugin.h @@ -40,19 +40,19 @@ class LXQtTaskBarPlugin : public QObject, public ILXQtPanelPlugin Q_OBJECT public: LXQtTaskBarPlugin(const ILXQtPanelPluginStartupInfo &startupInfo); - ~LXQtTaskBarPlugin(); + ~LXQtTaskBarPlugin() override; - QString themeId() const { return QStringLiteral("TaskBar"); } - virtual Flags flags() const { return HaveConfigDialog | NeedsHandle; } + QString themeId() const override { return QStringLiteral("TaskBar"); } + Flags flags() const override { return HaveConfigDialog | NeedsHandle; } - QWidget *widget() { return mTaskBar; } - QDialog *configureDialog(); + QWidget *widget() override { return mTaskBar; } + QDialog *configureDialog() override; - void settingsChanged() { mTaskBar->settingsChanged(); } - void realign(); + void settingsChanged() override { mTaskBar->settingsChanged(); } + void realign() override; - bool isSeparate() const { return true; } - bool isExpandable() const { return true; } + bool isSeparate() const override { return true; } + bool isExpandable() const override { return true; } private: LXQtTaskBar *mTaskBar; }; diff --git a/plugin-taskbar/lxqttaskbutton.h b/plugin-taskbar/lxqttaskbutton.h index 69f3b41d8..154c009a6 100644 --- a/plugin-taskbar/lxqttaskbutton.h +++ b/plugin-taskbar/lxqttaskbutton.h @@ -46,7 +46,7 @@ class LeftAlignedTextStyle : public QProxyStyle using QProxyStyle::QProxyStyle; public: - virtual void drawItemText(QPainter * painter, const QRect & rect, int flags + void drawItemText(QPainter * painter, const QRect & rect, int flags , const QPalette & pal, bool enabled, const QString & text , QPalette::ColorRole textRole = QPalette::NoRole) const override; }; @@ -60,7 +60,7 @@ class LXQtTaskButton : public QToolButton public: explicit LXQtTaskButton(const WId window, LXQtTaskBar * taskBar, QWidget *parent = nullptr); - virtual ~LXQtTaskButton(); + ~LXQtTaskButton() override; bool isApplicationHidden() const; bool isApplicationActive() const; @@ -103,17 +103,17 @@ public slots: void updateIcon(); protected: - virtual void changeEvent(QEvent *event); - virtual void dragEnterEvent(QDragEnterEvent *event); - virtual void dragMoveEvent(QDragMoveEvent * event); - virtual void dragLeaveEvent(QDragLeaveEvent *event); - virtual void dropEvent(QDropEvent *event); - void mousePressEvent(QMouseEvent *event); - void mouseReleaseEvent(QMouseEvent *event); - void mouseMoveEvent(QMouseEvent *event); - void wheelEvent(QWheelEvent* event); - virtual void contextMenuEvent(QContextMenuEvent *event); - void paintEvent(QPaintEvent *); + void changeEvent(QEvent *event) override; + void dragEnterEvent(QDragEnterEvent *event) override; + void dragMoveEvent(QDragMoveEvent * event) override; + void dragLeaveEvent(QDragLeaveEvent *event) override; + void dropEvent(QDropEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void wheelEvent(QWheelEvent* event) override; + void contextMenuEvent(QContextMenuEvent *event) override; + void paintEvent(QPaintEvent *) override; void setWindowId(WId wid) {mWindow = wid;} virtual QMimeData * mimeData(); diff --git a/plugin-tray/lxqttrayplugin.h b/plugin-tray/lxqttrayplugin.h index e8ddd78c0..00f2acc95 100644 --- a/plugin-tray/lxqttrayplugin.h +++ b/plugin-tray/lxqttrayplugin.h @@ -39,13 +39,13 @@ class LXQtTrayPlugin : public QObject, public ILXQtPanelPlugin Q_OBJECT public: explicit LXQtTrayPlugin(const ILXQtPanelPluginStartupInfo &startupInfo); - ~LXQtTrayPlugin(); + ~LXQtTrayPlugin() override; - virtual QWidget *widget(); - virtual QString themeId() const { return QStringLiteral("Tray"); } - virtual Flags flags() const { return PreferRightAlignment | SingleInstance | NeedsHandle; } + QWidget *widget() override; + QString themeId() const override { return QStringLiteral("Tray"); } + Flags flags() const override { return PreferRightAlignment | SingleInstance | NeedsHandle; } - bool isSeparate() const { return true; } + bool isSeparate() const override { return true; } private: std::unique_ptr mManager; diff --git a/plugin-volume/alsaengine.h b/plugin-volume/alsaengine.h index 538293e7f..3914da06e 100644 --- a/plugin-volume/alsaengine.h +++ b/plugin-volume/alsaengine.h @@ -48,7 +48,7 @@ class AlsaEngine : public AudioEngine AlsaEngine(QObject *parent = nullptr); static AlsaEngine *instance(); - virtual const QString backendName() const { return QLatin1String("Alsa"); } + const QString backendName() const override { return QLatin1String("Alsa"); } int volumeMax(AudioDevice *device) const; AlsaDevice *getDeviceByAlsaElem(snd_mixer_elem_t *elem) const; diff --git a/plugin-volume/audiodevice.h b/plugin-volume/audiodevice.h index 991275338..32cc166cd 100644 --- a/plugin-volume/audiodevice.h +++ b/plugin-volume/audiodevice.h @@ -46,7 +46,7 @@ class AudioDevice : public QObject public: AudioDevice(AudioDeviceType t, AudioEngine *engine, QObject *parent = nullptr); - ~AudioDevice(); + ~AudioDevice() override; // the volume can range from 0 to 100. int volume() const { return m_volume; } diff --git a/plugin-volume/audioengine.h b/plugin-volume/audioengine.h index 528d88ebf..6b43d2949 100644 --- a/plugin-volume/audioengine.h +++ b/plugin-volume/audioengine.h @@ -40,7 +40,7 @@ class AudioEngine : public QObject public: AudioEngine(QObject *parent = nullptr); - ~AudioEngine(); + ~AudioEngine() override; const QList &sinks() const { return m_sinks; } virtual int volumeMax(AudioDevice *device) const = 0; diff --git a/plugin-volume/lxqtvolume.h b/plugin-volume/lxqtvolume.h index c4527d3f3..0f4a9a4d6 100644 --- a/plugin-volume/lxqtvolume.h +++ b/plugin-volume/lxqtvolume.h @@ -51,17 +51,17 @@ class LXQtVolume : public QObject, public ILXQtPanelPlugin Q_OBJECT public: LXQtVolume(const ILXQtPanelPluginStartupInfo &startupInfo); - ~LXQtVolume(); + ~LXQtVolume() override; - virtual QWidget *widget(); - virtual QString themeId() const { return QStringLiteral("Volume"); } - virtual ILXQtPanelPlugin::Flags flags() const { return PreferRightAlignment | HaveConfigDialog ; } - void realign(); - QDialog *configureDialog(); + QWidget *widget() override; + QString themeId() const override { return QStringLiteral("Volume"); } + ILXQtPanelPlugin::Flags flags() const override { return PreferRightAlignment | HaveConfigDialog ; } + void realign() override; + QDialog *configureDialog() override; void setAudioEngine(AudioEngine *engine); protected slots: - virtual void settingsChanged(); + void settingsChanged() override; void handleSinkListChanged(); void handleShortcutVolumeUp(); void handleShortcutVolumeDown(); diff --git a/plugin-volume/lxqtvolumeconfiguration.h b/plugin-volume/lxqtvolumeconfiguration.h index 23d83ae9a..d24b02f22 100644 --- a/plugin-volume/lxqtvolumeconfiguration.h +++ b/plugin-volume/lxqtvolumeconfiguration.h @@ -72,7 +72,7 @@ class LXQtVolumeConfiguration : public LXQtPanelPluginConfigDialog public: explicit LXQtVolumeConfiguration(PluginSettings *settings, bool ossAvailable, QWidget *parent = nullptr); - ~LXQtVolumeConfiguration(); + ~LXQtVolumeConfiguration() override; public slots: void setSinkList(const QList sinks); @@ -86,7 +86,7 @@ public slots: void showKeyboardNotificationsCheckBoxChanged(bool state); protected slots: - virtual void loadSettings(); + void loadSettings() override; private: Ui::LXQtVolumeConfiguration *ui; diff --git a/plugin-volume/ossengine.h b/plugin-volume/ossengine.h index 03d974da8..bb2c92c76 100644 --- a/plugin-volume/ossengine.h +++ b/plugin-volume/ossengine.h @@ -42,14 +42,14 @@ class OssEngine : public AudioEngine public: OssEngine(QObject *parent = nullptr); - ~OssEngine(); + ~OssEngine() override; - virtual const QString backendName() const { return QLatin1String("Oss"); } - virtual int volumeMax(AudioDevice */*device*/) const { return 100; } + const QString backendName() const override { return QLatin1String("Oss"); } + int volumeMax(AudioDevice */*device*/) const override { return 100; } - virtual void commitDeviceVolume(AudioDevice *device); - virtual void setMute(AudioDevice *device, bool state); - virtual void setIgnoreMaxVolume(bool ignore); + void commitDeviceVolume(AudioDevice *device) override; + void setMute(AudioDevice *device, bool state) override; + void setIgnoreMaxVolume(bool ignore) override; signals: void sinkInfoChanged(AudioDevice *device); diff --git a/plugin-volume/pulseaudioengine.h b/plugin-volume/pulseaudioengine.h index 906128408..47c0c2aaf 100644 --- a/plugin-volume/pulseaudioengine.h +++ b/plugin-volume/pulseaudioengine.h @@ -50,11 +50,11 @@ class PulseAudioEngine : public AudioEngine public: PulseAudioEngine(QObject *parent = nullptr); - ~PulseAudioEngine(); + ~PulseAudioEngine() override; - virtual const QString backendName() const { return QLatin1String("PulseAudio"); } + const QString backendName() const override { return QLatin1String("PulseAudio"); } - int volumeMax(AudioDevice */*device*/) const { return m_maximumVolume; } + int volumeMax(AudioDevice */*device*/) const override { return m_maximumVolume; } void requestSinkInfoUpdate(uint32_t idx); void removeSink(uint32_t idx); @@ -65,11 +65,11 @@ class PulseAudioEngine : public AudioEngine pa_threaded_mainloop *mainloop() const { return m_mainLoop; } public slots: - void commitDeviceVolume(AudioDevice *device); + void commitDeviceVolume(AudioDevice *device) override; void retrieveSinkInfo(uint32_t idx); - void setMute(AudioDevice *device, bool state); + void setMute(AudioDevice *device, bool state) override; void setContextState(pa_context_state_t state); - void setIgnoreMaxVolume(bool ignore); + void setIgnoreMaxVolume(bool ignore) override; signals: void sinkInfoChanged(uint32_t idx); diff --git a/plugin-volume/volumebutton.h b/plugin-volume/volumebutton.h index aabbd5b76..d34dcff6b 100644 --- a/plugin-volume/volumebutton.h +++ b/plugin-volume/volumebutton.h @@ -39,7 +39,7 @@ class VolumeButton : public QToolButton Q_OBJECT public: VolumeButton(ILXQtPanelPlugin *plugin, QWidget* parent = nullptr); - ~VolumeButton(); + ~VolumeButton() override; void setMuteOnMiddleClick(bool state); void setMixerCommand(const QString &command); diff --git a/plugin-worldclock/lxqtworldclock.h b/plugin-worldclock/lxqtworldclock.h index 1881d4d10..5079c17b4 100644 --- a/plugin-worldclock/lxqtworldclock.h +++ b/plugin-worldclock/lxqtworldclock.h @@ -51,18 +51,18 @@ class LXQtWorldClock : public QObject, public ILXQtPanelPlugin Q_OBJECT public: LXQtWorldClock(const ILXQtPanelPluginStartupInfo &startupInfo); - ~LXQtWorldClock(); + ~LXQtWorldClock() override; - virtual QWidget *widget() { return mMainWidget; } - virtual QString themeId() const { return QLatin1String("WorldClock"); } - virtual ILXQtPanelPlugin::Flags flags() const { return PreferRightAlignment | HaveConfigDialog ; } - bool isSeparate() const { return true; } - void activated(ActivationReason reason); + QWidget *widget() override { return mMainWidget; } + QString themeId() const override { return QLatin1String("WorldClock"); } + ILXQtPanelPlugin::Flags flags() const override { return PreferRightAlignment | HaveConfigDialog ; } + bool isSeparate() const override { return true; } + void activated(ActivationReason reason) override; - virtual void settingsChanged(); - virtual void realign(); - QDialog *configureDialog(); - bool eventFilter(QObject * watched, QEvent * event); + void settingsChanged() override; + void realign() override; + QDialog *configureDialog() override; + bool eventFilter(QObject * watched, QEvent * event) override; private slots: void timeout(); @@ -132,7 +132,7 @@ class LXQtWorldClockPopup : public QDialog void deactivated(); protected: - virtual bool event(QEvent* ); + bool event(QEvent* ) override; }; diff --git a/plugin-worldclock/lxqtworldclockconfiguration.h b/plugin-worldclock/lxqtworldclockconfiguration.h index 9a1c66536..df15f4d1e 100644 --- a/plugin-worldclock/lxqtworldclockconfiguration.h +++ b/plugin-worldclock/lxqtworldclockconfiguration.h @@ -49,7 +49,7 @@ class LXQtWorldClockConfiguration : public LXQtPanelPluginConfigDialog public: explicit LXQtWorldClockConfiguration(PluginSettings *settings, QWidget *parent = nullptr); - ~LXQtWorldClockConfiguration(); + ~LXQtWorldClockConfiguration() override; public slots: void saveSettings(); diff --git a/plugin-worldclock/lxqtworldclockconfigurationmanualformat.h b/plugin-worldclock/lxqtworldclockconfigurationmanualformat.h index 4e3d67e6c..8e95440f0 100644 --- a/plugin-worldclock/lxqtworldclockconfigurationmanualformat.h +++ b/plugin-worldclock/lxqtworldclockconfigurationmanualformat.h @@ -46,7 +46,7 @@ class LXQtWorldClockConfigurationManualFormat : public QDialog public: explicit LXQtWorldClockConfigurationManualFormat(QWidget *parent = nullptr); - ~LXQtWorldClockConfigurationManualFormat(); + ~LXQtWorldClockConfigurationManualFormat() override; void setManualFormat(const QString&); diff --git a/plugin-worldclock/lxqtworldclockconfigurationtimezones.h b/plugin-worldclock/lxqtworldclockconfigurationtimezones.h index d4bd551bc..ed5a445b8 100644 --- a/plugin-worldclock/lxqtworldclockconfigurationtimezones.h +++ b/plugin-worldclock/lxqtworldclockconfigurationtimezones.h @@ -46,7 +46,7 @@ class LXQtWorldClockConfigurationTimeZones : public QDialog public: explicit LXQtWorldClockConfigurationTimeZones(QWidget *parent = nullptr); - ~LXQtWorldClockConfigurationTimeZones(); + ~LXQtWorldClockConfigurationTimeZones() override; int updateAndExec();