Adapt inheritance intendation to uncrustify

As discussed in I35f310da and some other commits along the modular
simulator chain, uncrustify insists on aligning the first inheritance
with the `final` keyword, as in

template <ComputeGlobalsAlgorithm algorithm>
class ComputeGlobalsElement final :
    public                  ISimulatorElement,
    public IEnergySignallerClient,
    public ITrajectorySignallerClient,
    public ITopologyHolderClient

It was therefore decided to align all inheritances to the same level,
as in

template <ComputeGlobalsAlgorithm algorithm>
class ComputeGlobalsElement final :
    public                  ISimulatorElement,
    public                  IEnergySignallerClient,
    public                  ITrajectorySignallerClient,
    public                  ITopologyHolderClient

This formatting will be reevaluated when uncrustify is replaced by
clang-format.

This commit applies this decision to the classes previously introduced
along the commit chain. It also addresses two typos in trajectoryelement.h.

Change-Id: I03b9fd142d822f7a7523e351f08a4044bff2cff4

diff --git a/src/gromacs/modularsimulator/energyelement.h b/src/gromacs/modularsimulator/energyelement.h
index c715dd3713534b19b758239924012201aa4e9f6b..632f20bb878c08a3b061ee140288d2fa5032c81b 100644 (file)
--- a/src/gromacs/modularsimulator/energyelement.h
+++ b/src/gromacs/modularsimulator/energyelement.h
@@ -85,10 +85,10 @@ class MicroState;
  */
 class EnergyElement final :
     public          ISimulatorElement,
-    public ITrajectoryWriterClient,
-    public ITrajectorySignallerClient,
-    public IEnergySignallerClient,
-    public ILoggingSignallerClient
+    public          ITrajectoryWriterClient,
+    public          ITrajectorySignallerClient,
+    public          IEnergySignallerClient,
+    public          ILoggingSignallerClient
 {
     public:
         //! Constructor

diff --git a/src/gromacs/modularsimulator/microstate.h b/src/gromacs/modularsimulator/microstate.h
index a67afe93db89fd5c887fc441c44fb6bf9bb7b638..ec54bec15e1663c3697b16f97432ea499dee015d 100644 (file)
--- a/src/gromacs/modularsimulator/microstate.h
+++ b/src/gromacs/modularsimulator/microstate.h
@@ -99,8 +99,8 @@ enum class ConstraintVariable;
  */
 class MicroState final :
     public       ISimulatorElement,
-    public ITrajectoryWriterClient,
-    public ITrajectorySignallerClient
+    public       ITrajectoryWriterClient,
+    public       ITrajectorySignallerClient
 {
     public:
         //! Constructor

diff --git a/src/gromacs/modularsimulator/signallers.h b/src/gromacs/modularsimulator/signallers.h
index 4db85ef2fbd537c98b3b26a3e6c1b37522d04bc5..11d79260a4d5b5c116059172d1ae47badd000ce0 100644 (file)
--- a/src/gromacs/modularsimulator/signallers.h
+++ b/src/gromacs/modularsimulator/signallers.h
@@ -154,7 +154,7 @@ class NeighborSearchSignaller final :
  */
 class LastStepSignaller final :
     public              ISignaller,
-    public INeighborSearchSignallerClient
+    public              INeighborSearchSignallerClient
 {
     public:
         /*! \brief Run the signaller at a specific step / time
@@ -211,7 +211,7 @@ class LastStepSignaller final :
  */
 class LoggingSignaller final :
     public             ISignaller,
-    public ILastStepSignallerClient
+    public             ILastStepSignallerClient
 {
     public:
         /*! \brief Run the signaller at a specific step / time
@@ -274,8 +274,8 @@ class LoggingSignaller final :
  */
 class EnergySignaller final :
     public            ISignaller,
-    public ITrajectorySignallerClient,
-    public ILoggingSignallerClient
+    public            ITrajectorySignallerClient,
+    public            ILoggingSignallerClient
 {
     public:
         /*! \brief Run the signaller at a specific step / time

diff --git a/src/gromacs/modularsimulator/trajectoryelement.h b/src/gromacs/modularsimulator/trajectoryelement.h
index be1c9757898e85a1c10843a1c98414b734ad3660..56aadbf7f900d3189ad6f0c0431501a13c8927a1 100644 (file)
--- a/src/gromacs/modularsimulator/trajectoryelement.h
+++ b/src/gromacs/modularsimulator/trajectoryelement.h
@@ -79,10 +79,10 @@ enum class StartingBehavior;
  * element only prepares the output struct, and passes it to the clients who
  * write their part of the trajectory.
  */
-class TrajectoryElement :
-    public ISimulatorElement,
-    public ISignaller,
-    public ILastStepSignallerClient
+class TrajectoryElement final :
+    public              ISimulatorElement,
+    public              ISignaller,
+    public              ILastStepSignallerClient
 {
     public:
         friend class TrajectoryElementBuilder;
@@ -114,7 +114,7 @@ class TrajectoryElement :
          *
          * During setup, the trajectory writer will query the writer clients for
          * their callbacks. It will also call the setup methods of the different
-         * clients. To be ran before the main simulator run, but after all clients
+         * clients. To be run before the main simulator run, but after all clients
          * were registered.
          */
         void elementSetup() override;
@@ -136,7 +136,7 @@ class TrajectoryElement :
          *
          * During teardown, the trajectory writer will call the teardown
          * methods of the clients and perform some additional clean-up.
-         * To be ran after the main simulator run.
+         * To be run after the main simulator run.
          */
         void elementTeardown() override;