summaryrefslogtreecommitdiff
path: root/vcl/unx
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/unx')
-rw-r--r--vcl/unx/generic/gdi/salgdi.cxx12
-rw-r--r--vcl/unx/generic/gdi/xrender_peer.hxx4
-rw-r--r--vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx4
-rw-r--r--vcl/unx/kde/salnativewidgets-kde.cxx2
-rw-r--r--vcl/unx/kde4/KDE4FilePicker.cxx2
-rw-r--r--vcl/unx/kde4/KDEData.cxx2
-rw-r--r--vcl/unx/kde4/KDESalFrame.cxx2
-rw-r--r--vcl/unx/kde4/KDESalGraphics.cxx10
-rw-r--r--vcl/unx/kde4/KDESalGraphics.hxx2
-rw-r--r--vcl/unx/kde4/KDEXLib.cxx2
-rw-r--r--vcl/unx/kde4/VCLKDEApplication.hxx2
-rw-r--r--vcl/unx/kde4/main.cxx2
12 files changed, 23 insertions, 23 deletions
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index 10d374652d4c..d4c934c0f29a 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -225,12 +225,12 @@ void X11SalGraphics::DeInit()
SetDrawable( None, m_nXScreen );
}
-void X11SalGraphics::SetClipRegion( GC pGC, XLIB_Region pXReg ) const
+void X11SalGraphics::SetClipRegion( GC pGC, Region pXReg ) const
{
Display *pDisplay = GetXDisplay();
int n = 0;
- XLIB_Region Regions[3];
+ Region Regions[3];
if( mpClipRegion )
Regions[n++] = mpClipRegion;
@@ -244,7 +244,7 @@ void X11SalGraphics::SetClipRegion( GC pGC, XLIB_Region pXReg ) const
XSetRegion( pDisplay, pGC, Regions[0] );
else
{
- XLIB_Region pTmpRegion = XCreateRegion();
+ Region pTmpRegion = XCreateRegion();
XIntersectRegion( Regions[0], Regions[1], pTmpRegion );
XSetRegion( pDisplay, pGC, pTmpRegion );
@@ -548,7 +548,7 @@ void X11SalGraphics::ResetClipRegion()
}
}
-bool X11SalGraphics::setClipRegion( const Region& i_rClip )
+bool X11SalGraphics::setClipRegion( const vcl::Region& i_rClip )
{
if( mpClipRegion )
XDestroyRegion( mpClipRegion );
@@ -884,14 +884,14 @@ void X11SalGraphics::drawPolyPolygon( sal_uInt32 nPoly,
if( nBrushColor_ != SALCOLOR_NONE )
{
sal_uInt32 i, n;
- XLIB_Region pXRegA = NULL;
+ Region pXRegA = NULL;
for( i = 0; i < nPoly; i++ ) {
n = pPoints[i];
SalPolyLine Points( n, pPtAry[i] );
if( n > 2 )
{
- XLIB_Region pXRegB = XPolygonRegion( &Points[0], n+1, WindingRule );
+ Region pXRegB = XPolygonRegion( &Points[0], n+1, WindingRule );
if( !pXRegA )
pXRegA = pXRegB;
else
diff --git a/vcl/unx/generic/gdi/xrender_peer.hxx b/vcl/unx/generic/gdi/xrender_peer.hxx
index cb71889bb7f9..84622e80c4ce 100644
--- a/vcl/unx/generic/gdi/xrender_peer.hxx
+++ b/vcl/unx/generic/gdi/xrender_peer.hxx
@@ -54,7 +54,7 @@ public:
unsigned long nDrawable, const XRenderPictureAttributes* ) const;
void ChangePicture( Picture, unsigned long nValueMask,
const XRenderPictureAttributes* ) const;
- void SetPictureClipRegion( Picture, XLIB_Region ) const;
+ void SetPictureClipRegion( Picture, Region ) const;
void CompositePicture( int nOp, Picture aSrc, Picture aMask, Picture aDst,
int nXSrc, int nYSrc, int nXMask, int nYMask,
int nXDst, int nYDst, unsigned nWidth, unsigned nHeight ) const;
@@ -112,7 +112,7 @@ inline void XRenderPeer::ChangePicture( Picture aPicture,
}
inline void XRenderPeer::SetPictureClipRegion( Picture aPicture,
- XLIB_Region aXlibRegion ) const
+ Region aXlibRegion ) const
{
XRenderSetPictureClipRegion( mpDisplay, aPicture, aXlibRegion );
}
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index ffacb587dc90..ee623bcd817b 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -512,7 +512,7 @@ void GtkSalGraphics::ResetClipRegion()
X11SalGraphics::ResetClipRegion();
}
-bool GtkSalGraphics::setClipRegion( const Region& i_rClip )
+bool GtkSalGraphics::setClipRegion( const vcl::Region& i_rClip )
{
m_aClipRegion = i_rClip;
bool bRet = X11SalGraphics::setClipRegion( m_aClipRegion );
@@ -795,7 +795,7 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType,
}
Rectangle aCtrlRect( rControlRegion );
- Region aClipRegion( m_aClipRegion );
+ vcl::Region aClipRegion( m_aClipRegion );
if( aClipRegion.IsNull() )
aClipRegion = aCtrlRect;
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx
index c4e16c3c8a89..c3eac7281305 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -1704,7 +1704,7 @@ bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar
Size aBSize( qBoundingRect.width(), qBoundingRect.height() );
rNativeBoundingRegion = Rectangle( aBPoint, aBSize );
- // Region of the content
+ // vcl::Region of the content
Point aPoint( qRect.x(), qRect.y() );
Size aSize( qRect.width(), qRect.height() );
rNativeContentRegion = Rectangle( aPoint, aSize );
diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
index 17ae41c76f09..04d6239656b5 100644
--- a/vcl/unx/kde4/KDE4FilePicker.cxx
+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
@@ -41,7 +41,7 @@
#include "VCLKDEApplication.hxx"
/* ********* Hack, but needed because of conflicting types... */
-#define Region QtXRegion
+#define vcl::Region QtXRegion
#include <kfiledialog.h>
#include <kwindowsystem.h>
diff --git a/vcl/unx/kde4/KDEData.cxx b/vcl/unx/kde4/KDEData.cxx
index fbf1d8e7d844..32c5b1f366f5 100644
--- a/vcl/unx/kde4/KDEData.cxx
+++ b/vcl/unx/kde4/KDEData.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#define Region QtXRegion
+#define vcl::Region QtXRegion
#include <QStyle>
#include <kapplication.h>
diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx
index b67b3eda0850..ad4cb7ccaeb5 100644
--- a/vcl/unx/kde4/KDESalFrame.cxx
+++ b/vcl/unx/kde4/KDESalFrame.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#define Region QtXRegion
+#define vcl::Region QtXRegion
#include <QColor>
#include <QStyle>
diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index 05b08a1da386..98f5280609fc 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#define Region QtXRegion
+#define vcl::Region QtXRegion
#include <QStyle>
#include <QStyleOption>
@@ -198,7 +198,7 @@ namespace
#ifdef IMAGE_BASED_PAINTING
// There is a small catch with this function, although hopefully only philosophical.
-// Officially Xlib's Region is an opaque data type, with only functions for manipulating it.
+// Officially Xlib's vcl::Region is an opaque data type, with only functions for manipulating it.
// However, whoever designed it apparently didn't give it that much thought, as it's impossible
// to find out what exactly a region actually is (except for really weird ways like XClipBox()
// and repeated XPointInRegion(), which would be awfully slow). Fortunately, the header file
@@ -209,7 +209,7 @@ namespace
// without IMAGE_BASED_PAINTING (in which case QApplication::setGraphicsSystem( "native" ) may
// be needed too).
#include <X11/Xregion.h>
-static QRegion XRegionToQRegion( XLIB_Region xr )
+static QRegion XRegionToQRegion( Region xr )
{
QRegion qr;
for( int i = 0;
@@ -615,7 +615,7 @@ bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
GC gc = GetFontGC();
if( gc )
{
- XLIB_Region pTempClipRegion = NULL;
+ Region pTempClipRegion = NULL;
if( clipRegion )
{
pTempClipRegion = XCreateRegion();
@@ -933,7 +933,7 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part,
Size aBSize( boundingRect.width(), boundingRect.height() );
nativeBoundingRegion = Rectangle( aBPoint, aBSize );
- // Region of the content
+ // vcl::Region of the content
Point aPoint( contentRect.x(), contentRect.y() );
Size aSize( contentRect.width(), contentRect.height() );
nativeContentRegion = Rectangle( aPoint, aSize );
diff --git a/vcl/unx/kde4/KDESalGraphics.hxx b/vcl/unx/kde4/KDESalGraphics.hxx
index 768b133dbc72..d6e9a763bbeb 100644
--- a/vcl/unx/kde4/KDESalGraphics.hxx
+++ b/vcl/unx/kde4/KDESalGraphics.hxx
@@ -23,7 +23,7 @@
#include <unx/saldisp.hxx>
#include <unx/salgdi.h>
-#define Region QtXRegion
+#define vcl::Region QtXRegion
#include <QImage>
#undef Region
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
index 1ee9a67d618c..cf2bf2df4dab 100644
--- a/vcl/unx/kde4/KDEXLib.cxx
+++ b/vcl/unx/kde4/KDEXLib.cxx
@@ -420,7 +420,7 @@ uno::Reference< ui::dialogs::XFilePicker2 > KDEXLib::createFilePicker(
#endif
}
-#define Region QtXRegion
+#define vcl::Region QtXRegion
#include <qframe.h>
#undef Region
diff --git a/vcl/unx/kde4/VCLKDEApplication.hxx b/vcl/unx/kde4/VCLKDEApplication.hxx
index f1fddfca00ea..6db63217b81b 100644
--- a/vcl/unx/kde4/VCLKDEApplication.hxx
+++ b/vcl/unx/kde4/VCLKDEApplication.hxx
@@ -23,7 +23,7 @@
#include <sal/types.h>
-#define Region QtXRegion
+#define vcl::Region QtXRegion
#include <kapplication.h>
diff --git a/vcl/unx/kde4/main.cxx b/vcl/unx/kde4/main.cxx
index f4f9775dfdac..a20180013709 100644
--- a/vcl/unx/kde4/main.cxx
+++ b/vcl/unx/kde4/main.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#define Region QtXRegion
+#define vcl::Region QtXRegion
#include <QApplication>
#undef Region
generated by cgit (git 2.34.1) at 2024-08-21 02:15:11 +0000