From df415a4f2e9cb02da13aa357608c48d2c85da231 Mon Sep 17 00:00:00 2001 From: tatyanakrivonogova Date: Wed, 22 May 2024 23:20:11 +0700 Subject: [PATCH] UP-14 Method InsertFront() deleted --- include/document/glyphs/button.h | 1 - include/document/glyphs/character.h | 1 - include/document/glyphs/column.h | 1 - include/document/glyphs/glyph.h | 6 ------ include/document/glyphs/glyph_container.h | 1 - include/document/glyphs/monoglyph.h | 1 - include/document/glyphs/page.h | 1 - include/document/glyphs/row.h | 7 ------- src/document/glyphs/column.cpp | 4 ---- src/document/glyphs/monoglyph.cpp | 5 ----- src/document/glyphs/page.cpp | 4 ---- src/document/glyphs/row.cpp | 5 ----- 12 files changed, 37 deletions(-) diff --git a/include/document/glyphs/button.h b/include/document/glyphs/button.h index b66305c..7b95793 100644 --- a/include/document/glyphs/button.h +++ b/include/document/glyphs/button.h @@ -24,7 +24,6 @@ class Button : public Glyph { void Draw() override; void Insert(GlyphPtr& glyph) override {} - void InsertFront(GlyphPtr& glyph) override {} void Remove(const GlyphPtr& glyph) override {} void Add(GlyphPtr) override {} diff --git a/include/document/glyphs/character.h b/include/document/glyphs/character.h index 1642d30..b4336aa 100644 --- a/include/document/glyphs/character.h +++ b/include/document/glyphs/character.h @@ -25,7 +25,6 @@ class Character : public Glyph { Glyph::GlyphList Select(const Glyph::GlyphPtr& area) override {} void Insert(GlyphPtr& glyph) override {} - void InsertFront(GlyphPtr& glyph) override {} void Remove(const GlyphPtr& glyph) override {} void Add(GlyphPtr) override {} diff --git a/include/document/glyphs/column.h b/include/document/glyphs/column.h index 019bb2d..fe7e66b 100644 --- a/include/document/glyphs/column.h +++ b/include/document/glyphs/column.h @@ -27,7 +27,6 @@ class Column : public GlyphContainer { Glyph::GlyphList Select(const Glyph::GlyphPtr& area) override; void Insert(GlyphPtr& glyph) override; - void InsertFront(GlyphPtr& glyph) override; void Remove(const GlyphPtr& glyph) override; std::shared_ptr Clone() const override; diff --git a/include/document/glyphs/glyph.h b/include/document/glyphs/glyph.h index 64b2152..4695f4f 100644 --- a/include/document/glyphs/glyph.h +++ b/include/document/glyphs/glyph.h @@ -66,12 +66,6 @@ class Glyph { */ virtual void Insert(GlyphPtr& glyph) = 0; - /** - * @brief Inserts a glyph at the beginning of the line. - * @param glyph Pointer to the glyph. - */ - virtual void InsertFront(GlyphPtr& glyph) = 0; - /** * @brief Removes the glyph passed by the pointer from the * document. diff --git a/include/document/glyphs/glyph_container.h b/include/document/glyphs/glyph_container.h index a5bde8b..362b133 100644 --- a/include/document/glyphs/glyph_container.h +++ b/include/document/glyphs/glyph_container.h @@ -16,7 +16,6 @@ class GlyphContainer : public Glyph { void Draw() override; virtual void Insert(GlyphPtr& glyph) = 0; - virtual void InsertFront(GlyphPtr& glyph) = 0; virtual void Remove(const GlyphPtr& glyph) = 0; void Add(GlyphPtr glyph) override; diff --git a/include/document/glyphs/monoglyph.h b/include/document/glyphs/monoglyph.h index addbd06..9c15f68 100644 --- a/include/document/glyphs/monoglyph.h +++ b/include/document/glyphs/monoglyph.h @@ -22,7 +22,6 @@ class MonoGlyph : public Glyph { Glyph::GlyphList Select(const Glyph::GlyphPtr& area) override; void Insert(GlyphPtr& glyph) override; - void InsertFront(GlyphPtr& glyph) override; void Remove(const GlyphPtr& glyph) override; void Add(GlyphPtr glyph) override; diff --git a/include/document/glyphs/page.h b/include/document/glyphs/page.h index 05e87f8..a81b1b3 100644 --- a/include/document/glyphs/page.h +++ b/include/document/glyphs/page.h @@ -18,7 +18,6 @@ class Page : public GlyphContainer { Glyph::GlyphList Select(const Glyph::GlyphPtr& area) override; void Insert(GlyphPtr& glyph) override; - void InsertFront(GlyphPtr& glyph) override; void Remove(const GlyphPtr& glyph) override; std::shared_ptr Clone() const override; diff --git a/include/document/glyphs/row.h b/include/document/glyphs/row.h index dc39aac..83434e8 100644 --- a/include/document/glyphs/row.h +++ b/include/document/glyphs/row.h @@ -30,13 +30,6 @@ class Row : public GlyphContainer { * @param glyph Pointer to the glyph. */ void Insert(GlyphPtr& glyph); - - /** - * @brief Inserts a glyph at the beginning of the line. - * @param glyph Pointer to the glyph. - */ - void InsertFront(GlyphPtr& glyph); - void Remove(const GlyphPtr& glyph) override; std::shared_ptr Clone() const override; diff --git a/src/document/glyphs/column.cpp b/src/document/glyphs/column.cpp index 90a5d28..d591991 100644 --- a/src/document/glyphs/column.cpp +++ b/src/document/glyphs/column.cpp @@ -42,10 +42,6 @@ void Column::Insert(GlyphPtr& glyph) { (*intersectedGlyphIt)->Insert(glyph); } -void Column::InsertFront(GlyphPtr& glyph) { - // TO DO -} - void Column::Remove(const GlyphPtr& glyph) { assert(glyph != nullptr && "Cannot remove glyph by nullptr"); auto it = std::find(components.begin(), components.end(), glyph); diff --git a/src/document/glyphs/monoglyph.cpp b/src/document/glyphs/monoglyph.cpp index ac1da2c..e02ff2d 100644 --- a/src/document/glyphs/monoglyph.cpp +++ b/src/document/glyphs/monoglyph.cpp @@ -26,11 +26,6 @@ void MonoGlyph::Insert(GlyphPtr& glyph) { component->Insert(glyph); } -void MonoGlyph::InsertFront(GlyphPtr& glyph) { - std::cout << "Monoglyph::Insert()" << std::endl; - component->InsertFront(glyph); -} - void MonoGlyph::Remove(const GlyphPtr& glyph) { std::cout << "Monoglyph::Remove()" << std::endl; component->Remove(glyph); diff --git a/src/document/glyphs/page.cpp b/src/document/glyphs/page.cpp index b3c564e..8b13c9e 100644 --- a/src/document/glyphs/page.cpp +++ b/src/document/glyphs/page.cpp @@ -43,10 +43,6 @@ void Page::Insert(GlyphPtr& glyph) { (*intersectedGlyphIt)->Insert(glyph); } -void Page::InsertFront(GlyphPtr& glyph) { - // TO DO -} - void Page::Remove(const GlyphPtr& glyph) { assert(glyph != nullptr && "Cannot remove glyph by nullptr"); auto it = std::find(components.begin(), components.end(), glyph); diff --git a/src/document/glyphs/row.cpp b/src/document/glyphs/row.cpp index 89d51dc..2498c0c 100644 --- a/src/document/glyphs/row.cpp +++ b/src/document/glyphs/row.cpp @@ -55,11 +55,6 @@ void Row::Insert(GlyphPtr& glyph) { } } -void Row::InsertFront(GlyphPtr& glyph) { - glyph->SetPosition(Point(this->GetPosition().x, this->GetPosition().y)); - this->Insert(glyph); -} - void Row::Remove(const GlyphPtr& ptr) { assert(ptr != nullptr && "Cannot remove glyph by nullptr"); auto it = std::find(components.begin(), components.end(), ptr);