Kaydet (Commit) 969531f5 authored tarafından Julien Nabet's avatar Julien Nabet

Replace lists by vectors (canvas)

Change-Id: I4695b1f1095a6324632f48727274bdfdcc63720b
Reviewed-on: https://gerrit.libreoffice.org/44298Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: 's avatarJulien Nabet <serval2412@yahoo.fr>
Tested-by: 's avatarJulien Nabet <serval2412@yahoo.fr>
üst 2345f008
......@@ -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;
......
......@@ -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 );
......
......@@ -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,
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment