Refs #3867. Fixing doxygen warnings.

mantidproject · Dec 29, 2011 · 2a9fed7 · 2a9fed7
1 parent 251bc1f
commit 2a9fed7
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 24 deletions.
diff --git a/Code/Mantid/Framework/PythonAPI/src/PythonWrapper.cpp b/Code/Mantid/Framework/PythonAPI/src/PythonWrapper.cpp
@@ -47,8 +47,8 @@ BOOST_PYTHON_MODULE(libMantidPythonAPI)
   boost::python::def("mantid_build_version", mantid_version);
   MantidVecHelper::initializeDependencies(); // This initializes numpy if it is available
   // Export some frequently used stl containers
-  vector_proxy<Mantid::Kernel::DateAndTime>::wrap("cpp_list_dateandtime");
-  vector_proxy<int>::wrap("cpp_list_int");
+  Mantid::PythonAPI::vector_proxy<Mantid::Kernel::DateAndTime>::wrap("cpp_list_dateandtime");
+  Mantid::PythonAPI::vector_proxy<int>::wrap("cpp_list_int");
   vector_proxy<long>::wrap("cpp_list_long");
   vector_proxy<double>::wrap("cpp_list_dbl");
   vector_proxy<bool>::wrap("cpp_list_bool");

diff --git a/Code/Mantid/Framework/TestHelpers/src/SANSInstrumentCreationHelper.cpp b/Code/Mantid/Framework/TestHelpers/src/SANSInstrumentCreationHelper.cpp
@@ -46,7 +46,7 @@ Workspace2D_sptr SANSInstrumentCreationHelper::createSANSInstrumentWorkspace(std
    * @param workspace :: The workspace to insert the instrument into
    */
   void SANSInstrumentCreationHelper::runLoadInstrument(const std::string & inst_name,
-      Workspace2D_sptr workspace)
+      Mantid::DataObjects::Workspace2D_sptr workspace)
   {
     // Determine the search directory for XML instrument definition files (IDFs)
     std::string directoryName = Mantid::Kernel::ConfigService::Instance().getInstrumentDirectory();
@@ -72,7 +72,7 @@ Workspace2D_sptr SANSInstrumentCreationHelper::createSANSInstrumentWorkspace(std
    * @param nxbins: number of bins in X
    * @param nybins: number of bins in Y
    */
-  void SANSInstrumentCreationHelper::runLoadMappingTable(Workspace2D_sptr workspace, int nxbins, int nybins)
+  void SANSInstrumentCreationHelper::runLoadMappingTable(Mantid::DataObjects::Workspace2D_sptr workspace, int nxbins, int nybins)
   {
     // Get the number of monitor channels
     size_t nMonitors(0);

diff --git a/Code/Mantid/MantidPlot/src/Mantid/AlgMonitor.cpp b/Code/Mantid/MantidPlot/src/Mantid/AlgMonitor.cpp
@@ -39,7 +39,7 @@ AlgorithmMonitor::~AlgorithmMonitor()
   wait();
 }
 
-void AlgorithmMonitor::add(IAlgorithm_sptr alg)
+void AlgorithmMonitor::add(Mantid::API::IAlgorithm_sptr alg)
 {
     lock();
     alg->addObserver(m_finishedObserver);
@@ -97,7 +97,7 @@ void AlgorithmMonitor::showDialog()
   }
 }
 
-void AlgorithmMonitor::cancel(AlgorithmID id)
+void AlgorithmMonitor::cancel(Mantid::API::AlgorithmID id)
 {
     IAlgorithm_sptr a = Mantid::API::AlgorithmManager::Instance().getAlgorithm(id);
     if (!a.get()) return;

diff --git a/Code/Mantid/MantidPlot/src/Mantid/AlgorithmHistoryWindow.cpp b/Code/Mantid/MantidPlot/src/Mantid/AlgorithmHistoryWindow.cpp
@@ -169,7 +169,7 @@ AlgHistScriptButton::AlgHistScriptButton(QString title,QWidget* w):QPushButton(t
 AlgHistScriptButton::~AlgHistScriptButton()
 {
 }
-AlgorithmHistoryWindow::AlgorithmHistoryWindow(QWidget *parent,const Mantid::API::Workspace_const_sptr wsptr):
+AlgorithmHistoryWindow::AlgorithmHistoryWindow(QWidget *parent,const boost::shared_ptr<const Mantid::API::Workspace> wsptr):
 MantidDialog(parent),m_algHist(wsptr->getHistory().getAlgorithmHistories()),m_histPropWindow(NULL),m_execSumGrpBox(NULL),m_envHistGrpBox(NULL),m_wsName(wsptr->getName().c_str())
 {
   setWindowTitle(tr("Algorithm History"));

diff --git a/Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentTreeModel.cpp b/Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentTreeModel.cpp
@@ -15,7 +15,7 @@ using Mantid::Geometry::IObjComponent;
 /**
  * Constructor for tree model to display instrument tree
  */
-InstrumentTreeModel::InstrumentTreeModel(boost::shared_ptr<const Mantid::Geometry::Instrument> instrument,
+InstrumentTreeModel::InstrumentTreeModel(boost::shared_ptr<const Instrument> instrument,
                                          QObject *parent) :
   QAbstractItemModel(parent),
   m_instrument(instrument)

diff --git a/Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindow.cpp b/Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindow.cpp
@@ -691,7 +691,7 @@ void InstrumentWindow::saveSettings()
  * @param ws_name :: Name of the deleted workspace.
  * @param ws :: Pointer to the workspace to be deleted
  */
-void InstrumentWindow::deleteHandle(const std::string & ws_name, boost::shared_ptr<Mantid::API::Workspace> ws)
+void InstrumentWindow::deleteHandle(const std::string & ws_name, const boost::shared_ptr<Mantid::API::Workspace> ws)
 {
   if (ws_name == m_workspaceName.toStdString())
   {

diff --git a/Code/Mantid/MantidPlot/src/Mantid/MantidMDCurve.cpp b/Code/Mantid/MantidPlot/src/Mantid/MantidMDCurve.cpp
@@ -183,7 +183,7 @@ QString MantidMDCurve::saveToString()
 	return s;
 }
 
-void MantidMDCurve::afterReplaceHandle(const std::string& wsName,const boost::shared_ptr<Mantid::API::Workspace> ws)
+void MantidMDCurve::afterReplaceHandle(const std::string& wsName, const boost::shared_ptr<Mantid::API::Workspace> ws)
 {
   (void) ws;
 

diff --git a/Code/Mantid/MantidPlot/src/Mantid/MantidUI.cpp b/Code/Mantid/MantidPlot/src/Mantid/MantidUI.cpp
@@ -1654,7 +1654,7 @@ void MantidUI::executeDownloadDataFiles(const std::vector<std::string>& filenNam
 }
 
 
-void MantidUI::handleLoadDAEFinishedNotification(const Poco::AutoPtr<Mantid::API::Algorithm::FinishedNotification>& pNf)
+void MantidUI::handleLoadDAEFinishedNotification(const Poco::AutoPtr<Algorithm::FinishedNotification>& pNf)
 {
   std::string wsNAme = pNf->algorithm()->getProperty("OutputWorkspace");
   emit needToCreateLoadDAEMantidMatrix(QString::fromStdString(wsNAme));
@@ -1695,22 +1695,22 @@ void MantidUI::showAlgMonitor()
   m_algMonitor->showDialog();
 }
 
-void MantidUI::handleAddWorkspace(WorkspaceAddNotification_ptr pNf)
+void MantidUI::handleAddWorkspace(Mantid::API::WorkspaceAddNotification_ptr pNf)
 {
   emit workspace_added(QString::fromStdString(pNf->object_name()),(pNf->object()));
 }
 
-void MantidUI::handleReplaceWorkspace(WorkspaceAfterReplaceNotification_ptr pNf)
+void MantidUI::handleReplaceWorkspace(Mantid::API::WorkspaceAfterReplaceNotification_ptr pNf)
 {
   emit workspace_replaced(QString::fromStdString(pNf->object_name()),(pNf->object()));
 }
 
-void MantidUI::handleDeleteWorkspace(WorkspaceDeleteNotification_ptr pNf)
+void MantidUI::handleDeleteWorkspace(Mantid::API::WorkspaceDeleteNotification_ptr pNf)
 {
   emit workspace_removed(QString::fromStdString(pNf->object_name()));
 }
 
-void MantidUI::handleClearADS(ClearADSNotification_ptr)
+void MantidUI::handleClearADS(Mantid::API::ClearADSNotification_ptr)
 {
   emit workspaces_cleared();
 }
@@ -1719,7 +1719,7 @@ void MantidUI::handleAlgorithmFactoryUpdates(Mantid::API::AlgorithmFactoryUpdate
 {
   emit algorithms_updated();
 }
-void MantidUI::handleRenameWorkspace(WorkspaceRenameNotification_ptr pNf)
+void MantidUI::handleRenameWorkspace(Mantid::API::WorkspaceRenameNotification_ptr pNf)
 {
   emit workspace_renamed(QString::fromStdString(pNf->object_name()), QString::fromStdString(pNf->new_objectname()));
 }
@@ -2800,7 +2800,7 @@ void MantidUI::setUpBinGraph(MultiLayer* ml, const QString& Name, Mantid::API::M
   g->setAntialiasing(false);
 }
 
-MultiLayer* MantidUI::plotSpectraList(const QMultiMap<QString,std::set<int> >& toPlot, bool errs, bool distr)
+MultiLayer* MantidUI::plotSpectraList(const QMultiMap<QString, set<int> >& toPlot, bool errs, bool distr)
 {
   // Convert the list into a map (with the same workspace as key in each case)
   QMultiMap<QString,int> pairs;

diff --git a/Code/Mantid/MantidQt/API/src/WorkspaceObserver.cpp b/Code/Mantid/MantidQt/API/src/WorkspaceObserver.cpp
@@ -13,7 +13,7 @@ namespace MantidQt
     // Observer callback
     //---------------------------------------------------------------------------
 
-    void ObserverCallback::handleDelete(const std::string &name, boost::shared_ptr<Mantid::API::Workspace> workspace)
+    void ObserverCallback::handleDelete(const std::string &name, Mantid::API::Workspace_sptr workspace)
     {
       m_observer->deleteHandle(name, workspace);
     }
@@ -23,7 +23,7 @@ namespace MantidQt
       m_observer->addHandle(name, workspace);
     }
 
-    void ObserverCallback::handleAfterReplace(const std::string &name, boost::shared_ptr<Mantid::API::Workspace> workspace)
+    void ObserverCallback::handleAfterReplace(const std::string &name, Mantid::API::Workspace_sptr workspace)
     {
       m_observer->afterReplaceHandle(name, workspace);
     }

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/SANSPlotSpecial.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/SANSPlotSpecial.cpp
@@ -465,7 +465,7 @@ void SANSPlotSpecial::setupTable()
   m_units["(S/V)"] = "cm^-1";
 }
 
-QwtPlotCurve* SANSPlotSpecial::plotMiniplot(QwtPlotCurve* curve, Mantid::API::MatrixWorkspace_sptr workspace,
+QwtPlotCurve* SANSPlotSpecial::plotMiniplot(QwtPlotCurve* curve, boost::shared_ptr<Mantid::API::MatrixWorkspace> workspace,
   size_t workspaceIndex)
 {
   bool data = ( curve == m_dataCurve );

diff --git a/Code/Mantid/MantidQt/MantidWidgets/src/ICatAdvancedSearch.cpp b/Code/Mantid/MantidQt/MantidWidgets/src/ICatAdvancedSearch.cpp
@@ -525,7 +525,7 @@ namespace MantidQt
     /* This method updates the search result to search tree
      * @param ws_sptr :: workspace shared pointer
      */
-    void ICatAdvancedSearch::updatesearchResults(ITableWorkspace_sptr& ws_sptr )
+    void ICatAdvancedSearch::updatesearchResults(Mantid::API::ITableWorkspace_sptr& ws_sptr )
     {
       //ICatUtils utils;
       if(!m_utils_sptr)

diff --git a/Code/Mantid/MantidQt/MantidWidgets/src/ICatInvestigation.cpp b/Code/Mantid/MantidQt/MantidWidgets/src/ICatInvestigation.cpp
@@ -26,7 +26,7 @@ namespace MantidQt
     //----------------------
     ///Constructor
     ICatInvestigation::ICatInvestigation(long long investId,const QString &ProposalId,
-        const QString &Title,const QString &Instrument,const QString &RunRange,ITableWorkspace_sptr& ws2_sptr,QWidget *par) :
+        const QString &Title,const QString &Instrument,const QString &RunRange,Mantid::API::ITableWorkspace_sptr& ws2_sptr,QWidget *par) :
         QWidget(par),m_invstId(investId),m_ProposalId(ProposalId),m_Title(Title),
         m_Instrument(Instrument),m_RunRange(RunRange),m_downloadedFileList()
     {

diff --git a/Code/Mantid/MantidQt/MantidWidgets/src/ICatSearch.cpp b/Code/Mantid/MantidQt/MantidWidgets/src/ICatSearch.cpp
@@ -141,7 +141,7 @@ namespace MantidQt
     /* This method updates the search result to search tree
      * @param ws_sptr :: workspace shared pointer
      */
-    void ICatSearch::updatesearchResults(ITableWorkspace_sptr& ws_sptr )
+    void ICatSearch::updatesearchResults(Mantid::API::ITableWorkspace_sptr& ws_sptr )
     {
       if(!m_utils_sptr)
       {
@@ -252,7 +252,7 @@ namespace MantidQt
     /**This method executes the search by run number algorithm
      *@param ws_sptr :: shared pointer to outputworkspace
      */
-    bool  ICatSearch::executeSearch(ITableWorkspace_sptr& ws_sptr)
+    bool  ICatSearch::executeSearch(Mantid::API::ITableWorkspace_sptr& ws_sptr)
     {
       //before starting new search investigations clear the old one.
       m_utils_sptr->clearSearch(m_uiForm.searchtableWidget,"investigations");