diff options
Diffstat (limited to 'vcl/inc')
-rw-r--r-- | vcl/inc/qt5/Qt5Frame.hxx | 8 | ||||
-rw-r--r-- | vcl/inc/qt5/Qt5Instance.hxx | 1 |
2 files changed, 2 insertions, 7 deletions
diff --git a/vcl/inc/qt5/Qt5Frame.hxx b/vcl/inc/qt5/Qt5Frame.hxx index 54a721e03730..9b6e3811c3bb 100644 --- a/vcl/inc/qt5/Qt5Frame.hxx +++ b/vcl/inc/qt5/Qt5Frame.hxx @@ -77,17 +77,12 @@ class VCLPLUG_QT5_PUBLIC Qt5Frame : public QObject, public SalFrame std::unique_ptr<QImage> m_pQImage; std::unique_ptr<Qt5Graphics> m_pQt5Graphics; UniqueCairoSurface m_pSurface; - std::unique_ptr<Qt5SvpGraphics> m_pOurSvpGraphics; - // in base class, this ptr is the same as m_pOurSvpGraphic - // in derived class, it can point to a derivative - // of Qt5SvpGraphics (which the derived class then owns) - Qt5SvpGraphics* m_pSvpGraphics; + std::unique_ptr<Qt5SvpGraphics> m_pSvpGraphics; DamageHandler m_aDamageHandler; QRegion m_aRegion; bool m_bNullRegion; bool m_bGraphicsInUse; - bool m_bGraphicsInvalid; SalFrameStyleFlags m_nStyle; Qt5Frame* m_pParent; PointerStyle m_ePointerStyle; @@ -144,7 +139,6 @@ public: void Damage(sal_Int32 nExtentsX, sal_Int32 nExtentsY, sal_Int32 nExtentsWidth, sal_Int32 nExtentsHeight) const; - void InitQt5SvpGraphics(Qt5SvpGraphics* pQt5SvpGraphics); virtual SalGraphics* AcquireGraphics() override; virtual void ReleaseGraphics(SalGraphics* pGraphics) override; diff --git a/vcl/inc/qt5/Qt5Instance.hxx b/vcl/inc/qt5/Qt5Instance.hxx index d73a59de51c1..a2372e58f8c9 100644 --- a/vcl/inc/qt5/Qt5Instance.hxx +++ b/vcl/inc/qt5/Qt5Instance.hxx @@ -82,6 +82,7 @@ protected: virtual Qt5FilePicker* createPicker(css::uno::Reference<css::uno::XComponentContext> const& context, QFileDialog::FileMode); + bool useCairo() const { return m_bUseCairo; } public: explicit Qt5Instance(std::unique_ptr<QApplication>& pQApp, bool bUseCairo = false); |