From 941373f56aabd5ee42615e7334a2c8ecb333fc92 Mon Sep 17 00:00:00 2001 From: Katarina Behrens Date: Fri, 22 Sep 2017 15:24:30 +0200 Subject: kde5: rename KDESalGraphics too Change-Id: I1a1625428cca0be7ece5fb4604aaacef4967a405 --- vcl/unx/kde5/KDE5SalFrame.cxx | 2 +- vcl/unx/kde5/KDE5SalGraphics.cxx | 8 ++++---- vcl/unx/kde5/KDE5SalGraphics.hxx | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/vcl/unx/kde5/KDE5SalFrame.cxx b/vcl/unx/kde5/KDE5SalFrame.cxx index 28f47f860015..73eb097bacc9 100644 --- a/vcl/unx/kde5/KDE5SalFrame.cxx +++ b/vcl/unx/kde5/KDE5SalFrame.cxx @@ -367,7 +367,7 @@ SalGraphics* KDE5SalFrame::AcquireGraphics() m_aGraphics[i].bInUse = true; if( ! m_aGraphics[i].pGraphics ) { - m_aGraphics[i].pGraphics.reset( new KDESalGraphics ); + m_aGraphics[i].pGraphics.reset( new KDE5SalGraphics ); m_aGraphics[i].pGraphics->Init( this, GetWindow(), GetScreenNumber() ); } return m_aGraphics[i].pGraphics.get(); diff --git a/vcl/unx/kde5/KDE5SalGraphics.cxx b/vcl/unx/kde5/KDE5SalGraphics.cxx index 85642f6f91df..9419dff1e018 100644 --- a/vcl/unx/kde5/KDE5SalGraphics.cxx +++ b/vcl/unx/kde5/KDE5SalGraphics.cxx @@ -70,7 +70,7 @@ QRect region2QRect( const tools::Rectangle& rControlRegion ) return QRect(rControlRegion.Left(), rControlRegion.Top(), rControlRegion.GetWidth(), rControlRegion.GetHeight()); } -bool KDESalGraphics::IsNativeControlSupported( ControlType type, ControlPart part ) +bool KDE5SalGraphics::IsNativeControlSupported( ControlType type, ControlPart part ) { switch (type) { @@ -197,7 +197,7 @@ static QRegion XRegionToQRegion( Region xr ) } #endif -bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part, +bool KDE5SalGraphics::drawNativeControl( ControlType type, ControlPart part, const tools::Rectangle& rControlRegion, ControlState nControlState, const ImplControlValue& value, const OUString& ) @@ -661,7 +661,7 @@ bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part, return returnVal; } -bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part, +bool KDE5SalGraphics::getNativeControlRegion( ControlType type, ControlPart part, const tools::Rectangle& controlRegion, ControlState controlState, const ImplControlValue& val, const OUString&, @@ -974,7 +974,7 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part, aPos was or was not inside the native widget specified by the nType/nPart combination. */ -bool KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart, +bool KDE5SalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart, const tools::Rectangle& rControlRegion, const Point& rPos, bool& rIsInside ) { diff --git a/vcl/unx/kde5/KDE5SalGraphics.hxx b/vcl/unx/kde5/KDE5SalGraphics.hxx index eb513388f369..811e4953c323 100644 --- a/vcl/unx/kde5/KDE5SalGraphics.hxx +++ b/vcl/unx/kde5/KDE5SalGraphics.hxx @@ -30,7 +30,7 @@ /** * Handles native graphics requests and performs the needed drawing operations. */ -class KDESalGraphics : public X11SalGraphics +class KDE5SalGraphics : public X11SalGraphics { public: virtual bool IsNativeControlSupported( ControlType, ControlPart ) override; -- cgit