diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-19 19:03:33 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-19 19:03:33 +0000 |
| commit | e69e8b1d09fb579316595b4e6a850e717358a8b1 (patch) | |
| tree | a24fc20865f65772f530d16177520190594ffdd2 /ksvg/impl/libs/xrgbrender | |
| parent | eecec9afb81fdebb0f22e9da22635874c403f854 (diff) | |
| download | tdegraphics-e69e8b1d09fb579316595b4e6a850e717358a8b1.tar.gz tdegraphics-e69e8b1d09fb579316595b4e6a850e717358a8b1.zip | |
TQt4 port kdegraphics
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1237557 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'ksvg/impl/libs/xrgbrender')
| -rw-r--r-- | ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib-drawable.c | 14 | ||||
| -rw-r--r-- | ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.h | 4 | ||||
| -rw-r--r-- | ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlibrgb.c | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib-drawable.c b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib-drawable.c index 01f60976..522480f1 100644 --- a/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib-drawable.c +++ b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib-drawable.c @@ -1103,24 +1103,24 @@ xlib_window_is_viewable (Window w) XWindowAttributes wa; while (w != 0) { - Window parent, root, *children; - int nchildren; + Window tqparent, root, *tqchildren; + int ntqchildren; XGetWindowAttributes (gdk_pixbuf_dpy, w, &wa); if (wa.map_state != IsViewable) return 0; if (!XQueryTree (gdk_pixbuf_dpy, w, &root, - &parent, &children, &nchildren)) + &tqparent, &tqchildren, &ntqchildren)) return 0; - if (nchildren > 0) - XFree (children); + if (ntqchildren > 0) + XFree (tqchildren); - if (parent == root) + if (tqparent == root) return 1; - w = parent; + w = tqparent; } return 0; diff --git a/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.h b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.h index aa94c7c6..7848f8d3 100644 --- a/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.h +++ b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.h @@ -61,9 +61,9 @@ 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_mask (GdkPixbuf *pixbuf, +void gdk_pixbuf_xlib_render_pixmap_and_tqmask (GdkPixbuf *pixbuf, Pixmap *pixmap_return, - Pixmap *mask_return, + Pixmap *tqmask_return, int alpha_threshold); diff --git a/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlibrgb.c b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlibrgb.c index eb7e4cdf..95a6c722 100644 --- a/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlibrgb.c +++ b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlibrgb.c @@ -913,7 +913,7 @@ xlib_rgb_init_with_depth (Display *display, Screen *screen, int prefDepth) static_image[i]->byte_order = MSBFirst; } } - /* ok, so apparently, image_info->bpp is actually + /* ok, so aptqparently, image_info->bpp is actually BYTES per pixel. What fun! */ switch (static_image[0]->bits_per_pixel) { case 1: |