diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-29 09:31:34 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-02 12:33:30 +0100 |
| commit | c984fa9fcc0128f545bb1315e80d97bb888e9edf (patch) | |
| tree | b47cbac341ae371ad76e674bd59ee4d7f197d55f /vcl/inc | |
| parent | d27ef675ec23f45562972da66bde02d99d778141 (diff) | |
loplugin:useuniqueptr in X11SalFrame
Change-Id: If8693b106f8755e506375f1a65754c972971700f
Reviewed-on: https://gerrit.libreoffice.org/49129
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/unx/salframe.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h index 0bcb79721282..92bfcbfb9d31 100644 --- a/vcl/inc/unx/salframe.h +++ b/vcl/inc/unx/salframe.h @@ -83,8 +83,8 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame, public NativeWindowHandl Cursor hCursor_; int nCaptured_; // is captured - X11SalGraphics *pGraphics_; // current frame graphics - X11SalGraphics *pFreeGraphics_; // first free frame graphics + std::unique_ptr<X11SalGraphics> pGraphics_; // current frame graphics + std::unique_ptr<X11SalGraphics> pFreeGraphics_; // first free frame graphics bool mbSendExtKeyModChange; ModKeyFlags mnExtKeyMod; @@ -126,12 +126,10 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame, public NativeWindowHandl SystemEnvData maSystemChildData; - SalI18N_InputContext *mpInputContext; + std::unique_ptr<SalI18N_InputContext> mpInputContext; Bool mbInputFocus; - XRectangle* m_pClipRectangles; - int m_nCurClipRect; - int m_nMaxClipRect; + std::vector<XRectangle> m_vClipRectangles; bool mPendingSizeEvent; @@ -197,7 +195,7 @@ public: bool IsChildWindow() const { return bool(nStyle_ & (SalFrameStyleFlags::PLUG|SalFrameStyleFlags::SYSTEMCHILD)); } bool IsSysChildWindow() const { return bool(nStyle_ & SalFrameStyleFlags::SYSTEMCHILD); } bool IsFloatGrabWindow() const; - SalI18N_InputContext* getInputContext() const { return mpInputContext; } + SalI18N_InputContext* getInputContext() const { return mpInputContext.get(); } bool hasFocus() const { return mbInputFocus; } void beginUnicodeSequence(); |