fix doxygen, cppcheck suppress and win / rhel6 issues, re #11829

mantidproject · May 28, 2015 · 54e0917 · 54e0917
1 parent 1015c9a
commit 54e0917
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 21 deletions.
diff --git a/Code/Mantid/Framework/Algorithms/src/FitPeak.cpp b/Code/Mantid/Framework/Algorithms/src/FitPeak.cpp
@@ -38,10 +38,11 @@ namespace Algorithms {
 /** Constructor for FitOneSinglePeak
   */
 FitOneSinglePeak::FitOneSinglePeak()
-    : m_fitMethodSet(false), m_peakRangeSet(false), m_peakWidthSet(false),
-      m_peakWindowSet(false), m_usePeakPositionTolerance(false), m_peakFunc(),
-      m_bkgdFunc(0), m_dataWS(), m_wsIndex(0), m_minFitX(0.), m_maxFitX(0.),
-      i_minFitX(0), i_maxFitX(0), m_minPeakX(0.), m_maxPeakX(0.), i_minPeakX(0),
+    : API::Algorithm(), m_fitMethodSet(false), m_peakRangeSet(false),
+      m_peakWidthSet(false), m_peakWindowSet(false),
+      m_usePeakPositionTolerance(false), m_peakFunc(), m_bkgdFunc(),
+      m_dataWS(), m_wsIndex(0), m_minFitX(0.), m_maxFitX(0.), i_minFitX(0),
+      i_maxFitX(0), m_minPeakX(0.), m_maxPeakX(0.), i_minPeakX(0),
       i_maxPeakX(0), m_bestPeakFunc(), m_bestBkgdFunc(), m_bkupPeakFunc(),
       m_bkupBkgdFunc(), m_fitErrorPeakFunc(), m_fitErrorBkgdFunc(),
       m_minimizer("Levenberg-MarquardtMD"), m_costFunction(), m_vecFWHM(),

diff --git a/Code/Mantid/Framework/Crystal/src/IntegratePeakTimeSlices.cpp b/Code/Mantid/Framework/Crystal/src/IntegratePeakTimeSlices.cpp
@@ -831,17 +831,17 @@ int IntegratePeakTimeSlices::CalculateTimeChannelSpan(
  * close to the peak
  *
  * @param center  The position of the center of this plane
- * @param m_xvec    The direction the column values increase
- * @param m_yvec    The direction the row values increase
+ * @param xvec    The direction the column values increase
+ * @param yvec    The direction the row values increase
  * @param ROW     The row for this peak( 0 if undefined)
  * @param COL     The col for this peak( 0 if undefined)
- * @param m_NROWS   The number? of rows for this bANK
+ * @param NROWS   The number? of rows for this bANK
  * @param NCOLS    The number of columns for this bank
  * @param pixWidthx   The width of a pixel
  * @param pixHeighty  The height of a pixel
  * @param peak
  */
-void IntegratePeakTimeSlices::FindPlane(V3D &center, V3D &m_xvec, V3D &m_yvec,
+void IntegratePeakTimeSlices::FindPlane(V3D &center, V3D &xvec, V3D &yvec,
                                         double &ROW, double &COL, int &NROWS,
                                         int &NCOLS, double &pixWidthx,
                                         double &pixHeighty,
@@ -871,12 +871,12 @@ void IntegratePeakTimeSlices::FindPlane(V3D &center, V3D &m_xvec, V3D &m_yvec,
   Qt.rotate(xaxis0);
   xaxis0.normalize();
 
-  m_xvec.setX(xaxis0.X());
-  m_xvec.setY(xaxis0.Y());
-  m_xvec.setZ(xaxis0.Z());
-  m_yvec.setX(yaxis0.X());
-  m_yvec.setY(yaxis0.Y());
-  m_yvec.setZ(yaxis0.Z());
+  xvec.setX(xaxis0.X());
+  xvec.setY(xaxis0.Y());
+  xvec.setZ(xaxis0.Z());
+  yvec.setX(yaxis0.X());
+  yvec.setY(yaxis0.Y());
+  yvec.setZ(yaxis0.Z());
   ROW = peak.getRow();
   COL = peak.getCol();
   Geometry::Instrument_const_sptr inst = peak.getInstrument();
@@ -900,7 +900,7 @@ void IntegratePeakTimeSlices::FindPlane(V3D &center, V3D &m_xvec, V3D &m_yvec,
 
     return;
   }
-  // Get m_NROWS and NCOLS for other panels
+  // Get NROWS and NCOLS for other panels
   NROWS = NCOLS = -1;
 
   if (!inst)

diff --git a/Code/Mantid/Framework/CurveFitting/src/Fit1D.cpp b/Code/Mantid/Framework/CurveFitting/src/Fit1D.cpp
@@ -32,11 +32,7 @@ using API::Progress;
 using API::Jacobian;
 
 /// The implementation of Jacobian
-// cppcheck-suppress noConstructor
 class JacobianImpl : public Jacobian {
-  /// The pointer to the GSL's internal jacobian matrix
-  gsl_matrix *m_J;
-
 public:
 
   /// Default constructor
@@ -68,6 +64,10 @@ class JacobianImpl : public Jacobian {
   }
   /// Set the pointer to the GSL's jacobian
   void setJ(gsl_matrix *J) { m_J = J; }
+
+private:
+  /// The pointer to the GSL's internal jacobian matrix
+  gsl_matrix *m_J;
 };
 
 /// Structure to contain least squares data and used by GSL

diff --git a/Code/Mantid/Framework/Kernel/src/DateValidator.cpp b/Code/Mantid/Framework/Kernel/src/DateValidator.cpp
@@ -77,7 +77,6 @@ struct tm getTimeValue(const std::string &sDate, std::string &error) {
   }
 
   timeinfo.tm_year = year - 1900;
-  timeinfo.tm_gmtoff = 0;
 
   return timeinfo;
 }

diff --git a/Code/Mantid/Framework/MDAlgorithms/src/MergeMDFiles.cpp b/Code/Mantid/Framework/MDAlgorithms/src/MergeMDFiles.cpp
@@ -318,7 +318,7 @@ void MergeMDFiles::finalizeOutput(const std::string &outputFile) {
     // its dimensions
     bool old_data_there;
     // clang-format off
-    boost::scoped_ptr<::NeXus::File> file(MDBoxFlatTree::createOrOpenMDWSgroup(
+    boost::scoped_ptr< ::NeXus::File> file(MDBoxFlatTree::createOrOpenMDWSgroup(
         outputFile, m_nDims, m_MDEventType, false, old_data_there));
     // clang-format on
     this->progress(0.94, "Saving ws history and dimensions");