Raw -> Smart Pointers for musrWiz, qt5.

src/musredit_qt5/musrWiz/PMusrWiz.h

@@ -30,6 +30,8 @@
 #ifndef _PMUSRWIZ_
 #define _PMUSRWIZ_
 
+#include <memory>
+
 #include <QString>
 #include <QStringList>
 #include <QWizard>
@@ -204,14 +206,14 @@ class PIntroPage : public QWizardPage
     PAdmin *fAdmin;
     PMsrData *fMsrData;
 
-    QLineEdit *fMsrFileName;
-    QLineEdit *fYear;
-    QLineEdit *fRunNumber;
-    QComboBox *fInstitute;
-    QComboBox *fInstrument;
-    QComboBox *fFitType;
-    QComboBox *fMeasurementType;
-    QComboBox *fT0;
+    std::unique_ptr<QLineEdit> fMsrFileName;
+    std::unique_ptr<QLineEdit> fYear;
+    std::unique_ptr<QLineEdit> fRunNumber;
+    std::unique_ptr<QComboBox> fInstitute;
+    std::unique_ptr<QComboBox> fInstrument;
+    std::unique_ptr<QComboBox> fFitType;
+    std::unique_ptr<QComboBox> fMeasurementType;
+    std::unique_ptr<QComboBox> fT0;
 };
 
 //-------------------------------------------------------------------
@@ -246,12 +248,12 @@ class PTheoPage : public QWizardPage
     QVector<PParam> fMapList;
     QVector<int> fFunList;
 
-    QPlainTextEdit *fTheo;
-    QCheckBox *fEditTemplate;
-    QPushButton *fClearAll;
-    QComboBox *fTheoSelect;
-    QPushButton *fTheoAdd;
-    QPushButton *fCheckTheo;
+    std::unique_ptr<QPlainTextEdit> fTheo;
+    std::unique_ptr<QCheckBox> fEditTemplate;
+    std::unique_ptr<QPushButton> fClearAll;
+    std::unique_ptr<QComboBox> fTheoSelect;
+    std::unique_ptr<QPushButton> fTheoAdd;
+    std::unique_ptr<QPushButton> fCheckTheo;
 
     QString getTheoryFunction(int idx);
     bool analyzeTokens(QString str, int noOfTokens);
@@ -279,9 +281,8 @@ class PFuncPage : public QWizardPage
   private:
     PMsrData *fMsrData;
 
-    QFormLayout *fMapPageLayout;
-    QPlainTextEdit *fFunc;
-    QPushButton *fShowTheo;
+    std::unique_ptr<QPlainTextEdit> fFunc;
+    std::unique_ptr<QPushButton> fShowTheo;
 
     int getFuncNo(const QString str);
 };
@@ -304,9 +305,9 @@ class PMapPage : public QWizardPage
   private:
     PMsrData *fMsrData;
 
-    QFormLayout *fMapPageLayout;
+    std::unique_ptr<QFormLayout> fMapPageLayout;
     QVector<PParamGui> fMapGuiVec;
-    QPushButton *fShowTheo;
+    std::unique_ptr<QPushButton> fShowTheo;
 };
 
 //-------------------------------------------------------------------
@@ -327,9 +328,9 @@ class PParamPage : public QWizardPage
   private:
     PMsrData *fMsrData;
 
-    QFormLayout *fParameterPageLayout;
+    std::unique_ptr<QFormLayout> fParameterPageLayout;
     QVector<PParamGui> fParamGuiVec;
-    QPushButton *fShowTheo;
+    std::unique_ptr<QPushButton> fShowTheo;
 };
 
 //-------------------------------------------------------------------
@@ -347,10 +348,10 @@ class PFitInfoPage : public QWizardPage
   private:
     PMsrData *fMsrData;
 
-    QLineEdit *fFitRangeStart;
-    QLineEdit *fFitRangeEnd;
-    QLineEdit *fPacking;
-    QPlainTextEdit *fCommands;
+    std::unique_ptr<QLineEdit> fFitRangeStart;
+    std::unique_ptr<QLineEdit> fFitRangeEnd;
+    std::unique_ptr<QLineEdit> fPacking;
+    std::unique_ptr<QPlainTextEdit> fCommands;
 };
 
 //-------------------------------------------------------------------
@@ -370,10 +371,10 @@ class PConclusionPage : public QWizardPage
     PAdmin *fAdmin;
     PMsrData *fMsrData;
 
-    QLabel *fMsrPathFileLabel;
-    QLineEdit *fMsrFilePathLineEdit;
-    QPushButton *fSaveAsMsrFile;
-    QPushButton *fSaveAsTemplate;
+    std::unique_ptr<QLabel> fMsrPathFileLabel;
+    std::unique_ptr<QLineEdit> fMsrFilePathLineEdit;
+    std::unique_ptr<QPushButton> fSaveAsMsrFile;
+    std::unique_ptr<QPushButton> fSaveAsTemplate;
 };
 
 //-------------------------------------------------------------------
@@ -391,7 +392,6 @@ class PMusrWiz : public QWizard
   public:
     PMusrWiz(QWidget *parent=Q_NULLPTR);
     PMusrWiz(PAdmin *admin, PMsrData *msrData, QWidget *parent=Q_NULLPTR);
-    virtual ~PMusrWiz();
 
   private slots:
     virtual int writeMsrFile(int result);