Skip to content
Snippets Groups Projects
Commit 1d879cf3 authored by Edward Brown's avatar Edward Brown
Browse files

Re #22048: Applied clang-format patch.

parent df53fb0c
No related merge requests found
Showing
with 98 additions and 52 deletions
...@@ -301,7 +301,7 @@ public: ...@@ -301,7 +301,7 @@ public:
/// parent object to fill. /// parent object to fill.
void trackAlgorithmHistory(boost::shared_ptr<AlgorithmHistory> parentHist); void trackAlgorithmHistory(boost::shared_ptr<AlgorithmHistory> parentHist);
using WorkspaceVector = std::vector<boost::shared_ptr<Workspace> >; using WorkspaceVector = std::vector<boost::shared_ptr<Workspace>>;
void findWorkspaceProperties(WorkspaceVector &inputWorkspaces, void findWorkspaceProperties(WorkspaceVector &inputWorkspaces,
WorkspaceVector &outputWorkspaces) const; WorkspaceVector &outputWorkspaces) const;
......
...@@ -171,8 +171,10 @@ private: ...@@ -171,8 +171,10 @@ private:
using AlgorithmFactory = Mantid::Kernel::SingletonHolder<AlgorithmFactoryImpl>; using AlgorithmFactory = Mantid::Kernel::SingletonHolder<AlgorithmFactoryImpl>;
/// Convenient typedef for an UpdateNotification /// Convenient typedef for an UpdateNotification
using AlgorithmFactoryUpdateNotification = Mantid::Kernel::DynamicFactory<Algorithm>::UpdateNotification; using AlgorithmFactoryUpdateNotification =
using AlgorithmFactoryUpdateNotification_ptr = const Poco::AutoPtr<Mantid::Kernel::DynamicFactory<Algorithm>::UpdateNotification> &; Mantid::Kernel::DynamicFactory<Algorithm>::UpdateNotification;
using AlgorithmFactoryUpdateNotification_ptr = const Poco::AutoPtr<
Mantid::Kernel::DynamicFactory<Algorithm>::UpdateNotification> &;
} // namespace API } // namespace API
} // namespace Mantid } // namespace Mantid
......
...@@ -36,7 +36,8 @@ template <class T> struct CompareHistory { ...@@ -36,7 +36,8 @@ template <class T> struct CompareHistory {
// typedefs for algorithm history pointers // typedefs for algorithm history pointers
using AlgorithmHistory_sptr = boost::shared_ptr<AlgorithmHistory>; using AlgorithmHistory_sptr = boost::shared_ptr<AlgorithmHistory>;
using AlgorithmHistory_const_sptr = boost::shared_ptr<const AlgorithmHistory>; using AlgorithmHistory_const_sptr = boost::shared_ptr<const AlgorithmHistory>;
using AlgorithmHistories = std::set<AlgorithmHistory_sptr, Detail::CompareHistory<AlgorithmHistory> >; using AlgorithmHistories =
std::set<AlgorithmHistory_sptr, Detail::CompareHistory<AlgorithmHistory>>;
/** @class AlgorithmHistory AlgorithmHistory.h API/MAntidAPI/AlgorithmHistory.h /** @class AlgorithmHistory AlgorithmHistory.h API/MAntidAPI/AlgorithmHistory.h
......
...@@ -178,37 +178,62 @@ private: ...@@ -178,37 +178,62 @@ private:
std::string m_illegalChars; std::string m_illegalChars;
}; };
using AnalysisDataService = Mantid::Kernel::SingletonHolder<AnalysisDataServiceImpl>; using AnalysisDataService =
Mantid::Kernel::SingletonHolder<AnalysisDataServiceImpl>;
using WorkspaceAddNotification = Mantid::Kernel::DataService<Mantid::API::Workspace>::AddNotification;
using WorkspaceAddNotification_ptr = const Poco::AutoPtr<Mantid::Kernel::DataService<Mantid::API::Workspace>::AddNotification> &; using WorkspaceAddNotification =
Mantid::Kernel::DataService<Mantid::API::Workspace>::AddNotification;
using WorkspaceBeforeReplaceNotification = Mantid::Kernel::DataService<Mantid::API::Workspace>::BeforeReplaceNotification; using WorkspaceAddNotification_ptr = const Poco::AutoPtr<
using WorkspaceBeforeReplaceNotification_ptr = const Poco::AutoPtr<Mantid::Kernel::DataService<Mantid::API::Workspace>::BeforeReplaceNotification> &; Mantid::Kernel::DataService<Mantid::API::Workspace>::AddNotification> &;
using WorkspaceAfterReplaceNotification = Mantid::Kernel::DataService<Mantid::API::Workspace>::AfterReplaceNotification; using WorkspaceBeforeReplaceNotification = Mantid::Kernel::DataService<
using WorkspaceAfterReplaceNotification_ptr = const Poco::AutoPtr<Mantid::Kernel::DataService<Mantid::API::Workspace>::AfterReplaceNotification> &; Mantid::API::Workspace>::BeforeReplaceNotification;
using WorkspaceBeforeReplaceNotification_ptr =
using WorkspacePreDeleteNotification = Mantid::Kernel::DataService<Mantid::API::Workspace>::PreDeleteNotification; const Poco::AutoPtr<Mantid::Kernel::DataService<
using WorkspacePreDeleteNotification_ptr = const Poco::AutoPtr<Mantid::Kernel::DataService<Mantid::API::Workspace>::PreDeleteNotification> &; Mantid::API::Workspace>::BeforeReplaceNotification> &;
using WorkspacePostDeleteNotification = Mantid::Kernel::DataService<Mantid::API::Workspace>::PostDeleteNotification; using WorkspaceAfterReplaceNotification = Mantid::Kernel::DataService<
using WorkspacePostDeleteNotification_ptr = const Poco::AutoPtr<Mantid::Kernel::DataService<Mantid::API::Workspace>::PostDeleteNotification> &; Mantid::API::Workspace>::AfterReplaceNotification;
using WorkspaceAfterReplaceNotification_ptr =
using ClearADSNotification = Mantid::Kernel::DataService<Mantid::API::Workspace>::ClearNotification; const Poco::AutoPtr<Mantid::Kernel::DataService<
using ClearADSNotification_ptr = const Poco::AutoPtr<Mantid::Kernel::DataService<Mantid::API::Workspace>::ClearNotification> &; Mantid::API::Workspace>::AfterReplaceNotification> &;
using WorkspaceRenameNotification = Mantid::Kernel::DataService<Mantid::API::Workspace>::RenameNotification; using WorkspacePreDeleteNotification =
using WorkspaceRenameNotification_ptr = const Poco::AutoPtr<Mantid::Kernel::DataService<Mantid::API::Workspace>::RenameNotification> &; Mantid::Kernel::DataService<Mantid::API::Workspace>::PreDeleteNotification;
using WorkspacePreDeleteNotification_ptr =
using WorkspacesGroupedNotification = AnalysisDataServiceImpl::GroupWorkspacesNotification; const Poco::AutoPtr<Mantid::Kernel::DataService<
using WorkspacesGroupedNotification_ptr = const Poco::AutoPtr<AnalysisDataServiceImpl::GroupWorkspacesNotification> &; Mantid::API::Workspace>::PreDeleteNotification> &;
using WorkspaceUnGroupingNotification = AnalysisDataServiceImpl::UnGroupingWorkspaceNotification; using WorkspacePostDeleteNotification =
using WorkspaceUnGroupingNotification_ptr = const Poco::AutoPtr<AnalysisDataServiceImpl::UnGroupingWorkspaceNotification> &; Mantid::Kernel::DataService<Mantid::API::Workspace>::PostDeleteNotification;
using WorkspacePostDeleteNotification_ptr =
using GroupUpdatedNotification = AnalysisDataServiceImpl::GroupUpdatedNotification; const Poco::AutoPtr<Mantid::Kernel::DataService<
using GroupUpdatedNotification_ptr = const Poco::AutoPtr<AnalysisDataServiceImpl::GroupUpdatedNotification> &; Mantid::API::Workspace>::PostDeleteNotification> &;
using ClearADSNotification =
Mantid::Kernel::DataService<Mantid::API::Workspace>::ClearNotification;
using ClearADSNotification_ptr = const Poco::AutoPtr<
Mantid::Kernel::DataService<Mantid::API::Workspace>::ClearNotification> &;
using WorkspaceRenameNotification =
Mantid::Kernel::DataService<Mantid::API::Workspace>::RenameNotification;
using WorkspaceRenameNotification_ptr = const Poco::AutoPtr<
Mantid::Kernel::DataService<Mantid::API::Workspace>::RenameNotification> &;
using WorkspacesGroupedNotification =
AnalysisDataServiceImpl::GroupWorkspacesNotification;
using WorkspacesGroupedNotification_ptr =
const Poco::AutoPtr<AnalysisDataServiceImpl::GroupWorkspacesNotification> &;
using WorkspaceUnGroupingNotification =
AnalysisDataServiceImpl::UnGroupingWorkspaceNotification;
using WorkspaceUnGroupingNotification_ptr = const Poco::AutoPtr<
AnalysisDataServiceImpl::UnGroupingWorkspaceNotification> &;
using GroupUpdatedNotification =
AnalysisDataServiceImpl::GroupUpdatedNotification;
using GroupUpdatedNotification_ptr =
const Poco::AutoPtr<AnalysisDataServiceImpl::GroupUpdatedNotification> &;
} // Namespace API } // Namespace API
} // Namespace Mantid } // Namespace Mantid
......
...@@ -56,7 +56,8 @@ private: ...@@ -56,7 +56,8 @@ private:
~ArchiveSearchFactoryImpl() override = default; ~ArchiveSearchFactoryImpl() override = default;
}; };
using ArchiveSearchFactory = Mantid::Kernel::SingletonHolder<ArchiveSearchFactoryImpl>; using ArchiveSearchFactory =
Mantid::Kernel::SingletonHolder<ArchiveSearchFactoryImpl>;
} }
} }
......
...@@ -72,7 +72,8 @@ private: ...@@ -72,7 +72,8 @@ private:
~ConstraintFactoryImpl() override = default; ~ConstraintFactoryImpl() override = default;
}; };
using ConstraintFactory = Mantid::Kernel::SingletonHolder<ConstraintFactoryImpl>; using ConstraintFactory =
Mantid::Kernel::SingletonHolder<ConstraintFactoryImpl>;
} // namespace API } // namespace API
} // namespace Mantid } // namespace Mantid
......
...@@ -63,7 +63,8 @@ private: ...@@ -63,7 +63,8 @@ private:
CostFunctionFactoryImpl(); CostFunctionFactoryImpl();
}; };
using CostFunctionFactory = Mantid::Kernel::SingletonHolder<CostFunctionFactoryImpl>; using CostFunctionFactory =
Mantid::Kernel::SingletonHolder<CostFunctionFactoryImpl>;
} // namespace API } // namespace API
} // namespace Mantid } // namespace Mantid
......
...@@ -73,7 +73,8 @@ private: ...@@ -73,7 +73,8 @@ private:
using Kernel::DynamicFactory<IDomainCreator>::createUnwrapped; using Kernel::DynamicFactory<IDomainCreator>::createUnwrapped;
}; };
using DomainCreatorFactory = Mantid::Kernel::SingletonHolder<DomainCreatorFactoryImpl>; using DomainCreatorFactory =
Mantid::Kernel::SingletonHolder<DomainCreatorFactoryImpl>;
} // namespace API } // namespace API
} // namespace Mantid } // namespace Mantid
......
...@@ -144,7 +144,8 @@ private: ...@@ -144,7 +144,8 @@ private:
}; };
/// Type for the actual singleton instance /// Type for the actual singleton instance
using FileLoaderRegistry = Mantid::Kernel::SingletonHolder<FileLoaderRegistryImpl>; using FileLoaderRegistry =
Mantid::Kernel::SingletonHolder<FileLoaderRegistryImpl>;
} // namespace API } // namespace API
} // namespace Mantid } // namespace Mantid
......
...@@ -61,7 +61,8 @@ private: ...@@ -61,7 +61,8 @@ private:
FuncMinimizerFactoryImpl(); FuncMinimizerFactoryImpl();
}; };
using FuncMinimizerFactory = Mantid::Kernel::SingletonHolder<FuncMinimizerFactoryImpl>; using FuncMinimizerFactory =
Mantid::Kernel::SingletonHolder<FuncMinimizerFactoryImpl>;
} // namespace API } // namespace API
} // namespace Mantid } // namespace Mantid
......
...@@ -145,9 +145,11 @@ const std::vector<std::string> &FunctionFactoryImpl::getFunctionNames() const { ...@@ -145,9 +145,11 @@ const std::vector<std::string> &FunctionFactoryImpl::getFunctionNames() const {
using FunctionFactory = Mantid::Kernel::SingletonHolder<FunctionFactoryImpl>; using FunctionFactory = Mantid::Kernel::SingletonHolder<FunctionFactoryImpl>;
/// Convenient typedef for an UpdateNotification /// Convenient typedef for an UpdateNotification
using FunctionFactoryUpdateNotification = FunctionFactoryImpl::UpdateNotification; using FunctionFactoryUpdateNotification =
FunctionFactoryImpl::UpdateNotification;
/// Convenient typedef for an UpdateNotification AutoPtr /// Convenient typedef for an UpdateNotification AutoPtr
using FunctionFactoryUpdateNotification_ptr = const Poco::AutoPtr<FunctionFactoryUpdateNotification> &; using FunctionFactoryUpdateNotification_ptr =
const Poco::AutoPtr<FunctionFactoryUpdateNotification> &;
} // namespace API } // namespace API
} // namespace Mantid } // namespace Mantid
......
...@@ -150,7 +150,8 @@ protected: ...@@ -150,7 +150,8 @@ protected:
IFunction_sptr m_wrappedFunction; IFunction_sptr m_wrappedFunction;
}; };
using FunctionParameterDecorator_sptr = boost::shared_ptr<FunctionParameterDecorator>; using FunctionParameterDecorator_sptr =
boost::shared_ptr<FunctionParameterDecorator>;
} // namespace API } // namespace API
} // namespace Mantid } // namespace Mantid
......
...@@ -82,7 +82,8 @@ private: ...@@ -82,7 +82,8 @@ private:
/// Typedef for a shared pointer to \c TableWorkspace /// Typedef for a shared pointer to \c TableWorkspace
using ISplittersWorkspace_sptr = boost::shared_ptr<ISplittersWorkspace>; using ISplittersWorkspace_sptr = boost::shared_ptr<ISplittersWorkspace>;
/// Typedef for a shared pointer to \c const \c TableWorkspace /// Typedef for a shared pointer to \c const \c TableWorkspace
using ISplittersWorkspace_const_sptr = boost::shared_ptr<const ISplittersWorkspace>; using ISplittersWorkspace_const_sptr =
boost::shared_ptr<const ISplittersWorkspace>;
} // namespace API } // namespace API
} // namespace Mantid } // namespace Mantid
......
...@@ -64,7 +64,8 @@ private: ...@@ -64,7 +64,8 @@ private:
~ImplicitFunctionFactoryImpl() override = default; ~ImplicitFunctionFactoryImpl() override = default;
}; };
using ImplicitFunctionFactory = Mantid::Kernel::SingletonHolder<ImplicitFunctionFactoryImpl>; using ImplicitFunctionFactory =
Mantid::Kernel::SingletonHolder<ImplicitFunctionFactoryImpl>;
} }
} }
......
...@@ -81,7 +81,9 @@ class MANTID_API_DLL ImplicitFunctionParameterParser { ...@@ -81,7 +81,9 @@ class MANTID_API_DLL ImplicitFunctionParameterParser {
public: public:
/// Successor type. Unique shared pointer with stack scoped deletion /// Successor type. Unique shared pointer with stack scoped deletion
/// semantics. /// semantics.
using SuccessorType = boost::interprocess::unique_ptr<ImplicitFunctionParameterParser, DeleterPolicy<ImplicitFunctionParameterParser> >; using SuccessorType = boost::interprocess::unique_ptr<
ImplicitFunctionParameterParser,
DeleterPolicy<ImplicitFunctionParameterParser>>;
virtual ImplicitFunctionParameter * virtual ImplicitFunctionParameter *
createParameter(Poco::XML::Element *parameterElement) = 0; createParameter(Poco::XML::Element *parameterElement) = 0;
......
...@@ -62,7 +62,8 @@ private: ...@@ -62,7 +62,8 @@ private:
~ImplicitFunctionParameterParserFactoryImpl() override = default; ~ImplicitFunctionParameterParserFactoryImpl() override = default;
}; };
using ImplicitFunctionParameterParserFactory = Mantid::Kernel::SingletonHolder<ImplicitFunctionParameterParserFactoryImpl>; using ImplicitFunctionParameterParserFactory =
Mantid::Kernel::SingletonHolder<ImplicitFunctionParameterParserFactoryImpl>;
} }
} }
......
...@@ -68,7 +68,9 @@ namespace API { ...@@ -68,7 +68,9 @@ namespace API {
class MANTID_API_DLL ImplicitFunctionParser { class MANTID_API_DLL ImplicitFunctionParser {
public: public:
/// Successor type. Unique pointer with stack scoped deletion semantics. /// Successor type. Unique pointer with stack scoped deletion semantics.
using SuccessorType = boost::interprocess::unique_ptr<ImplicitFunctionParser, DeleterPolicy<ImplicitFunctionParser> >; using SuccessorType =
boost::interprocess::unique_ptr<ImplicitFunctionParser,
DeleterPolicy<ImplicitFunctionParser>>;
protected: protected:
ImplicitFunctionParameterParser::SuccessorType ImplicitFunctionParameterParser::SuccessorType
......
...@@ -66,7 +66,8 @@ private: ...@@ -66,7 +66,8 @@ private:
~ImplicitFunctionParserFactoryImpl() override = default; ~ImplicitFunctionParserFactoryImpl() override = default;
}; };
using ImplicitFunctionParserFactory = Mantid::Kernel::SingletonHolder<ImplicitFunctionParserFactoryImpl>; using ImplicitFunctionParserFactory =
Mantid::Kernel::SingletonHolder<ImplicitFunctionParserFactoryImpl>;
} }
} }
......
...@@ -48,7 +48,8 @@ private: ...@@ -48,7 +48,8 @@ private:
operator=(const InstrumentDataServiceImpl &) = delete; operator=(const InstrumentDataServiceImpl &) = delete;
}; };
using InstrumentDataService = Mantid::Kernel::SingletonHolder<InstrumentDataServiceImpl>; using InstrumentDataService =
Mantid::Kernel::SingletonHolder<InstrumentDataServiceImpl>;
} // Namespace API } // Namespace API
} // Namespace Mantid } // Namespace Mantid
......
...@@ -32,7 +32,7 @@ class Axis; ...@@ -32,7 +32,7 @@ class Axis;
class SpectrumDetectorMapping; class SpectrumDetectorMapping;
/// typedef for the image type /// typedef for the image type
using MantidImage = std::vector<std::vector<double> >; using MantidImage = std::vector<std::vector<double>>;
/// shared pointer to MantidImage /// shared pointer to MantidImage
using MantidImage_sptr = boost::shared_ptr<MantidImage>; using MantidImage_sptr = boost::shared_ptr<MantidImage>;
/// shared pointer to const MantidImage /// shared pointer to const MantidImage
......
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