Clean up ConfigurationWidget

* use type safe connect syntax
* use lambdas as slot for selecting programs
* make accept and cancel non-members. They're not needed anywhere else.

2 files changed, 13 insertions, 28 deletions

diff --git a/configurationwidget.cpp b/configurationwidget.cpp
index c9cffce..8aa0a1e 100644
--- a/configurationwidget.cpp
+++ b/configurationwidget.cpp
@@ -37,19 +37,19 @@ ConfigurationWidget::ConfigurationWidget(QWidget *parent, Qt::WindowFlags f) : Q
     extL->addWidget(new QLabel(tr("ffprobe")), 0, 0);
     extL->addWidget(mFfProbe, 0, 1);
     QPushButton *browseFfProbeBtn = new QPushButton(tr("Browse..."));
-    connect(browseFfProbeBtn, SIGNAL(clicked()), this, SLOT(browseFfProbe()));
+    connect(browseFfProbeBtn, &QPushButton::clicked, [=] { browsePathforLE(mFfProbe); });
     extL->addWidget(browseFfProbeBtn, 0, 2);
     mFfMpeg = new QLineEdit;
     extL->addWidget(new QLabel(tr("ffmpeg")), 1, 0);
     extL->addWidget(mFfMpeg, 1, 1);
     QPushButton *browseFfMpegBtn = new QPushButton(tr("Browse..."));
-    connect(browseFfMpegBtn, SIGNAL(clicked()), this, SLOT(browseFfMpeg()));
+    connect(browseFfMpegBtn, &QPushButton::clicked, [=] { browsePathforLE(mFfMpeg); });
     extL->addWidget(browseFfMpegBtn, 1, 2);
     mMkvInfo = new QLineEdit;
     extL->addWidget(new QLabel(tr("mkvinfo")), 2, 0);
     extL->addWidget(mMkvInfo, 2, 1);
     QPushButton *browsemkvBtn = new QPushButton(tr("Browse..."));
-    connect(browsemkvBtn, SIGNAL(clicked()), this, SLOT(browseMkvInfo()));
+    connect(browsemkvBtn, &QPushButton::clicked, [=] { browsePathforLE(mMkvInfo); });
     extL->addWidget(browsemkvBtn, 2, 2);
     extL->setAlignment(Qt::AlignTop);
     QWidget *extWidget = new QWidget;
@@ -65,14 +65,14 @@ ConfigurationWidget::ConfigurationWidget(QWidget *parent, Qt::WindowFlags f) : Q
     mMimeTypeW = new ItemSelectionWidget(ItemSelectionWidget::Item, tr("Mime Type Regex"));
 
     //buttons
-    mAccept = new QPushButton(tr("Save"));
-    connect(mAccept, SIGNAL(clicked()), this, SLOT(accept()));
-    mCancel = new QPushButton(tr("Cancel"));
-    connect(mCancel, SIGNAL(clicked()), this, SLOT(reject()));
+    QPushButton *acceptB = new QPushButton(tr("Save"));
+    connect(acceptB, &QPushButton::clicked, this, &ConfigurationWidget::accept);
+    QPushButton *cancelB = new QPushButton(tr("Cancel"));
+    connect(cancelB, &QPushButton::clicked, this, &ConfigurationWidget::reject);
     QHBoxLayout *bLayout = new QHBoxLayout;
     bLayout->addStretch();
-    bLayout->addWidget(mAccept);
-    bLayout->addWidget(mCancel);
+    bLayout->addWidget(acceptB);
+    bLayout->addWidget(cancelB);
     bLayout->addStretch();
 
     //dialog layout
@@ -108,19 +108,9 @@ void ConfigurationWidget::accept(){
     QDialog::accept();
 }
 
-void ConfigurationWidget::browseFfProbe(){
-    QString ffprobe = QFileDialog::getOpenFileName(this, tr("Select ffprobe"), QDir::homePath());
-    mFfProbe->setText(QDir::toNativeSeparators(ffprobe));
-}
-
-void ConfigurationWidget::browseFfMpeg(){
-    QString ffmpeg = QFileDialog::getOpenFileName(this, tr("Select ffmpeg"), QDir::homePath());
-    mFfMpeg->setText(QDir::toNativeSeparators(ffmpeg));
-}
-
-void ConfigurationWidget::browseMkvInfo(){
-    QString mkvinfo = QFileDialog::getOpenFileName(this, tr("Select mkvinfo"), QDir::homePath());
-    mMkvInfo->setText(QDir::toNativeSeparators(mkvinfo));
+void ConfigurationWidget::browsePathforLE(QLineEdit *edit){
+    QString res = QFileDialog::getOpenFileName(this, tr("Select ffprobe"), QDir::homePath());
+    edit->setText(res);
 }
 
 void ConfigurationWidget::readSettings(){
diff --git a/configurationwidget.h b/configurationwidget.h
index 0ac05f5..08488cc 100644
--- a/configurationwidget.h
+++ b/configurationwidget.h
@@ -4,7 +4,6 @@
 #include <QDialog>
 
 class QLineEdit;
-class QPushButton;
 class ItemSelectionWidget;
 
 class ConfigurationWidget : public QDialog {
@@ -16,9 +15,7 @@ class ConfigurationWidget : public QDialog {
         virtual void accept();
 
     private slots:
-        void browseFfProbe();
-        void browseFfMpeg();
-        void browseMkvInfo();
+        void browsePathforLE(QLineEdit *edit);
 
     private:
         void readSettings();
@@ -29,8 +26,6 @@ class ConfigurationWidget : public QDialog {
         QLineEdit *mFfProbe;
         QLineEdit *mFfMpeg;
         QLineEdit *mMkvInfo;
-        QPushButton *mAccept;
-        QPushButton *mCancel;
         ItemSelectionWidget *mCopyDirW;
         ItemSelectionWidget *mFavDirW;
         ItemSelectionWidget *mMimeTypeW;