diff --git a/src/musrgui/PAdmin.cpp b/src/musrgui/PAdmin.cpp index 4a5e3d59..8970a3ac 100644 --- a/src/musrgui/PAdmin.cpp +++ b/src/musrgui/PAdmin.cpp @@ -159,6 +159,7 @@ bool PAdminXMLParser::characters(const QString& str) else flag = false; fAdmin->setLifetimeCorrectionFlag(flag); + break; case eMsrDefaultFilePath: fAdmin->setMsrDefaultFilePath(QString(str.ascii()).stripWhiteSpace()); break; @@ -224,6 +225,7 @@ PAdmin::PAdmin() { fExecPath = QString(""); fDefaultSavePath = QString(""); + fMsrDefaultFilePath = QString(""); fTheoFuncPixmapPath = QString(""); fBeamline = QString(""); diff --git a/src/musrgui/PAdmin.h b/src/musrgui/PAdmin.h index 86bcb10a..e4d7f7b9 100644 --- a/src/musrgui/PAdmin.h +++ b/src/musrgui/PAdmin.h @@ -111,6 +111,7 @@ class PAdmin QString fExecPath; QString fDefaultSavePath; + QString fMsrDefaultFilePath; QString fTheoFuncPixmapPath; QString fBeamline; @@ -118,8 +119,6 @@ class PAdmin QString fFileFormat; bool fLifetimeCorrection; - QString fMsrDefaultFilePath; - QString fHelpMain; QValueVector fTheory; diff --git a/src/musrgui/PGetAsymmetryRunBlockDialog.cpp b/src/musrgui/PGetAsymmetryRunBlockDialog.cpp index 04ac738e..fe9b028c 100644 --- a/src/musrgui/PGetAsymmetryRunBlockDialog.cpp +++ b/src/musrgui/PGetAsymmetryRunBlockDialog.cpp @@ -42,8 +42,8 @@ */ PGetAsymmetryRunBlockDialog::PGetAsymmetryRunBlockDialog(const QString help, QWidget *parent, const char *name, bool modal, WFlags f) : - fHelp(help), - PGetAsymmetryRunBlockDialogBase(parent, name, modal, f) + PGetAsymmetryRunBlockDialogBase(parent, name, modal, f), + fHelp(help) { fForward_lineEdit->setValidator( new QIntValidator(fForward_lineEdit) ); fBackward_lineEdit->setValidator( new QIntValidator(fBackward_lineEdit) ); diff --git a/src/musrgui/PTextEdit.cpp b/src/musrgui/PTextEdit.cpp index fa98448c..15f00fa3 100644 --- a/src/musrgui/PTextEdit.cpp +++ b/src/musrgui/PTextEdit.cpp @@ -248,8 +248,8 @@ void PTextEdit::setupMusrActions() menuBar()->insertItem( tr( "&MusrFit" ), menu ); QAction *a; - a = new QAction( QPixmap::fromMimeSource( "musrasym.xpm" ), tr( "&Asymetry Default" ), ALT + Key_A, this, "musrGetAsymetryDefault" ); - connect( a, SIGNAL( activated() ), this, SLOT( musrGetAsymetryDefault() ) ); + a = new QAction( QPixmap::fromMimeSource( "musrasym.xpm" ), tr( "&Asymmetry Default" ), ALT + Key_A, this, "musrGetAsymmetryDefault" ); + connect( a, SIGNAL( activated() ), this, SLOT( musrGetAsymmetryDefault() ) ); a->addTo( tb ); a->addTo( menu ); @@ -659,7 +659,7 @@ void PTextEdit::textSize( const QString &p ) /** *

*/ -void PTextEdit::musrGetAsymetryDefault() +void PTextEdit::musrGetAsymmetryDefault() { QString runFileName, beamline, institute, fileFormat; diff --git a/src/musrgui/PTextEdit.h b/src/musrgui/PTextEdit.h index fc5805cb..9b572339 100644 --- a/src/musrgui/PTextEdit.h +++ b/src/musrgui/PTextEdit.h @@ -80,7 +80,7 @@ private slots: void textFamily( const QString &f ); void textSize( const QString &p ); - void musrGetAsymetryDefault(); + void musrGetAsymmetryDefault(); void musrGetSingleHistoDefault(); void musrCalcChisq(); void musrFit();