move on to modernize towards modern c++.

src/musredit_qt5/mupp/PmuppScript.h

@@ -38,11 +38,11 @@
 #include "PVarHandler.h"
 
 //----------------------------------------------------------------------------
-typedef struct {
+struct PmuppPlotEntry {
   int collIdx; ///< collection index
   QString xLabel; ///< x-axis label
   QVector<QString> yLabel; ///< y-axis label(s)
-} PmuppPlotEntry;
+};
 
 //----------------------------------------------------------------------------
 /**

src/musredit_qt5/mupp/plotter/PMuppCanvas.h

@@ -50,20 +50,20 @@
 #define P_MENU_ID_ABOUT  10002
 
 //--------------------------------------------------------------------------
-typedef struct {
+struct PDataPoint {
   Double_t y;
   Double_t eYpos;
   Double_t eYneg;
-} PDataPoint;
+};
 
 //--------------------------------------------------------------------------
-typedef struct {
+struct PDataCollection {
   TString name; // collection name
   TString xLabel;
   PStringVector yLabel;
   PDoubleVector xValue;
   std::vector< std::vector<PDataPoint> > yValue;
-} PDataCollection;
+};
 
 //--------------------------------------------------------------------------
 class PMuppCanvas : public TObject, public  TQObject

src/musredit_qt5/musrStep/PMusrStep.h

@@ -38,7 +38,7 @@
 #include <QLabel>
 #include <QCheckBox>
 
-typedef struct {
+struct PParam {
   QString number;
   QString name;
   QString value;
@@ -46,7 +46,7 @@ typedef struct {
   QString posErr;
   QString boundLow;
   QString boundHigh;
-} PParam;
+};
 
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 class PModSelect : public QDialog

src/musredit_qt5/musrWiz/PMusrWiz.h

@@ -70,13 +70,13 @@
 #define T0_ENTER_WIZ    2
 
 //-------------------------------------------------------------------
-typedef struct {
+struct PParamGui {
   QLineEdit *paramName;
   QLineEdit *paramVal;
   QLineEdit *paramStep;
   QLineEdit *paramBoundLow;
   QLineEdit *paramBoundHigh;
-} PParamGui;
+};
 
 //-------------------------------------------------------------------
 class PMsrData
@@ -192,7 +192,7 @@ class PIntroPage : public QWizardPage
     PIntroPage(PAdmin *admin, PMsrData *data, QWidget *parent=0);
 
     int nextId() const Q_DECL_OVERRIDE;
-    bool validatePage();
+    bool validatePage() override;
 
   private slots:
     void handleInstituteChanged(int idx);
@@ -223,8 +223,8 @@ class PTheoPage : public QWizardPage
     PTheoPage(PAdmin *admin, PMsrData *data, QWidget *parent=0);
 
     int nextId() const Q_DECL_OVERRIDE;
-    void initializePage();
-    bool validatePage();
+    void initializePage() override;
+    bool validatePage() override;
 
   private slots:
     void templateState(int);
@@ -269,9 +269,9 @@ class PFuncPage : public QWizardPage
     PFuncPage(PMsrData *data, QWidget *parent=0);
 
     int nextId() const Q_DECL_OVERRIDE;
-    void initializePage();
-    void cleanupPage();
-    bool validatePage();
+    void initializePage() override;
+    void cleanupPage() override;
+    bool validatePage() override;
 
   private slots:
     void showTheo();
@@ -295,8 +295,8 @@ class PMapPage : public QWizardPage
     PMapPage(PMsrData *data, QWidget *parent=0);
 
     int nextId() const Q_DECL_OVERRIDE;
-    void initializePage();
-    bool validatePage();
+    void initializePage() override;
+    bool validatePage() override;
 
   private slots:
     void showTheo();
@@ -318,8 +318,8 @@ class PParamPage : public QWizardPage
     PParamPage(PMsrData *data, QWidget *parent=0);
 
     int nextId() const Q_DECL_OVERRIDE;
-    void initializePage();
-    bool validatePage();
+    void initializePage() override;
+    bool validatePage() override;
 
   private slots:
     void showTheo();
@@ -341,8 +341,8 @@ class PFitInfoPage : public QWizardPage
     PFitInfoPage(PMsrData *data, QWidget *parent=0);
 
     int nextId() const Q_DECL_OVERRIDE;
-    void initializePage();
-    bool validatePage();
+    void initializePage() override;
+    bool validatePage() override;
 
   private:
     PMsrData *fMsrData;

src/musredit_qt5/musrWiz/musrWiz.h

@@ -67,9 +67,9 @@ class PParam {
 };
 
 //-------------------------------------------------------------------
-typedef struct {
+struct PFunc {
   int number;
   QString fun;
-} PFunc;
+};
 
 #endif // _MUSRWIZ_H_

src/musredit_qt5/musredit/PAdmin.h

@@ -45,14 +45,14 @@ class PAdmin;
  * <p>This structure is keeping informations necessary to handle musrfit
  * theory functions (see also <code>http://lmu.web.psi.ch/musrfit/user/html/user-manual.html#the-theory-block</code>).
  */
-typedef struct {
+struct PTheory {
   QString name;
   QString comment;
   QString label;
   QString pixmapName;
   QPixmap pixmap;
   int     params;
-} PTheory;
+};
 
 //---------------------------------------------------------------------------
 /**

src/musredit_qt5/musredit/musredit.h

@@ -40,7 +40,7 @@
  * parameters to handle <code>msr2data</code>. For a detailed description of the meaning of these
  * parameters see <code>msr2data --help</code> and the online documentation.
  */
-typedef struct {
+struct PMsr2DataParam {
   QString runList;             ///< list of run numbers (usage 3 of msr2data)
   QString runListFileName;     ///< run list filename (usage 4 of msr2data)
   QString msrFileExtension;    ///< msr filename extension, e.g. '0100_h13.msr' -> '_h13'
@@ -61,13 +61,13 @@ typedef struct {
   bool fitOnly;                ///< flag: true = just perform the fits wihtout generating any msr-files ('fit' in msr2data).
   bool global;                 ///< flag: true = 'global' option
   bool globalPlus;             ///< flag: true = 'global+' option
-} PMsr2DataParam;
+};
 
 //-------------------------------------------------------------------------------------------------
 /**
  * This structure is used to handle find (and replace) within <code>musredit</code> properly.
  */
-typedef struct {
+struct PFindReplaceData {
   QString findText;     ///< text to be found
   QString replaceText;  ///< replacement string
   bool caseSensitive;   ///< true = case sensitive
@@ -76,6 +76,6 @@ typedef struct {
   bool findBackwards;   ///< true = reversed search
   bool selectedText;    ///< true = handle only the selected text
   bool promptOnReplace; ///< true = request on OK from the user before performing the replace action
-} PFindReplaceData;
+};
 
 #endif // _MUSREDIT_H_