[Libreoffice-commits] core.git: canvas/source include/canvas

[Julien Nabet]

 canvas/source/tools/page.hxx                |    3 +--
 canvas/source/tools/pagemanager.hxx         |    4 ++--
 canvas/source/tools/spriteredrawmanager.cxx |    2 +-
 include/canvas/spriteredrawmanager.hxx      |    4 +---
 4 files changed, 5 insertions(+), 8 deletions(-)

New commits:
commit 969531f53696417c80f9823e89eda2d5d594898e
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sat Nov 4 14:57:11 2017 +0100

    Replace lists by vectors (canvas)
    
    Change-Id: I4695b1f1095a6324632f48727274bdfdcc63720b
    Reviewed-on: https://gerrit.libreoffice.org/44298
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Tested-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/canvas/source/tools/page.hxx b/canvas/source/tools/page.hxx
index 70ee866d3cb4..d063c7a0f716 100644
--- a/canvas/source/tools/page.hxx
+++ b/canvas/source/tools/page.hxx
@@ -26,7 +26,6 @@
 #include <canvas/rendering/irendermodule.hxx>
 #include <canvas/rendering/isurface.hxx>
 
-#include <list>
 #include <memory>
 #include <vector>
 #include "surfacerect.hxx"
@@ -52,7 +51,7 @@ namespace canvas
         void                     validate();
 
     private:
-        typedef std::list<FragmentSharedPtr> FragmentContainer_t;
+        typedef std::vector<FragmentSharedPtr> FragmentContainer_t;
 
         std::shared_ptr<IRenderModule>  mpRenderModule;
         std::shared_ptr<ISurface>       mpSurface;
diff --git a/canvas/source/tools/pagemanager.hxx b/canvas/source/tools/pagemanager.hxx
index d89754d51ec6..3fae17b04008 100644
--- a/canvas/source/tools/pagemanager.hxx
+++ b/canvas/source/tools/pagemanager.hxx
@@ -57,12 +57,12 @@ namespace canvas
 
         // here we collect all fragments that will be created
         // since we need them for relocation purposes.
-        typedef std::list<FragmentSharedPtr> FragmentContainer_t;
+        typedef std::vector<FragmentSharedPtr> FragmentContainer_t;
         FragmentContainer_t maFragments;
 
         // this is the container holding all created pages,
         // behind the scenes these are real hardware surfaces.
-        typedef std::list<PageSharedPtr> PageContainer_t;
+        typedef std::vector<PageSharedPtr> PageContainer_t;
         PageContainer_t maPages;
 
         bool relocate( const FragmentSharedPtr& pFragment );
diff --git a/canvas/source/tools/spriteredrawmanager.cxx b/canvas/source/tools/spriteredrawmanager.cxx
index c4e1af8c4337..ee1d5d2b092f 100644
--- a/canvas/source/tools/spriteredrawmanager.cxx
+++ b/canvas/source/tools/spriteredrawmanager.cxx
@@ -460,7 +460,7 @@ namespace canvas
 
     void SpriteRedrawManager::hideSprite( const Sprite::Reference& rSprite )
     {
-        maSprites.remove( rSprite );
+        maSprites.erase(std::remove(maSprites.begin(), maSprites.end(), rSprite), maSprites.end());
     }
 
     void SpriteRedrawManager::moveSprite( const Sprite::Reference&      rSprite,
diff --git a/include/canvas/spriteredrawmanager.hxx b/include/canvas/spriteredrawmanager.hxx
index 1329e010147b..4e0d2ba872e2 100644
--- a/include/canvas/spriteredrawmanager.hxx
+++ b/include/canvas/spriteredrawmanager.hxx
@@ -28,7 +28,6 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <canvas/base/spritesurface.hxx>
 
-#include <list>
 #include <vector>
 #include <algorithm>
 
@@ -186,7 +185,6 @@ namespace canvas
         };
 
         typedef ::std::vector< SpriteChangeRecord >             VectorOfChangeRecords;
-        typedef ::std::list< Sprite::Reference >                ListOfSprites;
         typedef ::basegfx::B2DConnectedRanges< SpriteInfo >     SpriteConnectedRanges;
         typedef SpriteConnectedRanges::ComponentType            AreaComponent;
         typedef SpriteConnectedRanges::ConnectedComponents      UpdateArea;
@@ -402,7 +400,7 @@ namespace canvas
                                  ::std::size_t          nNumSprites ) const;
 
 
-        ListOfSprites                   maSprites; // list of active
+        VectorOfSprites                 maSprites; // list of active
                                                    // sprite
                                                    // objects. this
                                                    // list is only