4 files changed, 17 insertions, 17 deletions

diff --git a/src/plugins/General/fileops/hotkeydialog.cpp b/src/plugins/General/fileops/hotkeydialog.cpp
index 3725bb826..f377432e6 100644
--- a/src/plugins/General/fileops/hotkeydialog.cpp
+++ b/src/plugins/General/fileops/hotkeydialog.cpp
@@ -24,8 +24,8 @@
 HotkeyDialog::HotkeyDialog(const QString &key, QWidget *parent)
         : QDialog(parent)
 {
-    ui.setupUi(this);
-    ui.keyLineEdit->setText(key);
+    m_ui.setupUi(this);
+    m_ui.keyLineEdit->setText(key);
 }
 
 HotkeyDialog::~HotkeyDialog()
@@ -47,16 +47,16 @@ void HotkeyDialog::keyPressEvent (QKeyEvent *event)
     case Qt::Key_Menu:
     case 0:
     case Qt::Key_unknown:
-        ui.keyLineEdit->clear();
+        m_ui.keyLineEdit->clear();
         QWidget::keyPressEvent(event);
         return;
     }
     QKeySequence seq(event->modifiers() + event->key());
-    ui.keyLineEdit->setText(seq.toString());
+    m_ui.keyLineEdit->setText(seq.toString());
     QWidget::keyPressEvent(event);
 }
 
 const QString HotkeyDialog::key()
 {
-    return ui.keyLineEdit->text();
+    return m_ui.keyLineEdit->text();
 }
diff --git a/src/plugins/General/fileops/hotkeydialog.h b/src/plugins/General/fileops/hotkeydialog.h
index bf37bfea1..505b4cf90 100644
--- a/src/plugins/General/fileops/hotkeydialog.h
+++ b/src/plugins/General/fileops/hotkeydialog.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2009 by Ilya Kotov                                      *
+ *   Copyright (C) 2009-2020 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -33,7 +33,7 @@ class HotkeyDialog : public QDialog
 {
     Q_OBJECT
 public:
-    HotkeyDialog(const QString &key, QWidget *parent = nullptr);
+    explicit HotkeyDialog(const QString &key, QWidget *parent = nullptr);
 
     ~HotkeyDialog();
 
@@ -43,7 +43,7 @@ protected:
     virtual void keyPressEvent (QKeyEvent *event) override;
 
 private:
-    Ui::HotkeyDialog ui;
+    Ui::HotkeyDialog m_ui;
 
 };
 
diff --git a/src/plugins/General/fileops/settingsdialog.cpp b/src/plugins/General/fileops/settingsdialog.cpp
index 46b66403c..13d5e3c09 100644
--- a/src/plugins/General/fileops/settingsdialog.cpp
+++ b/src/plugins/General/fileops/settingsdialog.cpp
@@ -109,7 +109,7 @@ void SettingsDialog::accept()
         QComboBox *comboBox = qobject_cast<QComboBox *>(m_ui.tableWidget->cellWidget (i, 1));
         settings.setValue (QString("action_%1").arg(i), comboBox->itemData (comboBox->currentIndex()));
 
-        ActionItem *item = (ActionItem *) m_ui.tableWidget->item(i,2);
+        ActionItem *item = dynamic_cast<ActionItem *>(m_ui.tableWidget->item(i,2));
         settings.setValue (QString("name_%1").arg(i), item->text());
         settings.setValue (QString("pattern_%1").arg(i), item->pattern());
         settings.setValue (QString("destination_%1").arg(i), item->destination());
@@ -158,7 +158,7 @@ void SettingsDialog::updateLineEdits()
 {
     if (m_ui.tableWidget->currentRow () >= 0)
     {
-        ActionItem *item = (ActionItem *) m_ui.tableWidget->item(m_ui.tableWidget->currentRow (), 2);
+        ActionItem *item = dynamic_cast<ActionItem *>(m_ui.tableWidget->item(m_ui.tableWidget->currentRow (), 2));
         m_ui.destinationEdit->setText(item->destination());
         m_ui.patternEdit->setText(item->pattern());
 
@@ -200,7 +200,7 @@ void SettingsDialog::on_destinationEdit_textChanged(QString dest)
 {
     if (m_ui.tableWidget->currentRow () >= 0)
     {
-        ActionItem *item = (ActionItem *) m_ui.tableWidget->item(m_ui.tableWidget->currentRow (), 2);
+        ActionItem *item = dynamic_cast<ActionItem *>(m_ui.tableWidget->item(m_ui.tableWidget->currentRow (), 2));
         item->setDestination(dest);
     }
 }
@@ -209,7 +209,7 @@ void SettingsDialog::on_patternEdit_textChanged(QString pattern)
 {
     if (m_ui.tableWidget->currentRow () >= 0)
     {
-        ActionItem *item = (ActionItem *) m_ui.tableWidget->item(m_ui.tableWidget->currentRow (), 2);
+        ActionItem *item = dynamic_cast<ActionItem *>(m_ui.tableWidget->item(m_ui.tableWidget->currentRow (), 2));
         item->setPattern(pattern);
     }
 }
diff --git a/src/plugins/General/fileops/settingsdialog.h b/src/plugins/General/fileops/settingsdialog.h
index 6691e85c8..b8377bd8f 100644
--- a/src/plugins/General/fileops/settingsdialog.h
+++ b/src/plugins/General/fileops/settingsdialog.h
@@ -58,24 +58,24 @@ private:
 class ActionItem: public QTableWidgetItem
 {
 public:
-    ActionItem (const QString &text): QTableWidgetItem(text){}
+    explicit ActionItem (const QString &text): QTableWidgetItem(text){}
 
-    QString pattern()
+    inline const QString &pattern() const
     {
         return m_pattern;
     }
 
-    QString destination()
+    inline const QString &destination() const
     {
         return m_destination;
     }
 
-    void setPattern(const QString &pattern)
+    inline void setPattern(const QString &pattern)
     {
         m_pattern = pattern;
     }
 
-    void setDestination(const QString &dest)
+    inline void setDestination(const QString &dest)
     {
         m_destination = dest;
     }