Kaydet (Commit) 2f1a28cf authored tarafından Takeshi Abe's avatar Takeshi Abe Kaydeden (comit) Caolán McNamara

fdo#75757: remove inheritance to std::vector

from LayeredDevice::LayerContainer.

Change-Id: Icc4b16db92daadbd742e83e90c95477c0c465f5b
Reviewed-on: https://gerrit.libreoffice.org/11397Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 884229ed
...@@ -130,11 +130,31 @@ typedef ::boost::shared_ptr<Layer> SharedLayer; ...@@ -130,11 +130,31 @@ typedef ::boost::shared_ptr<Layer> SharedLayer;
} // end of anonymous namespace } // end of anonymous namespace
class LayeredDevice::LayerContainer : public ::std::vector<SharedLayer> class LayeredDevice::LayerContainer
{ {
public: public:
LayerContainer (void) {} LayerContainer() : mvLayers() {}
~LayerContainer (void) {}
bool empty() const { return mvLayers.empty(); }
size_t size() const { return mvLayers.size(); }
const SharedLayer& back() const { return mvLayers.back(); }
const ::std::vector<SharedLayer>::const_iterator begin() const { return mvLayers.begin(); }
const ::std::vector<SharedLayer>::const_iterator end() const { return mvLayers.end(); }
void clear() { mvLayers.clear(); }
void pop_back() { mvLayers.pop_back(); }
void resize(size_t n) { mvLayers.resize(n); }
const SharedLayer& operator[](size_t i) const { return mvLayers[i]; }
SharedLayer& operator[](size_t i) { return mvLayers[i]; }
private:
::std::vector<SharedLayer> mvLayers;
}; };
//===== LayeredDevice ========================================================= //===== LayeredDevice =========================================================
...@@ -232,7 +252,7 @@ void LayeredDevice::RemovePainter ( ...@@ -232,7 +252,7 @@ void LayeredDevice::RemovePainter (
// Remove top most layers that do not contain any painters. // Remove top most layers that do not contain any painters.
while ( ! mpLayers->empty() && ! mpLayers->back()->HasPainter()) while ( ! mpLayers->empty() && ! mpLayers->back()->HasPainter())
mpLayers->erase(mpLayers->end()-1); mpLayers->pop_back();
} }
void LayeredDevice::Repaint (const Region& rRepaintRegion) void LayeredDevice::Repaint (const Region& rRepaintRegion)
......
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