Skip to content

Commit

Permalink
Fixed ICAT doxygen warnings. Refs #8321.
Browse files Browse the repository at this point in the history
  • Loading branch information
jawrainey committed Nov 6, 2013
1 parent 1fca2b0 commit a260d68
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions Code/Mantid/Framework/ICat/inc/MantidICat/ICat3/ICat3Helper.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ namespace Mantid
int doSearch(ICat3::ICATPortBindingProxy& icat,boost::shared_ptr<ICat3::ns1__searchByAdvanced>& request,ICat3::ns1__searchByAdvancedResponse& response);

/// calls getInvestigationIncludes api's
int getDataFiles(long long invId,ICat3::ns1__investigationInclude inclide,API::ITableWorkspace_sptr& responsews_sptr);
int getDataFiles(long long invId,ICat3::ns1__investigationInclude include,API::ITableWorkspace_sptr& responsews_sptr);

/// this method calls Icat api getInvestigationIncludes and returns datasets for the given investigation id.
int doDataSetsSearch(long long invId,ICat3::ns1__investigationInclude inclide,API::ITableWorkspace_sptr& responsews_sptr);
int doDataSetsSearch(long long invId,ICat3::ns1__investigationInclude include,API::ITableWorkspace_sptr& responsews_sptr);

/// This method lists the isntruments
void listInstruments(std::vector<std::string>& instruments);
Expand Down
7 changes: 3 additions & 4 deletions Code/Mantid/Framework/ICat/src/ICat4/ICat4Catalog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -487,8 +487,8 @@ namespace Mantid

/**
* Saves result from "getDataFiles" to workspace.
* @param investigationId :: unique identifier of the investigation
* @param outputws :: shared pointer to datasets
* @param response :: result response from the catalog.
* @param outputws :: shared pointer to datasets
*/
void ICat4Catalog::saveDataFiles(std::vector<xsd__anyType*> response, API::ITableWorkspace_sptr& outputws)
{
Expand Down Expand Up @@ -744,8 +744,7 @@ namespace Mantid

/**
* Convert a file size to human readable file format.
* @param size :: The size in bytes of the file.
* @return string :: A human readable file format (e.g. 5MB).
* @param fileSize :: The size in bytes of the file.
*/
std::string ICat4Catalog::bytesToString(int64_t &fileSize)
{
Expand Down
3 changes: 2 additions & 1 deletion Code/Mantid/Framework/Kernel/src/CatalogInfo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,8 @@ namespace Mantid

/**
* Obtain the attribute from a given element tag and attribute name.
* @param tagName :: The name of the tag to search for.
* @param element :: The name of the element in the XML file.
* @param tagName :: The name of the tag to search for.
* @param attributeName :: The name of the attribute for the given tag.
* @return The contents of the attribute from an XML element.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ namespace MantidQt
void loadSettings();

///////////////////////////////////////////////////////////////////////////////
/// Methods for: "Catalog Search"
// Methods for: "Catalog Search"
///////////////////////////////////////////////////////////////////////////////

/// Ensures the correct text box is updated when the date is selected on the calendar.
Expand Down Expand Up @@ -131,7 +131,7 @@ namespace MantidQt
void showDataFileInfo();

///////////////////////////////////////////////////////////////////////////////
/// SLOTS for: "Catalog Search"
// SLOTS for: "Catalog Search"
///////////////////////////////////////////////////////////////////////////////

/// Open the DateTime Calendar to select date.
Expand Down

0 comments on commit a260d68

Please sign in to comment.