diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-03-31 09:17:08 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-03-31 09:17:41 +0200 |
commit | 02ee5378ef95c54d83202468f939faf6d286ea42 (patch) | |
tree | fe01c09cb530fda8d734a6829481d9be5ba0c947 /vcl/unx/kde4 | |
parent | b57af3320fe7230dbcf5a0f6577e05bb5ec046cc (diff) |
vcl kde4: adapt to tools::Rectangle
Change-Id: I047a69bd084f44c7bc7a132eddf2ee09e811d783
Diffstat (limited to 'vcl/unx/kde4')
-rw-r--r-- | vcl/unx/kde4/KDESalGraphics.cxx | 18 | ||||
-rw-r--r-- | vcl/unx/kde4/KDESalGraphics.hxx | 8 |
2 files changed, 13 insertions, 13 deletions
diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx index dff19790f96c..f58240ea3aec 100644 --- a/vcl/unx/kde4/KDESalGraphics.cxx +++ b/vcl/unx/kde4/KDESalGraphics.cxx @@ -63,11 +63,11 @@ QStyle::State vclStateValue2StateFlag( ControlState nControlState, } /** - Convert VCL Rectangle to QRect. - @param rControlRegion The Rectangle to convert. + Convert tools::Rectangle to QRect. + @param rControlRegion The tools::Rectangle to convert. @return The matching QRect */ -QRect region2QRect( const Rectangle& rControlRegion ) +QRect region2QRect( const tools::Rectangle& rControlRegion ) { return QRect(rControlRegion.Left(), rControlRegion.Top(), rControlRegion.GetWidth(), rControlRegion.GetHeight()); } @@ -200,7 +200,7 @@ static QRegion XRegionToQRegion( Region xr ) #endif bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part, - const Rectangle& rControlRegion, ControlState nControlState, + const tools::Rectangle& rControlRegion, ControlState nControlState, const ImplControlValue& value, const OUString& ) { @@ -662,10 +662,10 @@ bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part, } bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part, - const Rectangle& controlRegion, ControlState controlState, + const tools::Rectangle& controlRegion, ControlState controlState, const ImplControlValue& val, const OUString&, - Rectangle &nativeBoundingRegion, Rectangle &nativeContentRegion ) + tools::Rectangle &nativeBoundingRegion, tools::Rectangle &nativeContentRegion ) { bool retVal = false; @@ -958,12 +958,12 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part, // Bounding region Point aBPoint( boundingRect.x(), boundingRect.y() ); Size aBSize( boundingRect.width(), boundingRect.height() ); - nativeBoundingRegion = Rectangle( aBPoint, aBSize ); + nativeBoundingRegion = tools::Rectangle( aBPoint, aBSize ); // vcl::Region of the content Point aPoint( contentRect.x(), contentRect.y() ); Size aSize( contentRect.width(), contentRect.height() ); - nativeContentRegion = Rectangle( aPoint, aSize ); + nativeContentRegion = tools::Rectangle( aPoint, aSize ); } return retVal; @@ -975,7 +975,7 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part, nType/nPart combination. */ bool KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart, - const Rectangle& rControlRegion, const Point& rPos, + const tools::Rectangle& rControlRegion, const Point& rPos, bool& rIsInside ) { if ( nType == ControlType::Scrollbar ) diff --git a/vcl/unx/kde4/KDESalGraphics.hxx b/vcl/unx/kde4/KDESalGraphics.hxx index 501fbe3ba679..eb513388f369 100644 --- a/vcl/unx/kde4/KDESalGraphics.hxx +++ b/vcl/unx/kde4/KDESalGraphics.hxx @@ -36,14 +36,14 @@ public: virtual bool IsNativeControlSupported( ControlType, ControlPart ) override; virtual bool hitTestNativeControl( ControlType, ControlPart, - const Rectangle&, const Point&, bool& ) override; + const tools::Rectangle&, const Point&, bool& ) override; - virtual bool drawNativeControl( ControlType, ControlPart, const Rectangle&, + virtual bool drawNativeControl( ControlType, ControlPart, const tools::Rectangle&, ControlState, const ImplControlValue&, const OUString& ) override; - virtual bool getNativeControlRegion( ControlType, ControlPart, const Rectangle&, + virtual bool getNativeControlRegion( ControlType, ControlPart, const tools::Rectangle&, ControlState, const ImplControlValue&, - const OUString&, Rectangle&, Rectangle& ) override; + const OUString&, tools::Rectangle&, tools::Rectangle& ) override; private: std::unique_ptr<QImage> m_image; |