From dbcdbe9cad3fc766eae9288530adcfe78e7cc32e Mon Sep 17 00:00:00 2001
From: Arturs Bekasovs <arturs.bekasovs@stfc.ac.uk>
Date: Thu, 17 Oct 2013 14:40:54 +0100
Subject: [PATCH] Fix build errors because of not included file.
Plus improve code layout.
Refs #7557
---
.../IO_MuonGrouping.h | 35 ++++++++++---------
1 file changed, 18 insertions(+), 17 deletions(-)
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IO_MuonGrouping.h b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IO_MuonGrouping.h
index f4bf9de812a..2ab1b8280fb 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IO_MuonGrouping.h
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IO_MuonGrouping.h
@@ -5,8 +5,9 @@
// Includes
//----------------------
#include "ui_MuonAnalysis.h"
-#include "MantidQtCustomInterfaces/MuonAnalysis.h"
#include "MantidQtAPI/UserSubWindow.h"
+#include "MantidQtCustomInterfaces/MuonAnalysis.h"
+#include "MantidQtCustomInterfaces/DllConfig.h"
#include "MantidQtMantidWidgets/pythonCalc.h"
#include "MantidQtMantidWidgets/MWRunFiles.h"
@@ -68,36 +69,36 @@ typedef struct {
} Grouping;
/// Saves grouping to the XML file specified
-void MANTIDQT_CUSTOMINTERFACES_DLL
- saveGroupingToXML(const Grouping& grouping, const std::string& filename);
+void MANTIDQT_CUSTOMINTERFACES_DLL saveGroupingToXML(const Grouping& grouping,
+ const std::string& filename);
/// Loads grouping from the XML file specified
-void MANTIDQT_CUSTOMINTERFACES_DLL
- loadGroupingFromXML(const std::string& filename, Grouping& grouping);
+void MANTIDQT_CUSTOMINTERFACES_DLL loadGroupingFromXML(const std::string& filename,
+ Grouping& grouping);
/// Parses information from the grouping table and saves to Grouping struct
-void MANTIDQT_CUSTOMINTERFACES_DLL
- parseGroupingTable(const Ui::MuonAnalysis& form, Grouping& grouping);
+void MANTIDQT_CUSTOMINTERFACES_DLL parseGroupingTable(const Ui::MuonAnalysis& form,
+ Grouping& grouping);
/// Fills in the grouping table using information from provided Grouping struct
-void MANTIDQT_CUSTOMINTERFACES_DLL
- fillGroupingTable(const Grouping& grouping, Ui::MuonAnalysis& form);
+void MANTIDQT_CUSTOMINTERFACES_DLL fillGroupingTable(const Grouping& grouping,
+ Ui::MuonAnalysis& form);
/// Groups the workspace according to grouping provided
-MatrixWorkspace_sptr MANTIDQT_CUSTOMINTERFACES_DLL
- groupWorkspace(MatrixWorkspace_const_sptr ws, const Grouping& g);
+MatrixWorkspace_sptr MANTIDQT_CUSTOMINTERFACES_DLL groupWorkspace(MatrixWorkspace_const_sptr ws,
+ const Grouping& g);
/// create 'map' relating group number to row number in group table
-void MANTIDQT_CUSTOMINTERFACES_DLL
- whichGroupToWhichRow(const Ui::MuonAnalysis& m_uiForm, std::vector<int>& groupToRow);
+void MANTIDQT_CUSTOMINTERFACES_DLL whichGroupToWhichRow(const Ui::MuonAnalysis& m_uiForm,
+ std::vector<int>& groupToRow);
/// create 'map' relating pair number to row number in pair table
-void MANTIDQT_CUSTOMINTERFACES_DLL
- whichPairToWhichRow(const Ui::MuonAnalysis& m_uiForm, std::vector<int>& pairToRow);
+void MANTIDQT_CUSTOMINTERFACES_DLL whichPairToWhichRow(const Ui::MuonAnalysis& m_uiForm,
+ std::vector<int>& pairToRow);
/// Set Group / Group Pair name
-void MANTIDQT_CUSTOMINTERFACES_DLL
- setGroupGroupPair(Ui::MuonAnalysis& m_uiForm, const std::string& name);
+void MANTIDQT_CUSTOMINTERFACES_DLL setGroupGroupPair(Ui::MuonAnalysis& m_uiForm,
+ const std::string& name);
}
}
--
GitLab