Kaydet (Commit) 2ae289d6 authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:useuniqueptr in GlyphCacheHolder

Change-Id: I09aca185c6ca2efee037225e9924876030f47efe
Reviewed-on: https://gerrit.libreoffice.org/53705Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst eef7d161
...@@ -61,29 +61,24 @@ namespace ...@@ -61,29 +61,24 @@ namespace
struct GlyphCacheHolder struct GlyphCacheHolder
{ {
private: private:
X11GlyphCache* m_pX11GlyphCache; std::unique_ptr<X11GlyphCache> m_pX11GlyphCache;
GlyphCacheHolder(const GlyphCacheHolder&) = delete; GlyphCacheHolder(const GlyphCacheHolder&) = delete;
GlyphCacheHolder& operator=(const GlyphCacheHolder&) = delete; GlyphCacheHolder& operator=(const GlyphCacheHolder&) = delete;
public: public:
GlyphCacheHolder() GlyphCacheHolder()
: m_pX11GlyphCache(new X11GlyphCache)
{ {
m_pX11GlyphCache = new X11GlyphCache;
} }
void release() void release()
{ {
delete m_pX11GlyphCache; m_pX11GlyphCache.reset();
m_pX11GlyphCache = nullptr;
} }
X11GlyphCache& getGlyphCache() X11GlyphCache& getGlyphCache()
{ {
return *m_pX11GlyphCache; return *m_pX11GlyphCache;
} }
~GlyphCacheHolder()
{
release();
}
}; };
struct theGlyphCacheHolder : struct theGlyphCacheHolder :
......
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