Skip to content
Snippets Groups Projects
Commit 649c71c6 authored by Martin Christoph Hierholzer's avatar Martin Christoph Hierholzer
Browse files

fix: code formatting

parent befb9d5e
No related branches found
No related tags found
No related merge requests found
...@@ -102,9 +102,9 @@ namespace ChimeraTK { ...@@ -102,9 +102,9 @@ namespace ChimeraTK {
*/ */
class ConnectingDeviceModule : public DeviceModule { class ConnectingDeviceModule : public DeviceModule {
public: public:
[[deprecated("Use DeviceModule instead")]] ConnectingDeviceModule(ModuleGroup* owner, const std::string& deviceAliasOrCDD, [[deprecated("Use DeviceModule instead")]] ConnectingDeviceModule(ModuleGroup* owner,
const std::string& triggerPath = {}, std::function<void(ChimeraTK::Device&)> initialisationHandler = nullptr, const std::string& deviceAliasOrCDD, const std::string& triggerPath = {},
const std::string& pathInDevice = "/") std::function<void(ChimeraTK::Device&)> initialisationHandler = nullptr, const std::string& pathInDevice = "/")
: DeviceModule(owner, deviceAliasOrCDD, triggerPath, std::move(initialisationHandler), pathInDevice) {} : DeviceModule(owner, deviceAliasOrCDD, triggerPath, std::move(initialisationHandler), pathInDevice) {}
using DeviceModule::DeviceModule; using DeviceModule::DeviceModule;
......
...@@ -42,19 +42,19 @@ namespace ChimeraTK { ...@@ -42,19 +42,19 @@ namespace ChimeraTK {
* *
* Deprecated, do not use in new code. * Deprecated, do not use in new code.
*/ */
enum class [[deprecated("Use a qualified name instead")]] HierarchyModifier { enum class [[deprecated("Use a qualified name instead")]] HierarchyModifier{
none, ///< No modification is performed none, ///< No modification is performed
hideThis, ///< The hierarchy level at which this flag is specified is hidden. Everything below this level is moved hideThis, ///< The hierarchy level at which this flag is specified is hidden. Everything below this level is moved
///< exactly one level up. The structure below this level is kept. ///< exactly one level up. The structure below this level is kept.
moveToRoot, ///< The module at which this flag is specified is moved to the root level, together with the entire moveToRoot, ///< The module at which this flag is specified is moved to the root level, together with the entire
///< structure below the module. Note: Unless you run findTag() or so on the entire application, the ///< structure below the module. Note: Unless you run findTag() or so on the entire application, the
///< moved hierarchy structures might not be visible in the control system etc. ///< moved hierarchy structures might not be visible in the control system etc.
oneLevelUp, ///< Move the module up to the level where the owner lives. Instead of creating a "daughter" oneLevelUp, ///< Move the module up to the level where the owner lives. Instead of creating a "daughter"
///< of the owning module, it creates a "sister" (module that lives on the same level). ///< of the owning module, it creates a "sister" (module that lives on the same level).
///< This modifyer can only be used in sub-modules, not on the first level ///< This modifyer can only be used in sub-modules, not on the first level
oneUpAndHide ///< Move the structure inside the module up to the level where the owner lives. Instead of adding a oneUpAndHide ///< Move the structure inside the module up to the level where the owner lives. Instead of adding a
///< hierrarchy level, one level is removed. This modifyer can only be used in sub-modules, not on the ///< hierrarchy level, one level is removed. This modifyer can only be used in sub-modules, not on
///< first level inside an application. ///< the first level inside an application.
}; };
/********************************************************************************************************************/ /********************************************************************************************************************/
......
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