2 files changed, 15 insertions, 23 deletions

diff --git a/filepropertiesdialog.cpp b/filepropertiesdialog.cpp
index 39c4466..be5e261 100644
--- a/filepropertiesdialog.cpp
+++ b/filepropertiesdialog.cpp
@@ -25,8 +25,8 @@
 #include "helper.h"
 
 FilePropertiesDialog::FilePropertiesDialog(const QString &file, QWidget *parent, Qt::WindowFlags f) : SmDialog(parent, f), mFile(file){
-    mStack = new QStackedWidget;
-    mTab = new QTabWidget;
+    QStackedWidget *stackW = new QStackedWidget;
+    QTabWidget *tabW = new QTabWidget;
     QString lText = QString(tr("<b>Properties - %1</b>")).arg(mFile);
     QLabel *l = new QLabel(lText);
     QVBoxLayout *mainLayout = new QVBoxLayout;
@@ -39,7 +39,7 @@ FilePropertiesDialog::FilePropertiesDialog(const QString &file, QWidget *parent,
     QHBoxLayout *formatLayout = new QHBoxLayout;
     formatLayout->addWidget(mFormatView);
     formatWidget->setLayout(formatLayout);
-    mTab->addTab(formatWidget, tr("Format"));
+    tabW->addTab(formatWidget, tr("Format"));
 
     QWidget *streamWidget = new QWidget;
     mStreamView = new SmTreeView;
@@ -48,16 +48,16 @@ FilePropertiesDialog::FilePropertiesDialog(const QString &file, QWidget *parent,
     QHBoxLayout *streamLayout = new QHBoxLayout;
     streamLayout->addWidget(mStreamView);
     streamWidget->setLayout(streamLayout);
-    mTab->addTab(streamWidget, tr("Streams"));
-    mStack->addWidget(mTab);
+    tabW->addTab(streamWidget, tr("Streams"));
+    stackW->addWidget(tabW);
 
     QTabWidget *mPicsTab = new QTabWidget;
     QWidget *picWidget = new QWidget;
-    mPicView = new SmTreeView;
+    SmTreeView *picView = new SmTreeView;
     mPicModel = new SmTreeModel(QStringList() << tr("Key") << tr("Value"), this);
-    mPicView->setModel(mPicModel);
+    picView->setModel(mPicModel);
     QHBoxLayout *picLayout = new QHBoxLayout;
-    picLayout->addWidget(mPicView);
+    picLayout->addWidget(picView);
     picWidget->setLayout(picLayout);
     mPicsTab->addTab(picWidget, tr("Picture data"));
 
@@ -68,24 +68,24 @@ FilePropertiesDialog::FilePropertiesDialog(const QString &file, QWidget *parent,
     archivedTab->setLayout(archivedL);
     mPicsTab->addTab(archivedTab, tr("Archive"));
 
-    mStack->addWidget(mPicsTab);
+    stackW->addWidget(mPicsTab);
 
-    mainLayout->addWidget(mStack);
-    mOk = new QPushButton(tr("Ok"));
-    connect(mOk, SIGNAL(clicked()), this, SLOT(accept()));
+    mainLayout->addWidget(stackW);
+    QPushButton *okBtn = new QPushButton(tr("Ok"));
+    connect(okBtn, &QPushButton::clicked, this, &FilePropertiesDialog::accept);
     QHBoxLayout *buttonLayout = new QHBoxLayout;
     buttonLayout->addStretch();
-    buttonLayout->addWidget(mOk);
+    buttonLayout->addWidget(okBtn);
     buttonLayout->addStretch();
     mainLayout->addLayout(buttonLayout);
     setLayout(mainLayout);
 
     QString mimeType = Helper::mimeType(mFile);
     if(mimeType.startsWith("video")){
-        mStack->setCurrentIndex(0);
+        stackW->setCurrentIndex(0);
         movieData();
     }else if(mimeType.startsWith("image")){
-        mStack->setCurrentIndex(1);
+        stackW->setCurrentIndex(1);
         pictureData();
     }
 }
diff --git a/filepropertiesdialog.h b/filepropertiesdialog.h
index 39683e5..903a599 100644
--- a/filepropertiesdialog.h
+++ b/filepropertiesdialog.h
@@ -10,12 +10,9 @@
 
 #include "smdialog.h"
 
-class QPushButton;
 class SmTreeView;
 class SmTreeItem;
 class SmTreeModel;
-class QTabWidget;
-class QStackedWidget;
 class QLabel;
 
 class FilePropertiesDialog : public SmDialog {
@@ -28,16 +25,11 @@ class FilePropertiesDialog : public SmDialog {
         void movieDataRecursive(QJsonValue start, SmTreeItem *appendTo);
         void pictureData();
         void appendItem(const QList<QVariant> &data, SmTreeItem *parent);
-        QTabWidget *mTab;
-        QTabWidget *mPicsTab;
-        QStackedWidget *mStack;
-        QPushButton *mOk;
         SmTreeModel *mFormatModel;
         SmTreeView *mFormatView;
         SmTreeModel *mStreamModel;
         SmTreeView *mStreamView;
         SmTreeModel *mPicModel;
-        SmTreeView *mPicView;
         QLabel *mArchivedAs;
         QString mFile;
 };