Skip to content
Snippets Groups Projects
Commit fc3d1c57 authored by Federico Montesino Pouzols's avatar Federico Montesino Pouzols
Browse files

sort lib Poco headers, remove/un-include unused ones, re #10637

parent 814bb298
No related merge requests found
Showing
with 69 additions and 78 deletions
...@@ -2,26 +2,23 @@ ...@@ -2,26 +2,23 @@
// Includes // Includes
//---------------------------------------------------------------------- //----------------------------------------------------------------------
#include <fstream> #include <fstream>
#include "MantidAlgorithms/ReadGroupsFromFile.h" #include "MantidAlgorithms/ReadGroupsFromFile.h"
#include "MantidAPI/FileProperty.h" #include "MantidAPI/FileProperty.h"
#include "MantidAPI/InstrumentDataService.h" #include "MantidAPI/InstrumentDataService.h"
#include "MantidAPI/MatrixWorkspace.h" #include "MantidAPI/MatrixWorkspace.h"
#include "MantidAPI/WorkspaceProperty.h" #include "MantidAPI/WorkspaceProperty.h"
#include "MantidAPI/WorkspaceValidators.h"
#include "MantidDataObjects/Workspace2D.h" #include "MantidDataObjects/Workspace2D.h"
#include "MantidKernel/ConfigService.h" #include "MantidKernel/ConfigService.h"
#include "MantidKernel/ListValidator.h"
#include "MantidKernel/System.h" #include "MantidKernel/System.h"
// Poco XML Headers for Grouping File // Poco XML Headers for Grouping File
#include <Poco/DOM/Document.h> #include <Poco/DOM/Document.h>
#include <Poco/DOM/DOMParser.h> #include <Poco/DOM/DOMParser.h>
#include <Poco/DOM/Element.h> #include <Poco/DOM/Element.h>
#include <Poco/DOM/NodeFilter.h>
#include <Poco/DOM/NodeIterator.h>
#include <Poco/DOM/NodeList.h> #include <Poco/DOM/NodeList.h>
#include <Poco/File.h>
#include <Poco/Path.h>
#include "MantidAPI/WorkspaceValidators.h"
#include "MantidKernel/ListValidator.h"
using namespace Mantid::API; using namespace Mantid::API;
using namespace Mantid::Kernel; using namespace Mantid::Kernel;
......
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
#include "MantidAPI/FileProperty.h" #include "MantidAPI/FileProperty.h"
#include "MantidKernel/BoundedValidator.h" #include "MantidKernel/BoundedValidator.h"
#include "Poco/DOM/Document.h" #include <Poco/DOM/AutoPtr.h>
#include "Poco/DOM/Element.h" #include <Poco/DOM/Document.h>
#include "Poco/DOM/Text.h" #include <Poco/DOM/DOMWriter.h>
#include "Poco/DOM/AutoPtr.h" #include <Poco/DOM/Element.h>
#include "Poco/DOM/DOMWriter.h" #include <Poco/DOM/Text.h>
#ifdef _MSC_VER #ifdef _MSC_VER
// Disable a flood of warnings from Poco about inheriting from // Disable a flood of warnings from Poco about inheriting from
......
...@@ -10,13 +10,12 @@ ...@@ -10,13 +10,12 @@
#include "MantidKernel/ConfigService.h" #include "MantidKernel/ConfigService.h"
#include "MantidDataObjects/Workspace2D.h" #include "MantidDataObjects/Workspace2D.h"
#include <Poco/Path.h> #include <Poco/AutoPtr.h>
#include <Poco/DOM/DOMParser.h>
#include <Poco/DOM/Document.h> #include <Poco/DOM/Document.h>
#include <Poco/DOM/DOMParser.h>
#include <Poco/DOM/NodeList.h> #include <Poco/DOM/NodeList.h>
#include <Poco/DOM/Text.h>
#include <Poco/SAX/InputSource.h> #include <Poco/SAX/InputSource.h>
#include <Poco/DOM/AutoPtr.h>
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
...@@ -26,7 +25,6 @@ using Poco::XML::Document; ...@@ -26,7 +25,6 @@ using Poco::XML::Document;
using Poco::XML::Element; using Poco::XML::Element;
using Poco::XML::NodeList; using Poco::XML::NodeList;
using Poco::XML::Node; using Poco::XML::Node;
using Poco::XML::Text;
using namespace Mantid::Kernel; using namespace Mantid::Kernel;
using namespace Mantid::API; using namespace Mantid::API;
......
...@@ -10,11 +10,9 @@ ...@@ -10,11 +10,9 @@
#include "MantidKernel/ConfigService.h" #include "MantidKernel/ConfigService.h"
#include "MantidDataObjects/Workspace2D.h" #include "MantidDataObjects/Workspace2D.h"
#include <Poco/Path.h>
#include <Poco/DOM/DOMParser.h> #include <Poco/DOM/DOMParser.h>
#include <Poco/DOM/Document.h> #include <Poco/DOM/Document.h>
#include <Poco/DOM/NodeList.h> #include <Poco/DOM/NodeList.h>
#include <Poco/DOM/Text.h>
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
......
#include <sstream>
#include "MantidDataHandling/LoadDetectorsGroupingFile.h" #include "MantidDataHandling/LoadDetectorsGroupingFile.h"
#include "MantidKernel/System.h" #include "MantidKernel/System.h"
#include "MantidAPI/FileProperty.h" #include "MantidAPI/FileProperty.h"
...@@ -17,12 +19,9 @@ ...@@ -17,12 +19,9 @@
#include <Poco/DOM/NodeList.h> #include <Poco/DOM/NodeList.h>
#include <Poco/DOM/NamedNodeMap.h> #include <Poco/DOM/NamedNodeMap.h>
#include <Poco/Exception.h> #include <Poco/Exception.h>
#include <Poco/File.h>
#include <Poco/Path.h> #include <Poco/Path.h>
#include <Poco/String.h> #include <Poco/String.h>
#include <sstream>
using namespace Mantid::Kernel; using namespace Mantid::Kernel;
using namespace Mantid::API; using namespace Mantid::API;
...@@ -609,7 +608,7 @@ std::string LoadGroupXMLFile::getAttributeValueByName(Poco::XML::Node *pNode, ...@@ -609,7 +608,7 @@ std::string LoadGroupXMLFile::getAttributeValueByName(Poco::XML::Node *pNode,
std::string attributename, std::string attributename,
bool &found) { bool &found) {
// 1. Init // 1. Init
Poco::XML::NamedNodeMap *att = pNode->attributes(); Poco::AutoPtr<Poco::XML::NamedNodeMap> att = pNode->attributes();
found = false; found = false;
std::string value = ""; std::string value = "";
......
#include <cmath>
#include <cstdlib>
#include <fstream>
#include <iostream>
#include <iterator>
#include "MantidDataHandling/LoadPreNexusMonitors.h" #include "MantidDataHandling/LoadPreNexusMonitors.h"
#include "MantidAPI/FileProperty.h" #include "MantidAPI/FileProperty.h"
#include "MantidKernel/ConfigService.h" #include "MantidKernel/ConfigService.h"
#include "MantidKernel/UnitFactory.h" #include "MantidKernel/UnitFactory.h"
#include "MantidKernel/BinaryFile.h" #include "MantidKernel/BinaryFile.h"
#include <Poco/Path.h> #include <boost/lexical_cast.hpp>
#include <Poco/File.h> #include <boost/shared_array.hpp>
#include <Poco/DOM/AutoPtr.h>
#include <Poco/DOM/DOMParser.h> #include <Poco/DOM/DOMParser.h>
#include <Poco/DOM/Document.h> #include <Poco/DOM/Document.h>
#include <Poco/DOM/Element.h> #include <Poco/DOM/Element.h>
#include <Poco/DOM/NodeIterator.h> #include <Poco/DOM/NodeIterator.h>
#include <Poco/DOM/NodeFilter.h> #include <Poco/DOM/NodeFilter.h>
#include <Poco/DOM/NodeList.h> #include <Poco/DOM/NodeList.h>
#include <Poco/DOM/AutoPtr.h> #include <Poco/Path.h>
#include <Poco/SAX/InputSource.h> #include <Poco/SAX/InputSource.h>
#include <boost/lexical_cast.hpp>
#include <boost/shared_array.hpp>
#include <fstream>
#include <cmath>
#include <iostream>
#include <cstdlib>
#include <iterator>
namespace Mantid { namespace Mantid {
namespace DataHandling { namespace DataHandling {
......
#include <algorithm>
#include <fstream>
#include "MantidDataHandling/LoadSpiceXML2DDet.h" #include "MantidDataHandling/LoadSpiceXML2DDet.h"
#include "MantidAPI/FileProperty.h" #include "MantidAPI/FileProperty.h"
#include "MantidAPI/WorkspaceProperty.h" #include "MantidAPI/WorkspaceProperty.h"
#include "MantidAPI/WorkspaceFactory.h" #include "MantidAPI/WorkspaceFactory.h"
#include "MantidKernel/ArrayProperty.h" #include "MantidKernel/ArrayProperty.h"
#include "Poco/SAX/InputSource.h"
#include "Poco/DOM/Document.h"
#include "Poco/DOM/DOMParser.h"
#include "Poco/DOM/AutoPtr.h"
#include "Poco/DOM/NodeIterator.h"
#include "Poco/DOM/NodeFilter.h"
#include "Poco/DOM/Node.h"
#include "Poco/DOM/NodeList.h"
#include "Poco/DOM/NamedNodeMap.h"
#include <algorithm>
#include <fstream>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#include <Poco/DOM/AutoPtr.h>
#include <Poco/DOM/Document.h>
#include <Poco/DOM/DOMParser.h>
#include <Poco/DOM/NamedNodeMap.h>
#include <Poco/DOM/Node.h>
#include <Poco/DOM/NodeFilter.h>
#include <Poco/DOM/NodeIterator.h>
#include <Poco/DOM/NodeList.h>
#include <Poco/SAX/InputSource.h>
namespace Mantid { namespace Mantid {
namespace DataHandling { namespace DataHandling {
......
//---------------------------------------------------------------------- //----------------------------------------------------------------------
// Includes // Includes
//---------------------------------------------------------------------- //----------------------------------------------------------------------
#include <iostream>
#include <sstream>
#include "MantidKernel/Logger.h" #include "MantidKernel/Logger.h"
#include "MantidKernel/InternetHelper.h" #include "MantidKernel/InternetHelper.h"
#include "MantidKernel/Exception.h" #include "MantidKernel/Exception.h"
#include "MantidDataHandling/SNSDataArchive.h" #include "MantidDataHandling/SNSDataArchive.h"
#include "MantidAPI/ArchiveSearchFactory.h" #include "MantidAPI/ArchiveSearchFactory.h"
#include <Poco/File.h>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#include <boost/algorithm/string/predicate.hpp>
#include <Poco/AutoPtr.h>
#include <Poco/DOM/DOMParser.h> #include <Poco/DOM/DOMParser.h>
#include <Poco/DOM/Document.h> #include <Poco/DOM/Document.h>
#include <Poco/DOM/Element.h> #include <Poco/DOM/Element.h>
#include "Poco/SAX/InputSource.h" #include <Poco/SAX/InputSource.h>
#include <Poco/DOM/NodeList.h> #include <Poco/DOM/NodeList.h>
#include <Poco/DOM/NodeIterator.h>
#include <boost/algorithm/string/predicate.hpp>
#include "Poco/DOM/AutoPtr.h"
#include <iostream>
#include <sstream>
namespace Mantid { namespace Mantid {
......
#include "MantidDataHandling/SaveDetectorsGrouping.h" #include <algorithm>
#include "MantidKernel/System.h" #include <fstream>
#include <sstream>
#include "MantidAPI/FileProperty.h" #include "MantidAPI/FileProperty.h"
#include "MantidAPI/ISpectrum.h" #include "MantidAPI/ISpectrum.h"
#include "MantidDataHandling/SaveDetectorsGrouping.h"
#include "MantidKernel/System.h"
#include "fstream" #include <Poco/DOM/AutoPtr.h>
#include "sstream" #include <Poco/DOM/Document.h>
#include "algorithm" #include <Poco/DOM/DOMWriter.h>
#include <Poco/DOM/Element.h>
#include <Poco/DOM/Text.h>
#include "Poco/DOM/Document.h"
#include "Poco/DOM/Element.h"
#include "Poco/DOM/Text.h"
#include "Poco/DOM/AutoPtr.h"
#include "Poco/DOM/DOMWriter.h"
#ifdef _MSC_VER #ifdef _MSC_VER
// Disable a flood of warnings from Poco about inheriting from // Disable a flood of warnings from Poco about inheriting from
// std::basic_istream // std::basic_istream
......
#include "MantidDataHandling/SaveMask.h" #include <fstream>
#include "MantidKernel/System.h" #include <sstream>
#include "MantidDataObjects/SpecialWorkspace2D.h" #include <algorithm>
#include "MantidAPI/FileProperty.h" #include "MantidAPI/FileProperty.h"
#include "MantidAPI/ISpectrum.h" #include "MantidAPI/ISpectrum.h"
#include "MantidDataHandling/SaveMask.h"
#include "fstream" #include "MantidDataObjects/SpecialWorkspace2D.h"
#include "sstream" #include "MantidKernel/System.h"
#include "algorithm"
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include "Poco/DOM/Document.h"
#include "Poco/DOM/Element.h" #include <Poco/DOM/Document.h>
#include "Poco/DOM/Text.h" #include <Poco/DOM/Element.h>
#include "Poco/DOM/AutoPtr.h" #include <Poco/DOM/Text.h>
#include "Poco/DOM/DOMWriter.h" #include <Poco/DOM/AutoPtr.h>
#include <Poco/DOM/DOMWriter.h>
#ifdef _MSC_VER #ifdef _MSC_VER
// Disable a flood of warnings from Poco about inheriting from // Disable a flood of warnings from Poco about inheriting from
// std::basic_istream // std::basic_istream
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment