Refs #3803. Fix warnings.

mantidproject · Feb 28, 2012 · 575c3f2 · 575c3f2
1 parent 0f66f22
commit 575c3f2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/Code/Mantid/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/FitPropertyBrowser.h b/Code/Mantid/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/FitPropertyBrowser.h
@@ -337,6 +337,9 @@ private slots:
   QtProperty *m_plotDiff;
   QtProperty *m_rawData;
 
+  /// A copy of the edited function
+  Mantid::API::CompositeFunction* m_compositeFunction;
+
   QtTreePropertyBrowser* m_browser;
 
   QAction* m_fitActionUndoFit;
@@ -375,9 +378,6 @@ private slots:
   /// To keep a copy of the initial parameters in case for undo fit
   std::vector<double> m_initialParameters;
 
-  /// A copy of the edited function
-  Mantid::API::CompositeFunction* m_compositeFunction;
-
 
 private:
   /// load and save function

diff --git a/Code/Mantid/MantidQt/MantidWidgets/src/FitPropertyBrowser.cpp b/Code/Mantid/MantidQt/MantidWidgets/src/FitPropertyBrowser.cpp
@@ -107,14 +107,14 @@ class FormulaDialogEditorFactory: public StringDialogEditorFactory
  */
 FitPropertyBrowser::FitPropertyBrowser(QWidget *parent, QObject* mantidui)
 :QDockWidget("Fit Function",parent),
-m_currentHandler(0),
 m_logValue(NULL),
 m_compositeFunction(0),
+m_changeSlotsEnabled(false),
+m_guessOutputName(true),
+m_currentHandler(0),
 m_defaultFunction("Gaussian"),
 m_defaultPeak("Gaussian"),
 m_defaultBackground("LinearBackground"),
-m_guessOutputName(true),
-m_changeSlotsEnabled(false),
 m_peakToolOn(false),
 m_auto_back(false),
 m_autoBgName(QString::fromStdString(Mantid::Kernel::ConfigService::Instance().getString("curvefitting.autoBackground"))),
@@ -2519,6 +2519,7 @@ void FitPropertyBrowser::manualAddWorkspace(const QString& wsName)
 */
 void FitPropertyBrowser::workspaceChange(const QString& wsName)
 {
+  UNUSED_ARG(wsName);
   if (m_guessOutputName)
   {
     if (isWorkspaceAGroup())