From c31f177f9e4007f30a7df6d834172336b98dda50 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Mon, 1 Jun 2015 09:55:15 +0100
Subject: [PATCH] fix a couple of doxygen warnings in master
---
.../Framework/MDAlgorithms/src/Integrate3DEvents.cpp | 3 ++-
.../BackgroundRgbProvider.h | 9 +++++++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/Integrate3DEvents.cpp b/Code/Mantid/Framework/MDAlgorithms/src/Integrate3DEvents.cpp
index 57c34fdac6b..9b316b490e3 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/Integrate3DEvents.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/Integrate3DEvents.cpp
@@ -418,7 +418,8 @@ void Integrate3DEvents::addEvent(std::pair<double, V3D> event_Q, bool hkl_integ)
*
*/
PeakShapeEllipsoid_const_sptr Integrate3DEvents::ellipseIntegrateEvents(
- std::vector<std::pair<double, V3D> > const &ev_list, std::vector<V3D> const &directions,
+ std::vector<std::pair<double, Mantid::Kernel::V3D> > const &ev_list,
+ std::vector<Mantid::Kernel::V3D> const &directions,
std::vector<double> const &sigmas, bool specify_size, double peak_radius,
double back_inner_radius, double back_outer_radius,
std::vector<double> &axes_radii, double &inti, double &sigi) {
diff --git a/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/inc/MantidVatesSimpleGuiViewWidgets/BackgroundRgbProvider.h b/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/inc/MantidVatesSimpleGuiViewWidgets/BackgroundRgbProvider.h
index 57a4bc2791f..228e3283a23 100644
--- a/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/inc/MantidVatesSimpleGuiViewWidgets/BackgroundRgbProvider.h
+++ b/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/inc/MantidVatesSimpleGuiViewWidgets/BackgroundRgbProvider.h
@@ -94,9 +94,14 @@ namespace Mantid
/**
* Callback function for background color changing events
- *@param caller Calling object.
+ * @param caller Calling object.
+ *
+ * @param eventID vtkCommand event ID for callbacks, not used here
+ * @param clientData vtk client data, not used here
+ * @param callData vtk call data, not used here
*/
- static void backgroundColorChangeCallbackFunction(vtkObject* caller, long unsigned int, void*, void*);
+ static void backgroundColorChangeCallbackFunction(vtkObject* caller, long unsigned int eventID,
+ void *clientData, void *callData);
static QColor currentBackgroundColor;
--
GitLab