summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2021-12-03 15:37:26 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2021-12-04 11:59:20 +0100
commitca05d480bd4456342f290f975a7353b7d9a63e95 (patch)
tree298c0b29c3bc0802cac36c635f8cffeaa9cdb8ae /include
parent0a596fbd94e1750e9d1f5cdab624c719b33c3ab4 (diff)
rename Primitive2DDecompositionVisitor methods
from "append" to "visit" The current naming comes from when I created this class as replacement for passing Primitive2DContainer around and the naming was meant to reduce code churn. But now that I'm using it more, the naming is an impediment to understanding the code. Change-Id: I4ee0156c7ffb534eac64f1c05eac6b8c67c25ab9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126321 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
-rw-r--r--include/drawinglayer/primitive2d/Primitive2DContainer.hxx10
-rw-r--r--include/drawinglayer/primitive2d/Primitive2DVisitor.hxx6
-rw-r--r--include/drawinglayer/primitive2d/groupprimitive2d.hxx2
-rw-r--r--include/drawinglayer/processor2d/baseprocessor2d.hxx6
4 files changed, 14 insertions, 10 deletions
diff --git a/include/drawinglayer/primitive2d/Primitive2DContainer.hxx b/include/drawinglayer/primitive2d/Primitive2DContainer.hxx
index c62f960bd8d0..3f41e25a2114 100644
--- a/include/drawinglayer/primitive2d/Primitive2DContainer.hxx
+++ b/include/drawinglayer/primitive2d/Primitive2DContainer.hxx
@@ -71,9 +71,13 @@ public:
{
}
- virtual void append(const Primitive2DReference&) override;
- virtual void append(const Primitive2DContainer& rSource) override;
- virtual void append(Primitive2DContainer&& rSource) override;
+ virtual void visit(const Primitive2DReference& rSource) override { append(rSource); }
+ virtual void visit(const Primitive2DContainer& rSource) override { append(rSource); }
+ virtual void visit(Primitive2DContainer&& rSource) override { append(std::move(rSource)); }
+
+ void append(const Primitive2DReference&);
+ void append(const Primitive2DContainer& rSource);
+ void append(Primitive2DContainer&& rSource);
void append(const Primitive2DSequence& rSource);
Primitive2DContainer& operator=(const Primitive2DContainer& r)
{
diff --git a/include/drawinglayer/primitive2d/Primitive2DVisitor.hxx b/include/drawinglayer/primitive2d/Primitive2DVisitor.hxx
index dfe04b32a320..70c7171ce010 100644
--- a/include/drawinglayer/primitive2d/Primitive2DVisitor.hxx
+++ b/include/drawinglayer/primitive2d/Primitive2DVisitor.hxx
@@ -30,9 +30,9 @@ class Primitive2DContainer;
class DRAWINGLAYER_DLLPUBLIC Primitive2DDecompositionVisitor
{
public:
- virtual void append(const Primitive2DReference&) = 0;
- virtual void append(const Primitive2DContainer&) = 0;
- virtual void append(Primitive2DContainer&&) = 0;
+ virtual void visit(const Primitive2DReference&) = 0;
+ virtual void visit(const Primitive2DContainer&) = 0;
+ virtual void visit(Primitive2DContainer&&) = 0;
virtual ~Primitive2DDecompositionVisitor() {}
};
diff --git a/include/drawinglayer/primitive2d/groupprimitive2d.hxx b/include/drawinglayer/primitive2d/groupprimitive2d.hxx
index d2110ed0b3aa..52d4fb4eb13b 100644
--- a/include/drawinglayer/primitive2d/groupprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/groupprimitive2d.hxx
@@ -73,7 +73,7 @@ namespace drawinglayer::primitive2d
/// data read access
const Primitive2DContainer& getChildren() const { return maChildren; }
- void getChildren(Primitive2DDecompositionVisitor& rVisitor) const { rVisitor.append(maChildren); }
+ void getChildren(Primitive2DDecompositionVisitor& rVisitor) const { rVisitor.visit(maChildren); }
/// compare operator
virtual bool operator==( const BasePrimitive2D& rPrimitive ) const override;
diff --git a/include/drawinglayer/processor2d/baseprocessor2d.hxx b/include/drawinglayer/processor2d/baseprocessor2d.hxx
index 4f1515109a77..7ab7186308f1 100644
--- a/include/drawinglayer/processor2d/baseprocessor2d.hxx
+++ b/include/drawinglayer/processor2d/baseprocessor2d.hxx
@@ -176,9 +176,9 @@ namespace drawinglayer::processor2d
void process(const primitive2d::BasePrimitive2D& rCandidate);
// Primitive2DDecompositionVisitor
- virtual void append(const primitive2d::Primitive2DReference&) override final;
- virtual void append(const primitive2d::Primitive2DContainer&) override final;
- virtual void append(primitive2d::Primitive2DContainer&&) override final;
+ virtual void visit(const primitive2d::Primitive2DReference&) override final;
+ virtual void visit(const primitive2d::Primitive2DContainer&) override final;
+ virtual void visit(primitive2d::Primitive2DContainer&&) override final;
public:
/// constructor/destructor