Merge branch 'more-modernize'

* more-modernize: Use = default for trivial contructors/destructors Use override
gfgit · Dec 4, 2020 · 0c2c21a · 0c2c21a
2 parents eaabbb0 + 5b09f71
commit 0c2c21a
Show file tree

Hide file tree

Showing 30 changed files with 39 additions and 95 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/panel/lxqtpanelpluginconfigdialog.cpp b/panel/lxqtpanelpluginconfigdialog.cpp
@@ -46,9 +46,7 @@ LXQtPanelPluginConfigDialog::LXQtPanelPluginConfigDialog(PluginSettings &setting
 /************************************************
 
  ************************************************/
-LXQtPanelPluginConfigDialog::~LXQtPanelPluginConfigDialog()
-{
-}
+LXQtPanelPluginConfigDialog::~LXQtPanelPluginConfigDialog() = default;
 
 
 /************************************************

diff --git a/panel/pluginmoveprocessor.cpp b/panel/pluginmoveprocessor.cpp
@@ -49,9 +49,7 @@ PluginMoveProcessor::PluginMoveProcessor(LXQtPanelLayout *layout, Plugin *plugin
 /************************************************
 
  ************************************************/
-PluginMoveProcessor::~PluginMoveProcessor()
-{
-}
+PluginMoveProcessor::~PluginMoveProcessor() = default;
 
 
 /************************************************

diff --git a/panel/pluginsettings.cpp b/panel/pluginsettings.cpp
@@ -72,9 +72,7 @@ QString PluginSettings::group() const
     return d->mGroup;
 }
 
-PluginSettings::~PluginSettings()
-{
-}
+PluginSettings::~PluginSettings() = default;
 
 QVariant PluginSettings::value(const QString &key, const QVariant &defaultValue) const
 {

diff --git a/plugin-colorpicker/colorpicker.cpp b/plugin-colorpicker/colorpicker.cpp
@@ -39,9 +39,7 @@ ColorPicker::ColorPicker(const ILXQtPanelPluginStartupInfo &startupInfo) :
 }
 
 
-ColorPicker::~ColorPicker()
-{
-}
+ColorPicker::~ColorPicker() = default;
 
 
 void ColorPicker::realign()
@@ -75,9 +73,7 @@ ColorPickerWidget::ColorPickerWidget(QWidget *parent):
 }
 
 
-ColorPickerWidget::~ColorPickerWidget()
-{
-}
+ColorPickerWidget::~ColorPickerWidget() = default;
 
 
 void ColorPickerWidget::mouseReleaseEvent(QMouseEvent *event)

diff --git a/plugin-desktopswitch/desktopswitch.cpp b/plugin-desktopswitch/desktopswitch.cpp
@@ -206,9 +206,7 @@ bool DesktopSwitch::isWindowHighlightable(WId window)
     return !NET::typeMatchesMask(info.windowType(NET::AllTypesMask), normalFlag);
 }
 
-DesktopSwitch::~DesktopSwitch()
-{
-}
+DesktopSwitch::~DesktopSwitch() = default;
 
 void DesktopSwitch::setDesktop(int desktop)
 {

diff --git a/plugin-kbindicator/kbindicator-plugin.cpp b/plugin-kbindicator/kbindicator-plugin.cpp
@@ -36,10 +36,9 @@ class LXQtKbIndicatorPlugin: public QObject, public ILXQtPanelPluginLibrary
     Q_PLUGIN_METADATA(IID "lxqt.org/Panel/PluginInterface/3.0")
     Q_INTERFACES(ILXQtPanelPluginLibrary)
 public:
-    virtual ~LXQtKbIndicatorPlugin()
-    {}
+    ~LXQtKbIndicatorPlugin() override = default;
 
-    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/content.cpp b/plugin-kbindicator/src/content.cpp
@@ -71,8 +71,7 @@ Content::Content(bool layoutEnabled):
     box->addWidget(m_layout, 0, Qt::AlignCenter);
 }
 
-Content::~Content()
-{}
+Content::~Content() = default;
 
 bool Content::setup()
 {

diff --git a/plugin-kbindicator/src/kbdkeeper.cpp b/plugin-kbindicator/src/kbdkeeper.cpp
@@ -39,8 +39,7 @@ KbdKeeper::KbdKeeper(const KbdLayout & layout, KeeperType type):
     m_layout.readKbdInfo(m_info);
 }
 
-KbdKeeper::~KbdKeeper()
-{}
+KbdKeeper::~KbdKeeper() = default;
 
 bool KbdKeeper::setup()
 {
@@ -89,8 +88,7 @@ WinKbdKeeper::WinKbdKeeper(const KbdLayout & layout):
     KbdKeeper(layout, KeeperType::Window)
 {}
 
-WinKbdKeeper::~WinKbdKeeper()
-{}
+WinKbdKeeper::~WinKbdKeeper() = default;
 
 void WinKbdKeeper::layoutChanged(uint group)
 {
@@ -137,8 +135,7 @@ AppKbdKeeper::AppKbdKeeper(const KbdLayout & layout):
     KbdKeeper(layout, KeeperType::Window)
 {}
 
-AppKbdKeeper::~AppKbdKeeper()
-{}
+AppKbdKeeper::~AppKbdKeeper() = default;
 
 void AppKbdKeeper::layoutChanged(uint group)
 {

diff --git a/plugin-kbindicator/src/kbdstate.cpp b/plugin-kbindicator/src/kbdstate.cpp
@@ -46,8 +46,7 @@ KbdState::KbdState(const ILXQtPanelPluginStartupInfo &startupInfo):
     settingsChanged();
 }
 
-KbdState::~KbdState()
-{}
+KbdState::~KbdState() = default;
 
 void KbdState::settingsChanged()
 {

diff --git a/plugin-kbindicator/src/settings.cpp b/plugin-kbindicator/src/settings.cpp
@@ -27,8 +27,7 @@
 #include <QSettings>
 #include "settings.h"
 
-Settings::Settings()
-{}
+Settings::Settings() = default;
 
 Settings &Settings::instance()
 {

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;
@@ -306,8 +306,7 @@ X11Kbd::X11Kbd():
     m_priv(new pimpl::X11Kbd(this))
 {}
 
-X11Kbd::~X11Kbd()
-{}
+X11Kbd::~X11Kbd() = default;
 
 bool X11Kbd::init()
 { return m_priv->init(); }

diff --git a/plugin-mainmenu/actionview.cpp b/plugin-mainmenu/actionview.cpp
@@ -47,8 +47,7 @@ FilterProxyModel::FilterProxyModel(QObject* parent) :
     QSortFilterProxyModel(parent) {
 }
 
-FilterProxyModel::~FilterProxyModel() {
-}
+FilterProxyModel::~FilterProxyModel() = default;
 
 bool FilterProxyModel::filterAcceptsRow(int source_row, const QModelIndex& source_parent) const {
     if (filterStr_.isEmpty())
@@ -79,7 +78,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 +100,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-mount/actions/deviceaction.cpp b/plugin-mount/actions/deviceaction.cpp
@@ -48,9 +48,7 @@ DeviceAction::DeviceAction(LXQtMountPlugin *plugin, QObject *parent)
 {
 }
 
-DeviceAction::~DeviceAction()
-{
-}
+DeviceAction::~DeviceAction() = default;
 
 DeviceAction *DeviceAction::create(ActionId id, LXQtMountPlugin *plugin, QObject *parent)
 {

diff --git a/plugin-mount/actions/ejectaction.cpp b/plugin-mount/actions/ejectaction.cpp
@@ -42,9 +42,7 @@ EjectAction::EjectAction(LXQtMountPlugin *plugin, QObject *parent)
 {
 }
 
-EjectAction::~EjectAction()
-{
-}
+EjectAction::~EjectAction() = default;
 
 EjectAction *EjectAction::create(ActionId id, LXQtMountPlugin *plugin, QObject *parent)
 {

diff --git a/plugin-mount/button.cpp b/plugin-mount/button.cpp
@@ -40,6 +40,4 @@ Button::Button(QWidget * parent) :
     setAutoRaise(true);
 }
 
-Button::~Button()
-{
-}
+Button::~Button() = default;
diff --git a/plugin-mount/menudiskitem.cpp b/plugin-mount/menudiskitem.cpp
@@ -78,9 +78,7 @@ MenuDiskItem::MenuDiskItem(Solid::Device device, Popup *popup):
     updateMountStatus();
 }
 
-MenuDiskItem::~MenuDiskItem()
-{
-}
+MenuDiskItem::~MenuDiskItem() = default;
 
 void MenuDiskItem::setMountStatus(bool mounted)
 {

diff --git a/plugin-networkmonitor/lxqtnetworkmonitor.cpp b/plugin-networkmonitor/lxqtnetworkmonitor.cpp
@@ -66,9 +66,7 @@ LXQtNetworkMonitor::LXQtNetworkMonitor(ILXQtPanelPlugin *plugin, QWidget* parent
     settingsChanged();
 }
 
-LXQtNetworkMonitor::~LXQtNetworkMonitor()
-{
-}
+LXQtNetworkMonitor::~LXQtNetworkMonitor() = default;
 
 void LXQtNetworkMonitor::resizeEvent(QResizeEvent *)
 {

diff --git a/plugin-quicklaunch/lxqtquicklaunch.cpp b/plugin-quicklaunch/lxqtquicklaunch.cpp
@@ -107,9 +107,7 @@ LXQtQuickLaunch::LXQtQuickLaunch(ILXQtPanelPlugin *plugin, QWidget* parent) :
 }
 
 
-LXQtQuickLaunch::~LXQtQuickLaunch()
-{
-}
+LXQtQuickLaunch::~LXQtQuickLaunch() = default;
 
 
 int LXQtQuickLaunch::indexOfButton(QuickLaunchButton* button) const

diff --git a/plugin-quicklaunch/quicklaunchbutton.cpp b/plugin-quicklaunch/quicklaunchbutton.cpp
@@ -78,11 +78,7 @@ QuickLaunchButton::QuickLaunchButton(QuickLaunchAction * act, ILXQtPanelPlugin *
             this, SLOT(this_customContextMenuRequested(const QPoint&)));
 }
 
-
-QuickLaunchButton::~QuickLaunchButton()
-{
-    //m_act->deleteLater();
-}
+QuickLaunchButton::~QuickLaunchButton() = default;
 
 
 QHash<QString,QString> QuickLaunchButton::settingsMap()

diff --git a/plugin-sensors/lxqtsensors.cpp b/plugin-sensors/lxqtsensors.cpp
@@ -118,9 +118,7 @@ LXQtSensors::LXQtSensors(ILXQtPanelPlugin *plugin, QWidget* parent):
 }
 
 
-LXQtSensors::~LXQtSensors()
-{
-}
+LXQtSensors::~LXQtSensors() = default;
 
 
 void LXQtSensors::updateSensorReadings()

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);
         }

diff --git a/plugin-statusnotifier/statusnotifieriteminterface.cpp b/plugin-statusnotifier/statusnotifieriteminterface.cpp
@@ -48,7 +48,5 @@ StatusNotifierItemInterface::StatusNotifierItemInterface(const QString &service,
 {
 }
 
-StatusNotifierItemInterface::~StatusNotifierItemInterface()
-{
-}
+StatusNotifierItemInterface::~StatusNotifierItemInterface() = default;
 
diff --git a/plugin-sysstat/lxqtsysstat.cpp b/plugin-sysstat/lxqtsysstat.cpp
@@ -99,10 +99,7 @@ LXQtSysStatTitle::LXQtSysStatTitle(QWidget *parent):
 
 }
 
-LXQtSysStatTitle::~LXQtSysStatTitle()
-{
-
-}
+LXQtSysStatTitle::~LXQtSysStatTitle() = default;
 
 bool LXQtSysStatTitle::event(QEvent *e)
 {
@@ -125,9 +122,7 @@ LXQtSysStatContent::LXQtSysStatContent(ILXQtPanelPlugin *plugin, QWidget *parent
     setObjectName(QStringLiteral("SysStat_Graph"));
 }
 
-LXQtSysStatContent::~LXQtSysStatContent()
-{
-}
+LXQtSysStatContent::~LXQtSysStatContent() = default;
 
 
 // I don't like macros very much, but writing dozen similar functions is much much worse.

diff --git a/plugin-taskbar/lxqtgrouppopup.cpp b/plugin-taskbar/lxqtgrouppopup.cpp
@@ -62,9 +62,7 @@ LXQtGroupPopup::LXQtGroupPopup(LXQtTaskGroup *group):
     mCloseTimer.setInterval(400);
 }
 
-LXQtGroupPopup::~LXQtGroupPopup()
-{
-}
+LXQtGroupPopup::~LXQtGroupPopup() = default;
 
 void LXQtGroupPopup::dropEvent(QDropEvent *event)
 {

diff --git a/plugin-taskbar/lxqttaskbutton.cpp b/plugin-taskbar/lxqttaskbutton.cpp
@@ -122,9 +122,7 @@ LXQtTaskButton::LXQtTaskButton(const WId window, LXQtTaskBar * taskbar, QWidget
 /************************************************
 
 ************************************************/
-LXQtTaskButton::~LXQtTaskButton()
-{
-}
+LXQtTaskButton::~LXQtTaskButton() = default;
 
 /************************************************
 

diff --git a/plugin-tray/lxqttrayconfiguration.cpp b/plugin-tray/lxqttrayconfiguration.cpp
@@ -47,7 +47,7 @@ LXQtTrayConfiguration::LXQtTrayConfiguration(PluginSettings *settings, QWidget *
     connect(ui->buttons, &QDialogButtonBox::clicked, this, &LXQtTrayConfiguration::dialogButtonsAction);
 }
 
-LXQtTrayConfiguration::~LXQtTrayConfiguration() {}
+LXQtTrayConfiguration::~LXQtTrayConfiguration() = default;
 
 void LXQtTrayConfiguration::loadSettings()
 {

diff --git a/plugin-tray/xfitman.cpp b/plugin-tray/xfitman.cpp
@@ -187,9 +187,7 @@ bool XfitMan::getClientIcon(Window _wid, QIcon *icon) const
 /**
  * @brief destructor
  */
-XfitMan::~XfitMan()
-{
-}
+XfitMan::~XfitMan() = default;
 
 /**
  * @brief returns a windowname and sets _nameSource to the finally used Atom

diff --git a/plugin-volume/audiodevice.cpp b/plugin-volume/audiodevice.cpp
@@ -38,9 +38,7 @@ AudioDevice::AudioDevice(AudioDeviceType t, AudioEngine *engine, QObject *parent
 {
 }
 
-AudioDevice::~AudioDevice()
-{
-}
+AudioDevice::~AudioDevice() = default;
 
 void AudioDevice::setName(const QString &name)
 {

diff --git a/plugin-volume/volumebutton.cpp b/plugin-volume/volumebutton.cpp
@@ -66,9 +66,7 @@ VolumeButton::VolumeButton(ILXQtPanelPlugin *plugin, QWidget* parent):
     connect(m_volumePopup, SIGNAL(stockIconChanged(QString)), this, SLOT(handleStockIconChanged(QString)));
 }
 
-VolumeButton::~VolumeButton()
-{
-}
+VolumeButton::~VolumeButton() = default;
 
 void VolumeButton::setShowOnClicked(bool state)
 {
-Original file line number
+Diff line change
@@ Expand Up @@
     {
     }
-    DeviceAction::~DeviceAction()
-    {
-    }
+    DeviceAction::~DeviceAction() = default;
     DeviceAction *DeviceAction::create(ActionId id, LXQtMountPlugin *plugin, QObject *parent)
     {
@@ Expand Down @@