diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
| commit | 2bc1d72869b62af05ae4feafd878203b526da8c5 (patch) | |
| tree | 2676903bb600bd9646644856e354940471ad84e2 /kopete/libkopete/avdevice/qvideo.cpp | |
| parent | 937b2991d8e78166eea904c80ad04d34607017a4 (diff) | |
| download | tdenetwork-2bc1d72869b62af05ae4feafd878203b526da8c5.tar.gz tdenetwork-2bc1d72869b62af05ae4feafd878203b526da8c5.zip | |
rename the following methods:
tqparent parent
tqmask mask
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kopete/libkopete/avdevice/qvideo.cpp')
| -rw-r--r-- | kopete/libkopete/avdevice/qvideo.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kopete/libkopete/avdevice/qvideo.cpp b/kopete/libkopete/avdevice/qvideo.cpp index a85589ab..d8d91602 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 tqmask = VisualScreenMask; + long mask = 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(), tqmask, &vi_out, &nvis); + vi_in = XGetVisualInfo(qt_xdisplay(), mask, &vi_out, &nvis); if (vi_in) { for (int i = 0; i < nvis; i++) { |