Refs #9445. Removed using namespace directives from header files.

Following the example of #9483.
mantidproject · Jun 12, 2014 · 44076a4 · 44076a4
1 parent dcbed2b
commit 44076a4
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 53 deletions.
diff --git a/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/FunctionDomain1DSpectrumCreator.h b/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/FunctionDomain1DSpectrumCreator.h
@@ -42,19 +42,18 @@ namespace CurveFitting
     Code Documentation is available at: <http://doxygen.mantidproject.org>
 
   */
-using namespace API;
 
-class DLLExport FunctionDomain1DSpectrumCreator : public IDomainCreator
+class DLLExport FunctionDomain1DSpectrumCreator : public API::IDomainCreator
 {
 public:
     FunctionDomain1DSpectrumCreator();
     virtual ~FunctionDomain1DSpectrumCreator() { }
 
-    void setMatrixWorkspace(MatrixWorkspace_sptr matrixWorkspace);
+    void setMatrixWorkspace(API::MatrixWorkspace_sptr matrixWorkspace);
     void setWorkspaceIndex(size_t workspaceIndex);
 
-    virtual void createDomain(boost::shared_ptr<FunctionDomain> &domain,
-                         boost::shared_ptr<FunctionValues> &values,
+    virtual void createDomain(boost::shared_ptr<API::FunctionDomain> &domain,
+                         boost::shared_ptr<API::FunctionValues> &values,
                          size_t i0 = 0);
 
     virtual size_t getDomainSize() const;
@@ -65,7 +64,7 @@ class DLLExport FunctionDomain1DSpectrumCreator : public IDomainCreator
     MantidVec getVectorHistogram() const;
     MantidVec getVectorNonHistogram() const;
 
-    MatrixWorkspace_sptr m_matrixWorkspace;
+    API::MatrixWorkspace_sptr m_matrixWorkspace;
     size_t m_workspaceIndex;
     bool m_workspaceIndexIsSet;
 

diff --git a/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/SeqDomainSpectrumCreator.h b/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/SeqDomainSpectrumCreator.h
@@ -42,33 +42,31 @@ namespace CurveFitting
     Code Documentation is available at: <http://doxygen.mantidproject.org>
   */
 
-using namespace API;
-
-class DLLExport SeqDomainSpectrumCreator : public IDomainCreator
+class DLLExport SeqDomainSpectrumCreator : public API::IDomainCreator
 {
 public:
     SeqDomainSpectrumCreator(Kernel::IPropertyManager* manager,
                              const std::string& workspacePropertyName);
 
     virtual ~SeqDomainSpectrumCreator() { }
 
-    virtual void createDomain(boost::shared_ptr<FunctionDomain> &domain,
-                              boost::shared_ptr<FunctionValues> &values,
+    virtual void createDomain(boost::shared_ptr<API::FunctionDomain> &domain,
+                              boost::shared_ptr<API::FunctionValues> &values,
                               size_t i0 = 0);
 
-    virtual Workspace_sptr createOutputWorkspace(const std::string &baseName,
-                                       IFunction_sptr function,
-                                       boost::shared_ptr<FunctionDomain> domain,
-                                       boost::shared_ptr<FunctionValues> values,
+    virtual API::Workspace_sptr createOutputWorkspace(const std::string &baseName,
+                                       API::IFunction_sptr function,
+                                       boost::shared_ptr<API::FunctionDomain> domain,
+                                       boost::shared_ptr<API::FunctionValues> values,
                                        const std::string &outputWorkspacePropertyName = "OutputWorkspace");
     virtual size_t getDomainSize() const;
 
 protected:
     void setParametersFromPropertyManager();
-    void setMatrixWorkspace(MatrixWorkspace_sptr matrixWorkspace);
+    void setMatrixWorkspace(API::MatrixWorkspace_sptr matrixWorkspace);
 
     std::string m_workspacePropertyName;
-    MatrixWorkspace_sptr m_matrixWorkspace;
+    API::MatrixWorkspace_sptr m_matrixWorkspace;
 };
 
 

diff --git a/Code/Mantid/Framework/SINQ/inc/MantidSINQ/PoldiCalculateSpectrum2D.h b/Code/Mantid/Framework/SINQ/inc/MantidSINQ/PoldiCalculateSpectrum2D.h
@@ -38,8 +38,6 @@ namespace Poldi
     Code Documentation is available at: <http://doxygen.mantidproject.org>
   */
 
-using namespace Mantid::API;
-
 class MANTID_SINQ_DLL PoldiCalculateSpectrum2D  : public API::Algorithm
 {
 public:
@@ -50,18 +48,19 @@ class MANTID_SINQ_DLL PoldiCalculateSpectrum2D  : public API::Algorithm
     virtual int version() const;
     virtual const std::string category() const;
 
+    virtual const std::string summary() const;
+
 protected:
-    PoldiPeakCollection_sptr getPeakCollection(TableWorkspace_sptr peakTable);
+    PoldiPeakCollection_sptr getPeakCollection(DataObjects::TableWorkspace_sptr peakTable);
     PoldiPeakCollection_sptr getIntegratedPeakCollection(PoldiPeakCollection_sptr rawPeakCollection);
     PoldiPeakCollection_sptr getNormalizedPeakCollection(PoldiPeakCollection_sptr peakCollection);
 
-    boost::shared_ptr<MultiDomainFunction> getMultiDomainFunctionFromPeakCollection(PoldiPeakCollection_sptr peakCollection);
+    boost::shared_ptr<API::MultiDomainFunction> getMultiDomainFunctionFromPeakCollection(PoldiPeakCollection_sptr peakCollection);
 
     PoldiTimeTransformer_sptr m_timeTransformer;
     double m_deltaT;
 
 private:
-    virtual void initDocs();
     void init();
     void exec();
 

diff --git a/Code/Mantid/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PeakFunctionIntegrator.h b/Code/Mantid/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PeakFunctionIntegrator.h
@@ -37,8 +37,6 @@ namespace Poldi {
   Code Documentation is available at: <http://doxygen.mantidproject.org>
 */
 
-using namespace Mantid::API;
-
 struct MANTID_SINQ_DLL IntegrationResult {
     double result;
     double error;
@@ -56,15 +54,15 @@ class MANTID_SINQ_DLL PeakFunctionIntegrator {
     void setRequiredRelativePrecision(double newPrecision);
     double requiredRelativePrecision() const;
 
-    IntegrationResult integrateInfinity(IPeakFunction_const_sptr peakFunction) const;
-    IntegrationResult integratePositiveInfinity(IPeakFunction_const_sptr peakFunction, double lowerLimit) const;
-    IntegrationResult integrateNegativeInfinity(IPeakFunction_const_sptr peakFunction, double upperLimit) const;
+    IntegrationResult integrateInfinity(API::IPeakFunction_const_sptr peakFunction) const;
+    IntegrationResult integratePositiveInfinity(API::IPeakFunction_const_sptr peakFunction, double lowerLimit) const;
+    IntegrationResult integrateNegativeInfinity(API::IPeakFunction_const_sptr peakFunction, double upperLimit) const;
 
-    IntegrationResult integrate(IPeakFunction_const_sptr peakFunction, double lowerLimit, double upperLimit) const;
+    IntegrationResult integrate(API::IPeakFunction_const_sptr peakFunction, double lowerLimit, double upperLimit) const;
 
 protected:
-    gsl_function getGSLFunction(IPeakFunction_const_sptr peakFunction) const;
-    void throwIfInvalid(IPeakFunction_const_sptr peakFunction) const;
+    gsl_function getGSLFunction(API::IPeakFunction_const_sptr peakFunction) const;
+    void throwIfInvalid(API::IPeakFunction_const_sptr peakFunction) const;
 
     gsl_integration_workspace *m_integrationWorkspace;
 

diff --git a/Code/Mantid/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiInstrumentAdapter.h b/Code/Mantid/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiInstrumentAdapter.h
@@ -35,13 +35,11 @@ namespace Poldi
     File change history is stored at: <https://github.com/mantidproject/mantid>
     Code Documentation is available at: <http://doxygen.mantidproject.org>
   */
-using namespace Mantid::Geometry;
-using namespace Mantid::API;
 
 class MANTID_SINQ_DLL PoldiInstrumentAdapter
 {
 public:
-    PoldiInstrumentAdapter(Instrument_const_sptr mantidInstrument, const Run &runInformation);
+    PoldiInstrumentAdapter(Geometry::Instrument_const_sptr mantidInstrument, const API::Run &runInformation);
     virtual ~PoldiInstrumentAdapter();
 
     PoldiAbstractChopper_sptr chopper() const;
@@ -51,9 +49,9 @@ class MANTID_SINQ_DLL PoldiInstrumentAdapter
 protected:
     PoldiInstrumentAdapter() { }
 
-    void setDetector(Instrument_const_sptr mantidInstrument);
-    void setChopper(Instrument_const_sptr mantidInstrument, const Run &runInformation);
-    void setSpectrum(Instrument_const_sptr mantidInstrument);
+    void setDetector(Geometry::Instrument_const_sptr mantidInstrument);
+    void setChopper(Geometry::Instrument_const_sptr mantidInstrument, const API::Run &runInformation);
+    void setSpectrum(Geometry::Instrument_const_sptr mantidInstrument);
 
     PoldiAbstractChopper_sptr m_chopper;
     PoldiAbstractDetector_sptr m_detector;

diff --git a/Code/Mantid/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiPeakCollection.h b/Code/Mantid/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiPeakCollection.h
@@ -61,23 +61,22 @@ class MANTID_SINQ_DLL PoldiPeakCollection
     std::string getProfileFunctionName() const;
     bool hasProfileFunctionName() const;
 
-    TableWorkspace_sptr asTableWorkspace();
+    DataObjects::TableWorkspace_sptr asTableWorkspace();
 
 protected:
     void prepareTable(DataObjects::TableWorkspace_sptr table);
     void dataToTableLog(DataObjects::TableWorkspace_sptr table);
     void peaksToTable(DataObjects::TableWorkspace_sptr table);
-    DataObjects::TableWorkspace_sptr asTableWorkspace();
 
     void constructFromTableWorkspace(DataObjects::TableWorkspace_sptr tableWorkspace);
     bool checkColumns(DataObjects::TableWorkspace_sptr tableWorkspace);
 
     void recoverDataFromLog(DataObjects::TableWorkspace_sptr TableWorkspace);
 
-    std::string getIntensityTypeFromLog(LogManager_sptr tableLog);
-    std::string getProfileFunctionNameFromLog(LogManager_sptr tableLog);
+    std::string getIntensityTypeFromLog(API::LogManager_sptr tableLog);
+    std::string getProfileFunctionNameFromLog(API::LogManager_sptr tableLog);
 
-    std::string getStringValueFromLog(LogManager_sptr logManager, std::string valueName);
+    std::string getStringValueFromLog(API::LogManager_sptr logManager, std::string valueName);
 
     std::string intensityTypeToString(IntensityType type) const;
     IntensityType intensityTypeFromString(std::string typeString) const;

diff --git a/Code/Mantid/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiSpectrumDomainFunction.h b/Code/Mantid/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiSpectrumDomainFunction.h
@@ -38,10 +38,8 @@ namespace Poldi
     File change history is stored at: <https://github.com/mantidproject/mantid>
     Code Documentation is available at: <http://doxygen.mantidproject.org>
   */
-using namespace API;
-using namespace DataObjects;
 
-class MANTID_SINQ_DLL PoldiSpectrumDomainFunction : public ParamFunction
+class MANTID_SINQ_DLL PoldiSpectrumDomainFunction : public API::ParamFunction
 {
 public:
     PoldiSpectrumDomainFunction();
@@ -50,13 +48,13 @@ class MANTID_SINQ_DLL PoldiSpectrumDomainFunction : public ParamFunction
 
     virtual std::string name() const { return "PoldiSpectrumDomainFunction"; }
 
-    virtual void setWorkspace(boost::shared_ptr<const Workspace> ws);
-    virtual void function(const FunctionDomain &domain, FunctionValues &values) const;
+    virtual void setWorkspace(boost::shared_ptr<const API::Workspace> ws);
+    virtual void function(const API::FunctionDomain &domain, API::FunctionValues &values) const;
 
 
 protected:
     virtual void init();
-    void initializeParametersFromWorkspace(Workspace2D_const_sptr workspace2D);
+    void initializeParametersFromWorkspace(DataObjects::Workspace2D_const_sptr workspace2D);
     void initializeInstrumentParameters(PoldiInstrumentAdapter_sptr poldiInstrument);
     std::vector<double> getChopperSlitOffsets(PoldiAbstractChopper_sptr chopper);
 

diff --git a/Code/Mantid/Framework/SINQ/src/PoldiCalculateSpectrum2D.cpp b/Code/Mantid/Framework/SINQ/src/PoldiCalculateSpectrum2D.cpp
@@ -23,6 +23,8 @@ namespace Poldi
   DECLARE_ALGORITHM(PoldiCalculateSpectrum2D)
 
   using namespace API;
+  using namespace Kernel;
+  using namespace DataObjects;
 
 
   //----------------------------------------------------------------------------------------------
@@ -53,12 +55,9 @@ namespace Poldi
   /// Algorithm's category for identification. @see Algorithm::category
   const std::string PoldiCalculateSpectrum2D::category() const { return "SINQ\\Poldi\\PoldiSet";}
 
-  //----------------------------------------------------------------------------------------------
-  /// Sets documentation strings for this algorithm
-  void PoldiCalculateSpectrum2D::initDocs()
+  const std::string PoldiCalculateSpectrum2D::summary() const
   {
-    this->setWikiSummary("TODO: Enter a quick description of your algorithm.");
-    this->setOptionalMessage("TODO: Enter a quick description of your algorithm.");
+      return "Calculates a POLDI 2D-spectrum.";
   }
 
   //----------------------------------------------------------------------------------------------

diff --git a/Code/Mantid/Framework/SINQ/src/PoldiUtilities/PeakFunctionIntegrator.cpp b/Code/Mantid/Framework/SINQ/src/PoldiUtilities/PeakFunctionIntegrator.cpp
@@ -8,6 +8,8 @@
 namespace Mantid {
 namespace Poldi {
 
+using namespace API;
+
 /** Constructor with required relative precision argument. The default is 1e-8.
  *  See also PeakFunctionIntegrator::setRequiredRelativePrecision.
  *

diff --git a/Code/Mantid/Framework/SINQ/test/PoldiSpectrumDomainFunctionTest.h b/Code/Mantid/Framework/SINQ/test/PoldiSpectrumDomainFunctionTest.h
@@ -17,6 +17,8 @@
 using ::testing::Return;
 
 using namespace Mantid::Poldi;
+using namespace Mantid::API;
+using namespace Mantid::CurveFitting;
 
 class PoldiSpectrumDomainFunctionTest : public CxxTest::TestSuite
 {
@@ -169,7 +171,7 @@ class PoldiSpectrumDomainFunctionTest : public CxxTest::TestSuite
 
     void testCreateInitialized()
     {
-        IFunction_sptr function(new CurveFitting::Gaussian());
+        IFunction_sptr function(new Gaussian());
         function->initialize();
         function->setParameter(0, 1.23456);
         function->setParameter(1, 1.234567);