From 69cac65817d949cda2672ec4f0aa73d5e66a0ba1 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 22 Jun 2011 00:30:31 +0000 Subject: TQt4 port kdenetwork This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kopete/libkopete/avdevice/qvideo.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kopete/libkopete/avdevice/qvideo.cpp') diff --git a/kopete/libkopete/avdevice/qvideo.cpp b/kopete/libkopete/avdevice/qvideo.cpp index d8d91602..a85589ab 100644 --- a/kopete/libkopete/avdevice/qvideo.cpp +++ b/kopete/libkopete/avdevice/qvideo.cpp @@ -64,7 +64,7 @@ unsigned int QVideo::bytesppForFormat(ImageFormat fmt) bool QVideo::findDisplayProperties(ImageFormat& fmt, int& depth, unsigned int& bitsperpixel, int& bytesperpixel) { XVisualInfo *vi_in, vi_out; - long mask = VisualScreenMask; + long tqmask = VisualScreenMask; int nvis = 0; ImageFormat p = FORMAT_NONE; @@ -72,7 +72,7 @@ bool QVideo::findDisplayProperties(ImageFormat& fmt, int& depth, unsigned int& b int d = 0; vi_out.screen = TQPaintDevice::x11AppScreen(); - vi_in = XGetVisualInfo(qt_xdisplay(), mask, &vi_out, &nvis); + vi_in = XGetVisualInfo(qt_xdisplay(), tqmask, &vi_out, &nvis); if (vi_in) { for (int i = 0; i < nvis; i++) { -- cgit v1.2.1