rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

2 files changed, 5 insertions, 5 deletions

diff --git a/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib-drawable.c b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib-drawable.c
index 522480f1..70c00262 100644
--- a/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib-drawable.c
+++ b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib-drawable.c
@@ -1103,7 +1103,7 @@ xlib_window_is_viewable (Window w)
 	XWindowAttributes wa;
 
 	while (w != 0) {
-		Window tqparent, root, *tqchildren;
+		Window parent, root, *tqchildren;
 		int ntqchildren;
 
 		XGetWindowAttributes (gdk_pixbuf_dpy, w, &wa);
@@ -1111,16 +1111,16 @@ xlib_window_is_viewable (Window w)
 			return 0;
 
 		if (!XQueryTree (gdk_pixbuf_dpy, w, &root,
-				 &tqparent, &tqchildren, &ntqchildren))
+				 &parent, &tqchildren, &ntqchildren))
 			return 0;
 
 		if (ntqchildren > 0)
 			XFree (tqchildren);
 
-		if (tqparent == root)
+		if (parent == root)
 			return 1;
 
-		w = tqparent;
+		w = parent;
 	}
 
 	return 0;
diff --git a/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.h b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.h
index 7d359b61..aa94c7c6 100644
--- a/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.h
+++ b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.h
@@ -61,7 +61,7 @@ void gdk_pixbuf_xlib_render_to_drawable_alpha (GdkPixbuf *pixbuf,
 					       XlibRgbDither dither,
 					       int x_dither, int y_dither);
 
-void gdk_pixbuf_xlib_render_pixmap_and_tqmask (GdkPixbuf *pixbuf,
+void gdk_pixbuf_xlib_render_pixmap_and_mask (GdkPixbuf *pixbuf,
 					     Pixmap *pixmap_return,
 					     Pixmap *mask_return,
 					     int alpha_threshold);