diff options
author | Katarina Behrens <Katarina.Behrens@cib.de> | 2018-04-19 17:09:14 +0200 |
---|---|---|
committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2018-06-01 10:06:25 +0200 |
commit | 2f0e0579fac7199b693c35771246cdcdd065d104 (patch) | |
tree | 6996299dd638c18fab1a21aa4c64372d4ee18574 /vcl | |
parent | 76d48abc6b47542d06ee06de72985da2a43999e1 (diff) |
Kill GraphicsHolder with fire
Change-Id: I6bcdb872a1c7279bd08fbbfecd582e698532e0b3
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/unx/kde5/KDE5SalFrame.cxx | 24 | ||||
-rw-r--r-- | vcl/unx/kde5/KDE5SalFrame.hxx | 16 |
2 files changed, 0 insertions, 40 deletions
diff --git a/vcl/unx/kde5/KDE5SalFrame.cxx b/vcl/unx/kde5/KDE5SalFrame.cxx index 61d12bf3b367..138ac1bd8191 100644 --- a/vcl/unx/kde5/KDE5SalFrame.cxx +++ b/vcl/unx/kde5/KDE5SalFrame.cxx @@ -335,28 +335,4 @@ void KDE5SalFrame::ReleaseGraphics( SalGraphics* pSalGraph ) m_bGraphicsInUse = false; } -void KDE5SalFrame::updateGraphics( bool bClear ) -{ - vcl::Window* pWindow = GetWindow(); - for( int i = 0; i < nMaxGraphics; i++ ) - { - /*if( m_aGraphics[i].bInUse ) - m_aGraphics[i].pGraphics->SetDrawable( aDrawable, GetScreenNumber() );*/ - } -} - -cairo_t* KDE5SalFrame::getCairoContext() const -{ - for( int i = 0; i < nMaxGraphics; i++ ) - { - if( ! m_aGraphics[i].bInUse ) - { - cairo_t* cr = cairo_create( m_aGraphics[i].pSurface ); - assert(cr); - return cr; - } - } -} - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/kde5/KDE5SalFrame.hxx b/vcl/unx/kde5/KDE5SalFrame.hxx index 2066b443e19f..64f43867a8d4 100644 --- a/vcl/unx/kde5/KDE5SalFrame.hxx +++ b/vcl/unx/kde5/KDE5SalFrame.hxx @@ -20,7 +20,6 @@ #pragma once #include <memory> -#include <cairo.h> #undef Status @@ -36,18 +35,6 @@ class KDE5SalGraphics; class KDE5SalFrame : public Qt5Frame { private: - static const int nMaxGraphics = 2; - - struct GraphicsHolder - { - std::unique_ptr<KDE5SalGraphics> pGraphics; - bool bInUse; - cairo_surface_t* pSurface; - - GraphicsHolder() : bInUse( false ), pSurface(nullptr) {} - }; - - GraphicsHolder m_aGraphics[ nMaxGraphics ]; std::unique_ptr<KDE5SalGraphics> m_pKDE5Graphics; bool m_bGraphicsInUse; @@ -56,7 +43,6 @@ class KDE5SalFrame : public Qt5Frame virtual SalGraphics* AcquireGraphics() override; virtual void ReleaseGraphics( SalGraphics *pGraphics ) override; - void updateGraphics( bool bClear ); virtual void UpdateSettings( AllSettings& rSettings ) override; virtual void DrawMenuBar() override { return; } @@ -68,8 +54,6 @@ class KDE5SalFrame : public Qt5Frame virtual KeyIndicatorState GetIndicatorState() override { return KeyIndicatorState(); } virtual void SetScreenNumber( unsigned int ) override { return; } - - cairo_t* getCairoContext() const; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |