summaryrefslogtreecommitdiffstats
path: root/kopete/libkopete/avdevice
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
commit2bc1d72869b62af05ae4feafd878203b526da8c5 (patch)
tree2676903bb600bd9646644856e354940471ad84e2 /kopete/libkopete/avdevice
parent937b2991d8e78166eea904c80ad04d34607017a4 (diff)
downloadtdenetwork-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')
-rw-r--r--kopete/libkopete/avdevice/qvideo.cpp4
-rw-r--r--kopete/libkopete/avdevice/qvideostream.cpp8
2 files changed, 6 insertions, 6 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++) {
diff --git a/kopete/libkopete/avdevice/qvideostream.cpp b/kopete/libkopete/avdevice/qvideostream.cpp
index 7f4c677d..113aa16d 100644
--- a/kopete/libkopete/avdevice/qvideostream.cpp
+++ b/kopete/libkopete/avdevice/qvideostream.cpp
@@ -43,7 +43,7 @@ extern "C" {
class QVideoStreamGLWidget : public TQGLWidget
{
public:
- QVideoStreamGLWidget(TQWidget* tqparent = 0, const char* name = 0);
+ QVideoStreamGLWidget(TQWidget* parent = 0, const char* name = 0);
virtual ~QVideoStreamGLWidget();
void setInputSize(const TQSize& sz);
@@ -532,10 +532,10 @@ QVideoStream& QVideoStream::operator<<(const unsigned char *const img)
// ---------------------------------------------------------------------------------------
#ifdef HAVE_GL
-QVideoStreamGLWidget::QVideoStreamGLWidget(TQWidget* tqparent, const char* name)
- : TQGLWidget(TQGLFormat(TQGL::DoubleBuffer | TQGL::Rgba | TQGL::DirectRendering), tqparent, name),
+QVideoStreamGLWidget::QVideoStreamGLWidget(TQWidget* parent, const char* name)
+ : TQGLWidget(TQGLFormat(TQGL::DoubleBuffer | TQGL::Rgba | TQGL::DirectRendering), parent, name),
_tex(0),
- _w(tqparent),
+ _w(parent),
_glfun(false)
{
kdDebug() << "QVideoStreamGLWidget::QVideoStreamGLWidget()" << endl;