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 | 27edf28be2772229a7974a007313ea30d92c3ffd (patch) | |
tree | 14b9842bbd90c801d89ad5ddb38831fdf8aec1a4 /mpeglib/lib/util/render/x11 | |
parent | 7ef01c0f34d9c6732d258154bcd3ba5a88280db9 (diff) | |
download | tdemultimedia-27edf28be2772229a7974a007313ea30d92c3ffd.tar.gz tdemultimedia-27edf28be2772229a7974a007313ea30d92c3ffd.zip |
rename the following methods:
tqparent parent
tqmask mask
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'mpeglib/lib/util/render/x11')
-rw-r--r-- | mpeglib/lib/util/render/x11/initDisplay.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mpeglib/lib/util/render/x11/initDisplay.cpp b/mpeglib/lib/util/render/x11/initDisplay.cpp index 2a62e721..d0029eb6 100644 --- a/mpeglib/lib/util/render/x11/initDisplay.cpp +++ b/mpeglib/lib/util/render/x11/initDisplay.cpp @@ -128,7 +128,7 @@ void CreateFullColorWindow (XWindow* xwindow) { int depth; Visual *visual; XSetWindowAttributes xswa; - unsigned long tqmask; + unsigned long mask; unsigned int c_class; int screen; Display *dpy=xwindow->display; @@ -152,7 +152,7 @@ void CreateFullColorWindow (XWindow* xwindow) { cout << "visual is null"<<endl; return; } - tqmask = CWBackPixel | CWColormap | CWBorderPixel; + mask = CWBackPixel | CWColormap | CWBorderPixel; if (xwindow->colormap==0) { xswa.colormap = XCreateColormap(dpy, XRootWindow(dpy, screen), @@ -166,7 +166,7 @@ void CreateFullColorWindow (XWindow* xwindow) { /* xwindow->window = XCreateWindow(dpy, RootWindow(dpy, screen), x, y, w, h, (unsigned int) 1, depth, c_class, - visual, tqmask, &xswa); + visual, mask, &xswa); */ } |