Return previous value

in functor setters for direction and filters
rism-digital · Jul 23, 2023 · ef00195 · ef00195
1 parent 0e9c2b0
commit ef00195
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 25 deletions.
diff --git a/include/vrv/functor.h b/include/vrv/functor.h
@@ -29,7 +29,7 @@ class FunctorBase {
      * @name Constructors, destructors
      */
     ///@{
-    FunctorBase(){};
+    FunctorBase() {}
     virtual ~FunctorBase() = default;
     ///@}
 
@@ -43,15 +43,32 @@ class FunctorBase {
     ///@}
 
     /**
-     * Getters/Setters for the properties
+     * Getter/Setter for the visibility
      */
     ///@{
-    Filters *GetFilters() { return m_filters; }
-    void SetFilters(Filters *filters) { m_filters = filters; }
     bool VisibleOnly() const { return m_visibleOnly; }
     void SetVisibleOnly(bool visibleOnly) { m_visibleOnly = visibleOnly; }
+    ///@}
+
+    /**
+     * Getters/Setters for the filters and direction
+     * Here setters return the previous value
+     */
+    ///@{
+    Filters *GetFilters() const { return m_filters; }
+    Filters *SetFilters(Filters *filters)
+    {
+        Filters *previous = m_filters;
+        m_filters = filters;
+        return previous;
+    }
     bool GetDirection() const { return m_direction; }
-    void SetDirection(bool direction) { m_direction = direction; }
+    bool SetDirection(bool direction)
+    {
+        bool previous = m_direction;
+        m_direction = direction;
+        return previous;
+    }
     ///@}
 
     /**
@@ -87,7 +104,7 @@ class Functor : public FunctorBase, public FunctorInterface {
      * @name Constructors, destructors
      */
     ///@{
-    Functor(){};
+    Functor() {}
     virtual ~Functor() = default;
     ///@}
 
@@ -112,7 +129,7 @@ class ConstFunctor : public FunctorBase, public ConstFunctorInterface {
      * @name Constructors, destructors
      */
     ///@{
-    ConstFunctor(){};
+    ConstFunctor() {}
     virtual ~ConstFunctor() = default;
     ///@}
 

diff --git a/src/adjustdotsfunctor.cpp b/src/adjustdotsfunctor.cpp
@@ -100,9 +100,8 @@ FunctorCode AdjustDotsFunctor::VisitMeasure(Measure *measure)
 {
     if (!measure->HasAlignmentRefWithMultipleLayers()) return FUNCTOR_SIBLINGS;
 
-    Filters *previousFilters = this->GetFilters();
     Filters filters;
-    this->SetFilters(&filters);
+    Filters *previousFilters = this->SetFilters(&filters);
 
     std::vector<int>::iterator iter;
     for (iter = m_staffNs.begin(); iter != m_staffNs.end(); ++iter) {

diff --git a/src/adjustgracexposfunctor.cpp b/src/adjustgracexposfunctor.cpp
@@ -48,11 +48,9 @@ FunctorCode AdjustGraceXPosFunctor::VisitAlignment(Alignment *alignment)
         MeasureAligner *measureAligner = vrv_cast<MeasureAligner *>(alignment->GetFirstAncestor(MEASURE_ALIGNER));
         assert(measureAligner);
 
-        bool previousDirection = this->GetDirection();
-        Filters *previousFilters = this->GetFilters();
-        this->SetDirection(BACKWARD);
+        const bool previousDirection = this->SetDirection(BACKWARD);
         Filters filters;
-        this->SetFilters(&filters);
+        Filters *previousFilters = this->SetFilters(&filters);
 
         std::vector<int>::iterator iter;
         for (iter = m_staffNs.begin(); iter != m_staffNs.end(); ++iter) {
@@ -143,10 +141,8 @@ FunctorCode AdjustGraceXPosFunctor::VisitAlignmentReference(AlignmentReference *
     // Because we are processing grace notes alignment backward (see VisitAlignment) we need
     // to process the children (LayerElement) "by hand" in FORWARD manner
     // (filters can be NULL because filtering was already applied in the parent)
-    bool previousDirection = this->GetDirection();
-    Filters *previousFilters = this->GetFilters();
-    this->SetDirection(FORWARD);
-    this->SetFilters(NULL);
+    const bool previousDirection = this->SetDirection(FORWARD);
+    Filters *previousFilters = this->SetFilters(NULL);
 
     for (auto child : alignmentReference->GetChildren()) {
         child->Process(*this);
@@ -209,8 +205,7 @@ FunctorCode AdjustGraceXPosFunctor::VisitMeasure(Measure *measure)
     m_rightDefaultAlignment = NULL;
 
     // We process it backward because we want to get the rightDefaultAlignment
-    bool previousDirection = this->GetDirection();
-    this->SetDirection(BACKWARD);
+    const bool previousDirection = this->SetDirection(BACKWARD);
     measure->m_measureAligner.Process(*this);
 
     // We need to process the staves in the reverse order

diff --git a/src/adjustlayersfunctor.cpp b/src/adjustlayersfunctor.cpp
@@ -123,9 +123,8 @@ FunctorCode AdjustLayersFunctor::VisitMeasure(Measure *measure)
 {
     if (!measure->HasAlignmentRefWithMultipleLayers()) return FUNCTOR_SIBLINGS;
 
-    Filters *previousFilters = this->GetFilters();
     Filters filters;
-    this->SetFilters(&filters);
+    Filters *previousFilters = this->SetFilters(&filters);
 
     std::vector<int>::iterator iter;
     for (iter = m_staffNs.begin(); iter != m_staffNs.end(); ++iter) {

diff --git a/src/adjustxposfunctor.cpp b/src/adjustxposfunctor.cpp
@@ -214,9 +214,8 @@ FunctorCode AdjustXPosFunctor::VisitMeasure(Measure *measure)
 
     const bool hasSystemStartLine = measure->IsFirstInSystem() && system->GetDrawingScoreDef()->HasSystemStartLine();
 
-    Filters *previousFilters = this->GetFilters();
     Filters filters;
-    this->SetFilters(&filters);
+    Filters *previousFilters = this->SetFilters(&filters);
 
     for (auto staffN : m_staffNs) {
         m_minPos = 0;

diff --git a/src/convertfunctor.cpp b/src/convertfunctor.cpp
@@ -294,9 +294,8 @@ FunctorCode ConvertToCastOffMensuralFunctor::VisitMeasure(Measure *measure)
     }
     m_targetSubSystem->AddChild(targetMeasure);
 
-    Filters *previousFilters = this->GetFilters();
     Filters filters;
-    this->SetFilters(&filters);
+    Filters *previousFilters = this->SetFilters(&filters);
 
     // Now we can process by layer and move their content to (measure) segments
     for (const auto &staves : m_layerTree->child) {