diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2017-11-04 14:57:11 +0100 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2017-11-04 21:44:43 +0100 |
| commit | 969531f53696417c80f9823e89eda2d5d594898e (patch) | |
| tree | f24f9ddaed308c1a473c3605fe2e4405c144b13d /canvas | |
| parent | 2345f00899da2cb4624ab07bd92d139adcdb74e5 (diff) | |
Replace lists by vectors (canvas)
Change-Id: I4695b1f1095a6324632f48727274bdfdcc63720b
Reviewed-on: https://gerrit.libreoffice.org/44298
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Tested-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/tools/page.hxx | 3 | ||||
| -rw-r--r-- | canvas/source/tools/pagemanager.hxx | 4 | ||||
| -rw-r--r-- | canvas/source/tools/spriteredrawmanager.cxx | 2 |
3 files changed, 4 insertions, 5 deletions
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, |