add TODOs to rename pos() and ipos()

Element::pos() and Element::ipos() unclear and error prone semantic led to 382b7d7. SpannerSegment::pos2() and SpannerSegment::ipos2() are not good as well. I didn't apply renaming because active work is in progress.
musescore · Sep 18, 2018 · 588a4ba · 588a4ba · wschweer · Sep 19, 2018
1 parent 9037e5e
commit 588a4ba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/libmscore/element.h b/libmscore/element.h
@@ -198,7 +198,9 @@ class Element : public ScoreElement {
       bool generated() const                  { return flag(ElementFlag::GENERATED);  }
       void setGenerated(bool val)             { setFlag(ElementFlag::GENERATED, val);   }
 
+      //TODO: rename to pos()
       const QPointF& ipos() const             { return _pos;                    }
+      //TODO: rename to posWithUserOffset()
       virtual const QPointF pos() const       { return _pos + _userOff;         }
       virtual qreal x() const                 { return _pos.x() + _userOff.x(); }
       virtual qreal y() const                 { return _pos.y() + _userOff.y(); }

diff --git a/libmscore/spanner.h b/libmscore/spanner.h
@@ -82,7 +82,9 @@ class SpannerSegment : public Element {
       qreal& rUserYoffset2()                { return _userOff2.ry();  }
 
       void setPos2(const QPointF& p)        { _p2 = p;                }
+      //TODO: rename to spanSegPosWithUserOffset()
       QPointF pos2() const                  { return _p2 + _userOff2; }
+      //TODO: rename to spanSegPos()
       const QPointF& ipos2() const          { return _p2;             }
       qreal& rxpos2()                       { return _p2.rx();        }
       qreal& rypos2()                       { return _p2.ry();        }