diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-02-06 09:46:57 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-02-06 16:45:13 +0000 |
commit | c7258cfccdf9f4c5235da1b135801f957a5b0ec1 (patch) | |
tree | d5af5085ad1327afe2d41045ea452e017fea1fb6 /vcl/inc/generic | |
parent | 027c383584bff4ea2aa7aa2b9e294e614087f28f (diff) |
shared_ptr<T>(new T(args)) -> make_shared<T>(args)
and boost:make_shared->std::make_shared
Change-Id: Ic1e187c52c856a7b27817967b2caa8920f23a98d
Diffstat (limited to 'vcl/inc/generic')
-rw-r--r-- | vcl/inc/generic/glyphcache.hxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx index b5e8d75cfd54..382e70c5206a 100644 --- a/vcl/inc/generic/glyphcache.hxx +++ b/vcl/inc/generic/glyphcache.hxx @@ -26,8 +26,6 @@ #include FT_FREETYPE_H #include FT_GLYPH_H -#include <boost/shared_ptr.hpp> - #include <basebmp/bitmapdevice.hxx> #include <com/sun/star/i18n/XBreakIterator.hpp> #include <tools/gen.hxx> @@ -176,8 +174,8 @@ public: bool TestFont() const { return mbFaceOk;} FT_Face GetFtFace() const; int GetLoadFlags() const { return (mnLoadFlags & ~FT_LOAD_IGNORE_TRANSFORM); } - void SetFontOptions( boost::shared_ptr<ImplFontOptions> ); - boost::shared_ptr<ImplFontOptions> GetFontOptions() const; + void SetFontOptions(std::shared_ptr<ImplFontOptions>); + std::shared_ptr<ImplFontOptions> GetFontOptions() const; bool NeedsArtificialBold() const { return mbArtBold; } bool NeedsArtificialItalic() const { return mbArtItalic; } @@ -255,7 +253,7 @@ private: FT_FaceRec_* maFaceFT; FT_SizeRec_* maSizeFT; - boost::shared_ptr<ImplFontOptions> mpFontOptions; + std::shared_ptr<ImplFontOptions> mxFontOptions; bool mbFaceOk; bool mbArtItalic; @@ -280,7 +278,7 @@ public: private: ServerFont* mpServerFont; - boost::shared_ptr<ImplFontOptions> mpFontOptions; + std::shared_ptr<ImplFontOptions> mxFontOptions; bool mbGotFontOptions; }; |