From e69e8b1d09fb579316595b4e6a850e717358a8b1 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 19 Jun 2011 19:03:33 +0000 Subject: 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 --- ksvg/impl/libs/art_support/art_misc.c | 110 ++++++++++----------- ksvg/impl/libs/art_support/art_misc.h | 4 +- ksvg/impl/libs/art_support/art_rgba_svp.c | 58 +++++------ ksvg/impl/libs/art_support/art_rgba_svp.h | 6 +- ksvg/impl/libs/libtext2path/libtext2path.spec | 4 +- ksvg/impl/libs/libtext2path/src/Cache.h | 2 +- ksvg/impl/libs/libtext2path/src/Converter.cpp | 36 +++---- ksvg/impl/libs/libtext2path/src/Font.cpp | 6 +- ksvg/impl/libs/libtext2path/src/Glyph.cpp | 9 +- ksvg/impl/libs/libtext2path/src/Glyph.h | 6 +- ksvg/impl/libs/libtext2path/src/QtUnicode.cpp | 12 +-- ksvg/impl/libs/libtext2path/src/QtUnicode.h | 4 +- .../libs/libtext2path/src/myboost/shared_ptr.hpp | 2 +- .../libs/xrgbrender/gdk-pixbuf-xlib-drawable.c | 14 +-- ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.h | 4 +- ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlibrgb.c | 2 +- 16 files changed, 139 insertions(+), 140 deletions(-) (limited to 'ksvg/impl/libs') diff --git a/ksvg/impl/libs/art_support/art_misc.c b/ksvg/impl/libs/art_support/art_misc.c index 69b45306..6645fe2d 100644 --- a/ksvg/impl/libs/art_support/art_misc.c +++ b/ksvg/impl/libs/art_support/art_misc.c @@ -464,7 +464,7 @@ struct _ksvgArtRgbAffineClipAlphaData int src_width; int src_height; int src_rowstride; - const art_u8 *mask; + const art_u8 *tqmask; int y0; }; @@ -592,7 +592,7 @@ ksvg_art_rgb_affine_clip_callback (void *callback_data, int y, } static -void ksvg_art_rgb_affine_clip_mask_run(art_u8 *dst_p, const art_u8 *mask, int x0, int x1, int y, const double inv[6], +void ksvg_art_rgb_affine_clip_tqmask_run(art_u8 *dst_p, const art_u8 *tqmask, int x0, int x1, int y, const double inv[6], int alpha, const art_u8 *src, int src_rowstride, int src_width, int src_height) { const art_u8 *src_p; @@ -626,7 +626,7 @@ void ksvg_art_rgb_affine_clip_mask_run(art_u8 *dst_p, const art_u8 *mask, int x0 srcAlpha = alpha * src_p[3] + 0x80; srcAlpha = (srcAlpha + (srcAlpha >> 8)) >> 8; - srcAlpha = (srcAlpha * *mask++) + 0x80; + srcAlpha = (srcAlpha * *tqmask++) + 0x80; srcAlpha = (srcAlpha + (srcAlpha >> 8)) >> 8; d = *dst_p; @@ -656,13 +656,13 @@ void ksvg_art_rgb_affine_clip_mask_run(art_u8 *dst_p, const art_u8 *mask, int x0 else { dst_p += 3; - mask++; + tqmask++; } } } static void -ksvg_art_rgb_affine_clip_mask_callback (void *callback_data, int y, +ksvg_art_rgb_affine_clip_tqmask_callback (void *callback_data, int y, int start, ArtSVPRenderAAStep *steps, int n_steps) { ksvgArtRgbAffineClipAlphaData *data = (ksvgArtRgbAffineClipAlphaData *)callback_data; @@ -673,14 +673,14 @@ ksvg_art_rgb_affine_clip_mask_callback (void *callback_data, int y, int k; int *alphatab; int alpha; - const art_u8 *maskbuf; + const art_u8 *tqmaskbuf; linebuf = data->dst; x0 = data->x0; x1 = data->x1; alphatab = data->alphatab; - maskbuf = data->mask + (y - data->y0) * (x1 - x0); + tqmaskbuf = data->tqmask + (y - data->y0) * (x1 - x0); if(n_steps > 0) { @@ -689,7 +689,7 @@ ksvg_art_rgb_affine_clip_mask_callback (void *callback_data, int y, { alpha = (running_sum >> 16) & 0xff; if(alpha) - ksvg_art_rgb_affine_clip_mask_run(linebuf, maskbuf, x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height); + ksvg_art_rgb_affine_clip_tqmask_run(linebuf, tqmaskbuf, x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height); } for(k = 0; k < n_steps - 1; k++) @@ -701,7 +701,7 @@ ksvg_art_rgb_affine_clip_mask_callback (void *callback_data, int y, { alpha = (running_sum >> 16) & 0xff; if(alpha) - ksvg_art_rgb_affine_clip_mask_run(linebuf + (run_x0 - x0) * 3, maskbuf + (run_x0 - x0), run_x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height); + ksvg_art_rgb_affine_clip_tqmask_run(linebuf + (run_x0 - x0) * 3, tqmaskbuf + (run_x0 - x0), run_x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height); } } running_sum += steps[k].delta; @@ -709,14 +709,14 @@ ksvg_art_rgb_affine_clip_mask_callback (void *callback_data, int y, { alpha = (running_sum >> 16) & 0xff; if(alpha) - ksvg_art_rgb_affine_clip_mask_run(linebuf + (run_x1 - x0) * 3, maskbuf + (run_x1 - x0), run_x1, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height); + ksvg_art_rgb_affine_clip_tqmask_run(linebuf + (run_x1 - x0) * 3, tqmaskbuf + (run_x1 - x0), run_x1, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height); } } else { alpha = (running_sum >> 16) & 0xff; if(alpha) - ksvg_art_rgb_affine_clip_mask_run(linebuf, maskbuf, x0, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height); + ksvg_art_rgb_affine_clip_tqmask_run(linebuf, tqmaskbuf, x0, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height); } data->dst += data->dst_rowstride; @@ -853,7 +853,7 @@ ksvg_art_rgba_affine_clip_callback (void *callback_data, int y, } static -void ksvg_art_rgba_affine_clip_mask_run(art_u8 *dst_p, const art_u8 *mask, int x0, int x1, int y, const double inv[6], +void ksvg_art_rgba_affine_clip_tqmask_run(art_u8 *dst_p, const art_u8 *tqmask, int x0, int x1, int y, const double inv[6], int alpha, const art_u8 *src, int src_rowstride, int src_width, int src_height) { const art_u8 *src_p; @@ -887,7 +887,7 @@ void ksvg_art_rgba_affine_clip_mask_run(art_u8 *dst_p, const art_u8 *mask, int x srcAlpha = alpha * src_p[3] + 0x80; srcAlpha = (srcAlpha + (srcAlpha >> 8)) >> 8; - srcAlpha = (srcAlpha * *mask++) + 0x80; + srcAlpha = (srcAlpha * *tqmask++) + 0x80; srcAlpha = (srcAlpha + (srcAlpha >> 8)) >> 8; d = *dst_p; @@ -924,13 +924,13 @@ void ksvg_art_rgba_affine_clip_mask_run(art_u8 *dst_p, const art_u8 *mask, int x else { dst_p += 4; - mask++; + tqmask++; } } } static void -ksvg_art_rgba_affine_clip_mask_callback (void *callback_data, int y, +ksvg_art_rgba_affine_clip_tqmask_callback (void *callback_data, int y, int start, ArtSVPRenderAAStep *steps, int n_steps) { ksvgArtRgbAffineClipAlphaData *data = (ksvgArtRgbAffineClipAlphaData *)callback_data; @@ -941,14 +941,14 @@ ksvg_art_rgba_affine_clip_mask_callback (void *callback_data, int y, int k; int *alphatab; int alpha; - const art_u8 *maskbuf; + const art_u8 *tqmaskbuf; linebuf = data->dst; x0 = data->x0; x1 = data->x1; alphatab = data->alphatab; - maskbuf = data->mask + (y - data->y0) * (x1 - x0); + tqmaskbuf = data->tqmask + (y - data->y0) * (x1 - x0); if(n_steps > 0) { @@ -957,7 +957,7 @@ ksvg_art_rgba_affine_clip_mask_callback (void *callback_data, int y, { alpha = (running_sum >> 16) & 0xff; if(alpha) - ksvg_art_rgba_affine_clip_mask_run(linebuf, maskbuf, x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height); + ksvg_art_rgba_affine_clip_tqmask_run(linebuf, tqmaskbuf, x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height); } for(k = 0; k < n_steps - 1; k++) @@ -969,7 +969,7 @@ ksvg_art_rgba_affine_clip_mask_callback (void *callback_data, int y, { alpha = (running_sum >> 16) & 0xff; if(alpha) - ksvg_art_rgba_affine_clip_mask_run(linebuf + (run_x0 - x0) * 4, maskbuf + (run_x0 - x0), run_x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height); + ksvg_art_rgba_affine_clip_tqmask_run(linebuf + (run_x0 - x0) * 4, tqmaskbuf + (run_x0 - x0), run_x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height); } } running_sum += steps[k].delta; @@ -977,14 +977,14 @@ ksvg_art_rgba_affine_clip_mask_callback (void *callback_data, int y, { alpha = (running_sum >> 16) & 0xff; if(alpha) - ksvg_art_rgba_affine_clip_mask_run(linebuf + (run_x1 - x0) * 4, maskbuf + (run_x1 - x0), run_x1, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height); + ksvg_art_rgba_affine_clip_tqmask_run(linebuf + (run_x1 - x0) * 4, tqmaskbuf + (run_x1 - x0), run_x1, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height); } } else { alpha = (running_sum >> 16) & 0xff; if(alpha) - ksvg_art_rgba_affine_clip_mask_run(linebuf, maskbuf, x0, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height); + ksvg_art_rgba_affine_clip_tqmask_run(linebuf, tqmaskbuf, x0, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height); } data->dst += data->dst_rowstride; @@ -1030,7 +1030,7 @@ void ksvg_art_rgb_affine_clip(const ArtSVP *svp, art_u8 *dst, int x0, int y0, in const art_u8 *src, int src_width, int src_height, int src_rowstride, const double affine[6], - int alpha, const art_u8 *mask) + int alpha, const art_u8 *tqmask) { ksvgArtRgbAffineClipAlphaData data; int i; @@ -1052,7 +1052,7 @@ void ksvg_art_rgb_affine_clip(const ArtSVP *svp, art_u8 *dst, int x0, int y0, in data.x0 = x0; data.x1 = x1; data.y0 = y0; - data.mask = mask; + data.tqmask = tqmask; art_affine_invert(data.inv, affine); @@ -1063,15 +1063,15 @@ void ksvg_art_rgb_affine_clip(const ArtSVP *svp, art_u8 *dst, int x0, int y0, in if(dst_channels == 3) { - if(mask) - art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgb_affine_clip_mask_callback, &data); + if(tqmask) + art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgb_affine_clip_tqmask_callback, &data); else art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgb_affine_clip_callback, &data); } else { - if(mask) - art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgba_affine_clip_mask_callback, &data); + if(tqmask) + art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgba_affine_clip_tqmask_callback, &data); else art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgba_affine_clip_callback, &data); } @@ -1228,7 +1228,7 @@ ksvg_art_rgb_texture_callback (void *callback_data, int y, } static -void ksvg_art_rgb_texture_mask_run(art_u8 *dst_p, const art_u8 *mask, int x0, int x1, int y, const double inv[6], +void ksvg_art_rgb_texture_tqmask_run(art_u8 *dst_p, const art_u8 *tqmask, int x0, int x1, int y, const double inv[6], int alpha, const art_u8 *src, int src_rowstride, int src_width, int src_height) { const art_u8 *src_p; @@ -1277,11 +1277,11 @@ void ksvg_art_rgb_texture_mask_run(art_u8 *dst_p, const art_u8 *mask, int x0, in /* Pattern source is in RGBA format, premultiplied. * alpha represents fill/stroke/group opacity. * - * Multiply source alpha by 'alpha' and mask value then composite over. - * For each channel, d = d + alpha * mask * (s - srcAlpha * d). + * Multiply source alpha by 'alpha' and tqmask value then composite over. + * For each channel, d = d + alpha * tqmask * (s - srcAlpha * d). */ - am = (alpha * *mask++) + 0x80; + am = (alpha * *tqmask++) + 0x80; am = (am + (am >> 8)) >> 8; srcAlpha = src_p[3]; @@ -1322,7 +1322,7 @@ void ksvg_art_rgb_texture_mask_run(art_u8 *dst_p, const art_u8 *mask, int x0, in } static void -ksvg_art_rgb_texture_mask_callback (void *callback_data, int y, +ksvg_art_rgb_texture_tqmask_callback (void *callback_data, int y, int start, ArtSVPRenderAAStep *steps, int n_steps) { ksvgArtRgbAffineClipAlphaData *data = (ksvgArtRgbAffineClipAlphaData *)callback_data; @@ -1333,7 +1333,7 @@ ksvg_art_rgb_texture_mask_callback (void *callback_data, int y, int k; int *alphatab; int alpha; - const art_u8 *maskbuf; + const art_u8 *tqmaskbuf; linebuf = data->dst; x0 = data->x0; @@ -1341,7 +1341,7 @@ ksvg_art_rgb_texture_mask_callback (void *callback_data, int y, alphatab = data->alphatab; - maskbuf = data->mask + (y - data->y0) * (x1 - x0); + tqmaskbuf = data->tqmask + (y - data->y0) * (x1 - x0); if(n_steps > 0) { @@ -1350,7 +1350,7 @@ ksvg_art_rgb_texture_mask_callback (void *callback_data, int y, { alpha = (running_sum >> 16) & 0xff; if(alpha) - ksvg_art_rgb_texture_mask_run(linebuf, maskbuf, x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height); + ksvg_art_rgb_texture_tqmask_run(linebuf, tqmaskbuf, x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height); } for(k = 0; k < n_steps - 1; k++) @@ -1362,7 +1362,7 @@ ksvg_art_rgb_texture_mask_callback (void *callback_data, int y, { alpha = (running_sum >> 16) & 0xff; if(alpha) - ksvg_art_rgb_texture_mask_run(linebuf + (run_x0 - x0) * 3, maskbuf + (run_x0 - x0), run_x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height); + ksvg_art_rgb_texture_tqmask_run(linebuf + (run_x0 - x0) * 3, tqmaskbuf + (run_x0 - x0), run_x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height); } } running_sum += steps[k].delta; @@ -1370,14 +1370,14 @@ ksvg_art_rgb_texture_mask_callback (void *callback_data, int y, { alpha = (running_sum >> 16) & 0xff; if(alpha) - ksvg_art_rgb_texture_mask_run(linebuf + (run_x1 - x0) * 3, maskbuf + (run_x1 - x0), run_x1, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height); + ksvg_art_rgb_texture_tqmask_run(linebuf + (run_x1 - x0) * 3, tqmaskbuf + (run_x1 - x0), run_x1, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height); } } else { alpha = (running_sum >> 16) & 0xff; if(alpha) - ksvg_art_rgb_texture_mask_run(linebuf, maskbuf, x0, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height); + ksvg_art_rgb_texture_tqmask_run(linebuf, tqmaskbuf, x0, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height); } data->dst += data->dst_rowstride; @@ -1545,7 +1545,7 @@ ksvg_art_rgba_texture_callback (void *callback_data, int y, } static -void ksvg_art_rgba_texture_mask_run(art_u8 *dst_p, const art_u8 *mask, int x0, int x1, int y, const double inv[6], +void ksvg_art_rgba_texture_tqmask_run(art_u8 *dst_p, const art_u8 *tqmask, int x0, int x1, int y, const double inv[6], int alpha, const art_u8 *src, int src_rowstride, int src_width, int src_height) { const art_u8 *src_p; @@ -1594,11 +1594,11 @@ void ksvg_art_rgba_texture_mask_run(art_u8 *dst_p, const art_u8 *mask, int x0, i /* Pattern source is in RGBA format, premultiplied. * alpha represents fill/stroke/group opacity. * - * Multiply source alpha by 'alpha' and mask value then composite over. - * For each channel, d = d + alpha * mask * (s - srcAlpha * d). + * Multiply source alpha by 'alpha' and tqmask value then composite over. + * For each channel, d = d + alpha * tqmask * (s - srcAlpha * d). */ - am = (alpha * *mask++) + 0x80; + am = (alpha * *tqmask++) + 0x80; am = (am + (am >> 8)) >> 8; srcAlpha = src_p[3]; @@ -1636,7 +1636,7 @@ void ksvg_art_rgba_texture_mask_run(art_u8 *dst_p, const art_u8 *mask, int x0, i *dst_p++ = d + tmp2; - /* dstAlpha = dstAlpha + srcAlpha * alpha * mask * (1 - dstAlpha) */ + /* dstAlpha = dstAlpha + srcAlpha * alpha * tqmask * (1 - dstAlpha) */ d = *dst_p; tmp = srcAlpha * am + 0x80; @@ -1651,7 +1651,7 @@ void ksvg_art_rgba_texture_mask_run(art_u8 *dst_p, const art_u8 *mask, int x0, i } static void -ksvg_art_rgba_texture_mask_callback (void *callback_data, int y, +ksvg_art_rgba_texture_tqmask_callback (void *callback_data, int y, int start, ArtSVPRenderAAStep *steps, int n_steps) { ksvgArtRgbAffineClipAlphaData *data = (ksvgArtRgbAffineClipAlphaData *)callback_data; @@ -1662,7 +1662,7 @@ ksvg_art_rgba_texture_mask_callback (void *callback_data, int y, int k; int *alphatab; int alpha; - const art_u8 *maskbuf; + const art_u8 *tqmaskbuf; linebuf = data->dst; x0 = data->x0; @@ -1670,7 +1670,7 @@ ksvg_art_rgba_texture_mask_callback (void *callback_data, int y, alphatab = data->alphatab; - maskbuf = data->mask + (y - data->y0) * (x1 - x0); + tqmaskbuf = data->tqmask + (y - data->y0) * (x1 - x0); if(n_steps > 0) { @@ -1679,7 +1679,7 @@ ksvg_art_rgba_texture_mask_callback (void *callback_data, int y, { alpha = (running_sum >> 16) & 0xff; if(alpha) - ksvg_art_rgba_texture_mask_run(linebuf, maskbuf, x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height); + ksvg_art_rgba_texture_tqmask_run(linebuf, tqmaskbuf, x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height); } for(k = 0; k < n_steps - 1; k++) @@ -1691,7 +1691,7 @@ ksvg_art_rgba_texture_mask_callback (void *callback_data, int y, { alpha = (running_sum >> 16) & 0xff; if(alpha) - ksvg_art_rgba_texture_mask_run(linebuf + (run_x0 - x0) * 4, maskbuf + (run_x0 - x0), run_x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height); + ksvg_art_rgba_texture_tqmask_run(linebuf + (run_x0 - x0) * 4, tqmaskbuf + (run_x0 - x0), run_x0, run_x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height); } } running_sum += steps[k].delta; @@ -1699,14 +1699,14 @@ ksvg_art_rgba_texture_mask_callback (void *callback_data, int y, { alpha = (running_sum >> 16) & 0xff; if(alpha) - ksvg_art_rgba_texture_mask_run(linebuf + (run_x1 - x0) * 4, maskbuf + (run_x1 - x0), run_x1, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height); + ksvg_art_rgba_texture_tqmask_run(linebuf + (run_x1 - x0) * 4, tqmaskbuf + (run_x1 - x0), run_x1, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height); } } else { alpha = (running_sum >> 16) & 0xff; if(alpha) - ksvg_art_rgba_texture_mask_run(linebuf, maskbuf, x0, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height); + ksvg_art_rgba_texture_tqmask_run(linebuf, tqmaskbuf, x0, x1, y, data->inv, alphatab[alpha], data->src, data->src_rowstride, data->src_width, data->src_height); } data->dst += data->dst_rowstride; @@ -1756,7 +1756,7 @@ void ksvg_art_rgb_texture(const ArtSVP *svp, art_u8 *dst, int x0, int y0, int x1 ArtFilterLevel level, ArtAlphaGamma *alphaGamma, int alpha, - const art_u8 *mask) + const art_u8 *tqmask) { ksvgArtRgbAffineClipAlphaData data; int i; @@ -1790,15 +1790,15 @@ void ksvg_art_rgb_texture(const ArtSVP *svp, art_u8 *dst, int x0, int y0, int x1 data.src_height = src_height; data.src_rowstride = src_rowstride; - data.mask = mask; + data.tqmask = tqmask; data.y0 = y0; - if(mask) + if(tqmask) { if(dst_channels == 3) - art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgb_texture_mask_callback, &data); + art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgb_texture_tqmask_callback, &data); else - art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgba_texture_mask_callback, &data); + art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgba_texture_tqmask_callback, &data); } else { diff --git a/ksvg/impl/libs/art_support/art_misc.h b/ksvg/impl/libs/art_support/art_misc.h index 52f09a63..7311d4b7 100644 --- a/ksvg/impl/libs/art_support/art_misc.h +++ b/ksvg/impl/libs/art_support/art_misc.h @@ -58,7 +58,7 @@ extern "C" { const art_u8 *src, int src_width, int src_height, int src_rowstride, const double affine[6], - int alpha, const art_u8 *mask); + int alpha, const art_u8 *tqmask); void ksvg_art_rgb_texture(const ArtSVP *svp, art_u8 *dst, int x0, int y0, int x1, int y1, int dst_rowstride, int dst_channels, @@ -68,7 +68,7 @@ extern "C" { ArtFilterLevel level, ArtAlphaGamma *alphaGamma, int alpha, - const art_u8 *mask); + const art_u8 *tqmask); void ksvg_art_svp_move(ArtSVP *svp, int dx, int dy); diff --git a/ksvg/impl/libs/art_support/art_rgba_svp.c b/ksvg/impl/libs/art_support/art_rgba_svp.c index 47c7d924..ea2c1476 100644 --- a/ksvg/impl/libs/art_support/art_rgba_svp.c +++ b/ksvg/impl/libs/art_support/art_rgba_svp.c @@ -37,7 +37,7 @@ struct _ArtKSVGRgbaSVPAlphaData { art_u8 r, g, b, alpha; art_u32 rgba; art_u8 *buf; - art_u8 *mask; + art_u8 *tqmask; int rowstride; int x0, x1; int y0; @@ -124,7 +124,7 @@ art_ksvg_rgba_run_alpha (art_u8 *buf, art_u8 r, art_u8 g, art_u8 b, int alpha, i } static void -art_ksvg_rgba_mask_run_alpha (art_u8 *buf, art_u8 *mask, art_u8 r, art_u8 g, art_u8 b, int alpha, int n) +art_ksvg_rgba_tqmask_run_alpha (art_u8 *buf, art_u8 *tqmask, art_u8 r, art_u8 g, art_u8 b, int alpha, int n) { int i; int v; @@ -136,7 +136,7 @@ art_ksvg_rgba_mask_run_alpha (art_u8 *buf, art_u8 *mask, art_u8 r, art_u8 g, art for(i = 0; i < n; i++) { - am = (alpha * *mask++) + 0x80; + am = (alpha * *tqmask++) + 0x80; am = (am + (am >> 8)) >> 8; v = *buf; @@ -330,7 +330,7 @@ art_ksvg_rgba_svp_alpha_opaque_callback(void *callback_data, int y, } static void -art_ksvg_rgba_svp_alpha_mask_callback(void *callback_data, int y, +art_ksvg_rgba_svp_alpha_tqmask_callback(void *callback_data, int y, int start, ArtSVPRenderAAStep *steps, int n_steps) { ArtKSVGRgbaSVPAlphaData *data = (ArtKSVGRgbaSVPAlphaData *)callback_data; @@ -342,7 +342,7 @@ art_ksvg_rgba_svp_alpha_mask_callback(void *callback_data, int y, art_u8 r, g, b; int *alphatab; int alpha; - art_u8 *maskbuf; + art_u8 *tqmaskbuf; linebuf = data->buf; x0 = data->x0; @@ -353,7 +353,7 @@ art_ksvg_rgba_svp_alpha_mask_callback(void *callback_data, int y, b = data->b; alphatab = data->alphatab; - maskbuf = data->mask + (y - data->y0) * (data->x1 - data->x0); + tqmaskbuf = data->tqmask + (y - data->y0) * (data->x1 - data->x0); if(n_steps > 0) { @@ -362,7 +362,7 @@ art_ksvg_rgba_svp_alpha_mask_callback(void *callback_data, int y, { alpha = (running_sum >> 16) & 0xff; if(alpha) - art_ksvg_rgba_mask_run_alpha (linebuf, maskbuf, + art_ksvg_rgba_tqmask_run_alpha (linebuf, tqmaskbuf, r, g, b, alphatab[alpha], run_x1 - x0); } @@ -376,7 +376,7 @@ art_ksvg_rgba_svp_alpha_mask_callback(void *callback_data, int y, { alpha = (running_sum >> 16) & 0xff; if(alpha) - art_ksvg_rgba_mask_run_alpha (linebuf + (run_x0 - x0) * 4, maskbuf + (run_x0 - x0), + art_ksvg_rgba_tqmask_run_alpha (linebuf + (run_x0 - x0) * 4, tqmaskbuf + (run_x0 - x0), r, g, b, alphatab[alpha], run_x1 - run_x0); } @@ -386,7 +386,7 @@ art_ksvg_rgba_svp_alpha_mask_callback(void *callback_data, int y, { alpha = (running_sum >> 16) & 0xff; if(alpha) - art_ksvg_rgba_mask_run_alpha (linebuf + (run_x1 - x0) * 4, maskbuf + (run_x1 - x0) , + art_ksvg_rgba_tqmask_run_alpha (linebuf + (run_x1 - x0) * 4, tqmaskbuf + (run_x1 - x0) , r, g, b, alphatab[alpha], x1 - run_x1); } @@ -395,7 +395,7 @@ art_ksvg_rgba_svp_alpha_mask_callback(void *callback_data, int y, { alpha = (running_sum >> 16) & 0xff; if(alpha) - art_ksvg_rgba_mask_run_alpha (linebuf, maskbuf, + art_ksvg_rgba_tqmask_run_alpha (linebuf, tqmaskbuf, r, g, b, alphatab[alpha], x1 - x0); } @@ -415,7 +415,7 @@ art_ksvg_rgba_svp_alpha_mask_callback(void *callback_data, int y, * @rowstride: Rowstride of @buf buffer. * @alphagamma: #ArtAlphaGamma for gamma-correcting the compositing. * - * Renders the shape specified with @svp over the @buf RGB buffer. + * Renders the tqshape specified with @svp over the @buf RGB buffer. * @x1 - @x0 specifies the width, and @y1 - @y0 specifies the height, * of the rectangle rendered. The new pixels are stored starting at * the first byte of @buf. Thus, the @x0 and @y0 parameters specify @@ -436,7 +436,7 @@ art_ksvg_rgba_svp_alpha(const ArtSVP *svp, art_u32 rgba, art_u8 *buf, int rowstride, ArtAlphaGamma *alphagamma, - art_u8 *mask) + art_u8 *tqmask) { ArtKSVGRgbaSVPAlphaData data; int r, g, b; @@ -454,7 +454,7 @@ art_ksvg_rgba_svp_alpha(const ArtSVP *svp, data.b = b; data.alpha = alpha; data.rgba = rgba; - data.mask = mask; + data.tqmask = tqmask; a = 0x8000; da = (alpha * 66051 + 0x80) >> 8; /* 66051 equals 2 ^ 32 / (255 * 255) */ @@ -471,8 +471,8 @@ art_ksvg_rgba_svp_alpha(const ArtSVP *svp, data.x1 = x1; data.y0 = y0; - if(mask) - art_svp_render_aa (svp, x0, y0, x1, y1, art_ksvg_rgba_svp_alpha_mask_callback, &data); + if(tqmask) + art_svp_render_aa (svp, x0, y0, x1, y1, art_ksvg_rgba_svp_alpha_tqmask_callback, &data); else { if (alpha == 255) @@ -485,7 +485,7 @@ art_ksvg_rgba_svp_alpha(const ArtSVP *svp, /* RGB renderers */ static void -art_ksvg_rgb_mask_run_alpha(art_u8 *buf, art_u8 *mask, art_u8 r, art_u8 g, art_u8 b, int alpha, int n) +art_ksvg_rgb_tqmask_run_alpha(art_u8 *buf, art_u8 *tqmask, art_u8 r, art_u8 g, art_u8 b, int alpha, int n) { int i; int v; @@ -497,7 +497,7 @@ art_ksvg_rgb_mask_run_alpha(art_u8 *buf, art_u8 *mask, art_u8 r, art_u8 g, art_u for(i = 0; i < n; i++) { - am = (alpha * *mask++) + 0x80; + am = (alpha * *tqmask++) + 0x80; am = (am + (am >> 8)) >> 8; v = *buf; @@ -515,7 +515,7 @@ art_ksvg_rgb_mask_run_alpha(art_u8 *buf, art_u8 *mask, art_u8 r, art_u8 g, art_u } static void -art_ksvg_rgb_svp_alpha_mask_callback(void *callback_data, int y, +art_ksvg_rgb_svp_alpha_tqmask_callback(void *callback_data, int y, int start, ArtSVPRenderAAStep *steps, int n_steps) { ArtKSVGRgbaSVPAlphaData *data = (ArtKSVGRgbaSVPAlphaData *)callback_data; @@ -527,7 +527,7 @@ art_ksvg_rgb_svp_alpha_mask_callback(void *callback_data, int y, art_u8 r, g, b; int *alphatab; int alpha; - art_u8 *maskbuf; + art_u8 *tqmaskbuf; linebuf = data->buf; x0 = data->x0; @@ -538,7 +538,7 @@ art_ksvg_rgb_svp_alpha_mask_callback(void *callback_data, int y, b = data->b; alphatab = data->alphatab; - maskbuf = data->mask + (y - data->y0) * (data->x1 - data->x0); + tqmaskbuf = data->tqmask + (y - data->y0) * (data->x1 - data->x0); if(n_steps > 0) { @@ -547,7 +547,7 @@ art_ksvg_rgb_svp_alpha_mask_callback(void *callback_data, int y, { alpha = (running_sum >> 16) & 0xff; if(alpha) - art_ksvg_rgb_mask_run_alpha (linebuf, maskbuf, + art_ksvg_rgb_tqmask_run_alpha (linebuf, tqmaskbuf, r, g, b, alphatab[alpha], run_x1 - x0); } @@ -561,7 +561,7 @@ art_ksvg_rgb_svp_alpha_mask_callback(void *callback_data, int y, { alpha = (running_sum >> 16) & 0xff; if(alpha) - art_ksvg_rgb_mask_run_alpha (linebuf + (run_x0 - x0) * 3, maskbuf + (run_x0 - x0), + art_ksvg_rgb_tqmask_run_alpha (linebuf + (run_x0 - x0) * 3, tqmaskbuf + (run_x0 - x0), r, g, b, alphatab[alpha], run_x1 - run_x0); } @@ -571,7 +571,7 @@ art_ksvg_rgb_svp_alpha_mask_callback(void *callback_data, int y, { alpha = (running_sum >> 16) & 0xff; if(alpha) - art_ksvg_rgb_mask_run_alpha (linebuf + (run_x1 - x0) * 3, maskbuf + (run_x1 - x0) , + art_ksvg_rgb_tqmask_run_alpha (linebuf + (run_x1 - x0) * 3, tqmaskbuf + (run_x1 - x0) , r, g, b, alphatab[alpha], x1 - run_x1); } @@ -580,7 +580,7 @@ art_ksvg_rgb_svp_alpha_mask_callback(void *callback_data, int y, { alpha = (running_sum >> 16) & 0xff; if(alpha) - art_ksvg_rgb_mask_run_alpha (linebuf, maskbuf, + art_ksvg_rgb_tqmask_run_alpha (linebuf, tqmaskbuf, r, g, b, alphatab[alpha], x1 - x0); } @@ -600,7 +600,7 @@ art_ksvg_rgb_svp_alpha_mask_callback(void *callback_data, int y, * @rowstride: Rowstride of @buf buffer. * @alphagamma: #ArtAlphaGamma for gamma-correcting the compositing. * - * Renders the shape specified with @svp over the @buf RGB buffer. + * Renders the tqshape specified with @svp over the @buf RGB buffer. * @x1 - @x0 specifies the width, and @y1 - @y0 specifies the height, * of the rectangle rendered. The new pixels are stored starting at * the first byte of @buf. Thus, the @x0 and @y0 parameters specify @@ -616,12 +616,12 @@ art_ksvg_rgb_svp_alpha_mask_callback(void *callback_data, int y, * @alphagamma is NULL. **/ void -art_ksvg_rgb_svp_alpha_mask(const ArtSVP *svp, +art_ksvg_rgb_svp_alpha_tqmask(const ArtSVP *svp, int x0, int y0, int x1, int y1, art_u32 rgba, art_u8 *buf, int rowstride, ArtAlphaGamma *alphagamma, - art_u8 *mask) + art_u8 *tqmask) { ArtKSVGRgbaSVPAlphaData data; int r, g, b, alpha; @@ -637,7 +637,7 @@ art_ksvg_rgb_svp_alpha_mask(const ArtSVP *svp, data.g = g; data.b = b; data.alpha = alpha; - data.mask = mask; + data.tqmask = tqmask; a = 0x8000; da = (alpha * 66051 + 0x80) >> 8; /* 66051 equals 2 ^ 32 / (255 * 255) */ @@ -654,6 +654,6 @@ art_ksvg_rgb_svp_alpha_mask(const ArtSVP *svp, data.x1 = x1; data.y0 = y0; - art_svp_render_aa(svp, x0, y0, x1, y1, art_ksvg_rgb_svp_alpha_mask_callback, &data); + art_svp_render_aa(svp, x0, y0, x1, y1, art_ksvg_rgb_svp_alpha_tqmask_callback, &data); } diff --git a/ksvg/impl/libs/art_support/art_rgba_svp.h b/ksvg/impl/libs/art_support/art_rgba_svp.h index b59096d4..860eabcc 100644 --- a/ksvg/impl/libs/art_support/art_rgba_svp.h +++ b/ksvg/impl/libs/art_support/art_rgba_svp.h @@ -40,15 +40,15 @@ art_ksvg_rgba_svp_alpha(const ArtSVP *svp, art_u32 rgba, art_u8 *buf, int rowstride, ArtAlphaGamma *alphagamma, - art_u8 *mask); + art_u8 *tqmask); void -art_ksvg_rgb_svp_alpha_mask(const ArtSVP *svp, +art_ksvg_rgb_svp_alpha_tqmask(const ArtSVP *svp, int x0, int y0, int x1, int y1, art_u32 rgba, art_u8 *buf, int rowstride, ArtAlphaGamma *alphagamma, - art_u8 *mask); + art_u8 *tqmask); #ifdef __cplusplus } diff --git a/ksvg/impl/libs/libtext2path/libtext2path.spec b/ksvg/impl/libs/libtext2path/libtext2path.spec index e0c217bd..208de711 100644 --- a/ksvg/impl/libs/libtext2path/libtext2path.spec +++ b/ksvg/impl/libs/libtext2path/libtext2path.spec @@ -31,8 +31,8 @@ make -j make install-strip DESTDIR=$RPM_BUILD_ROOT cd -find . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > /%{name}-master.list -find . -type f -o -type l | sed 's|^\.||' >> $RPM_BUILD_DIR/%{name}-master.list +tqfind . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > /%{name}-master.list +tqfind . -type f -o -type l | sed 's|^\.||' >> $RPM_BUILD_DIR/%{name}-master.list %clean rm -rf $RPM_BUILD_DIR/%{name}-%{version} diff --git a/ksvg/impl/libs/libtext2path/src/Cache.h b/ksvg/impl/libs/libtext2path/src/Cache.h index a85fdf92..51d09f45 100644 --- a/ksvg/impl/libs/libtext2path/src/Cache.h +++ b/ksvg/impl/libs/libtext2path/src/Cache.h @@ -118,7 +118,7 @@ namespace T2P } // Lookup entry - SharedT find(const std::string &key) + SharedT tqfind(const std::string &key) { for(typename std::vector::const_iterator it = m_entries.begin(); it != m_entries.end(); ++it) { diff --git a/ksvg/impl/libs/libtext2path/src/Converter.cpp b/ksvg/impl/libs/libtext2path/src/Converter.cpp index 59ab8e5c..16aef608 100644 --- a/ksvg/impl/libs/libtext2path/src/Converter.cpp +++ b/ksvg/impl/libs/libtext2path/src/Converter.cpp @@ -90,7 +90,7 @@ void Converter::setKerning(bool mode) SharedFont Converter::requestFont(const FontVisualParams *params) { std::string cacheKey = cacheFontKey(params); - SharedFont cached = m_fontCache.find(cacheKey); + SharedFont cached = m_fontCache.tqfind(cacheKey); // If not available in cache, create new one and cache it :) if(cached) @@ -122,10 +122,10 @@ GlyphAffinePair *Converter::requestGlyph(GlyphRenderParams *params, Rectangle &b // needed to generate the cache lookup key selectGlyph(params); - SharedGlyph cached = m_glyphCache.find(cacheGlyphKey(params)); + SharedGlyph cached = m_glyphCache.tqfind(cacheGlyphKey(params)); // If not available in cache, render new one and cache it :) - // If we're mixing ie. japanese and latin characters (TTB layout), + // If we're mixing ie. japanese and latin characters (TTB tqlayout), // then we also have to re-calculate the glyph again with the appropriate rotation matrix (Niko) if(!cached || !onlyLatin) cached = calcGlyph(params, affine, onlyLatin); @@ -162,13 +162,13 @@ void Converter::selectGlyph(GlyphRenderParams *params) // 2. Load glyph into font's glyphSlot, according to the GlyphLayoutParams int flags = FT_LOAD_NO_SCALE | FT_LOAD_NO_HINTING | FT_LOAD_NO_BITMAP; - // 3. Don't pass FT_LOAD_VERTICAL_LAYOUT on TTB layouts when rendering + // 3. Don't pass FT_LOAD_VERTICAL_LAYOUT on TTB tqlayouts when rendering // a latin glyph because it needs to be rotated... - if(params->layout()->tb()) + if(params->tqlayout()->tb()) { Script script; SCRIPT_FOR_CHAR(script, params->character()) - if(script != Latin || params->layout()->glyphOrientationVertical() == 0) + if(script != Latin || params->tqlayout()->glyphOrientationVertical() == 0) flags |= FT_LOAD_VERTICAL_LAYOUT; } @@ -193,7 +193,7 @@ SharedGlyph Converter::calcGlyph(const GlyphRenderParams *params, Affine &affine affine.dx() += kx + affine.m21() * ky; // Only apply y kerning in TB mode - if(params->layout()->tb()) + if(params->tqlayout()->tb()) affine.dy() += kx + affine.m22() * ky; } @@ -206,7 +206,7 @@ SharedGlyph Converter::calcGlyph(const GlyphRenderParams *params, Affine &affine traceAffine.scale(1000.0 / params->font()->fontFace()->units_per_EM); // 3b. Enable character rotation, if needed - if(params->layout()->tb()) + if(params->tqlayout()->tb()) { Script script; SCRIPT_FOR_CHAR(script, params->character()) @@ -214,7 +214,7 @@ SharedGlyph Converter::calcGlyph(const GlyphRenderParams *params, Affine &affine { FT_Matrix matrix; - double angle = deg2rad * params->layout()->glyphOrientationVertical(); + double angle = deg2rad * params->tqlayout()->glyphOrientationVertical(); matrix.xx = (FT_Fixed)( cos(angle) * 0x10000L); matrix.xy = (FT_Fixed)(-sin(angle) * 0x10000L); matrix.yx = (FT_Fixed)( sin(angle) * 0x10000L); @@ -257,21 +257,21 @@ GlyphSet *Converter::calcString(Font *font, const unsigned short *text, unsigned if(params->useBidi()) { FriBidiCharType baseDir = FRIBIDI_TYPE_N; - FriBidiChar *unicodeIn = new FriBidiChar[length + 1]; - FriBidiChar *unicodeOut = new FriBidiChar[length + 1]; + FriBidiChar *tqunicodeIn = new FriBidiChar[length + 1]; + FriBidiChar *tqunicodeOut = new FriBidiChar[length + 1]; bidi = new unsigned short[length + 1]; for(unsigned int i = 0; i < length; i++) - unicodeIn[i] = text[i]; + tqunicodeIn[i] = text[i]; - fribidi_log2vis(unicodeIn, length, &baseDir, unicodeOut, 0, 0, 0); + fribidi_log2vis(tqunicodeIn, length, &baseDir, tqunicodeOut, 0, 0, 0); for(unsigned int i = 0; i < length; i++) - bidi[i] = unicodeOut[i]; + bidi[i] = tqunicodeOut[i]; bidi[length] = 0; - delete []unicodeIn; - delete []unicodeOut; + delete []tqunicodeIn; + delete []tqunicodeOut; } else bidi = const_cast(text); @@ -302,7 +302,7 @@ GlyphSet *Converter::calcString(Font *font, const unsigned short *text, unsigned int pixelUnderlineThickness = T2PMAX(1, (int) ((font->fontFace()->underline_thickness * fontSize / font->fontFace()->units_per_EM) * affine.m22())); // 3. Prepare needed variables for the rendering loop - // - rendering params (layout, font...) + // - rendering params (tqlayout, font...) // - bounding box (per glyph, overall) // - glyph matrix (overall) // - resulting glyph sets @@ -456,7 +456,7 @@ GlyphSet *Converter::calcString(Font *font, const unsigned short *text, unsigned result->m_height = T2PMAX(1, int(bbox.b().y() - bbox.a().y())); // Correct bounding box information also on - // vertical layouts! (Niko) + // vertical tqlayouts! (Niko) if(!params->tb()) { if(bpath) diff --git a/ksvg/impl/libs/libtext2path/src/Font.cpp b/ksvg/impl/libs/libtext2path/src/Font.cpp index 1d6f7005..2ced971d 100644 --- a/ksvg/impl/libs/libtext2path/src/Font.cpp +++ b/ksvg/impl/libs/libtext2path/src/Font.cpp @@ -141,7 +141,7 @@ std::string Font::buildRequest(const FontVisualParams *fontParams, int &id) FcPatternAddString(pattern, FC_FAMILY, reinterpret_cast(string.c_str())); } - // Always load vertical layout + // Always load vertical tqlayout FcPatternAddBool(pattern, FC_VERTICAL_LAYOUT, true); // Disable hinting @@ -208,7 +208,7 @@ bool Font::load(const FontVisualParams *fontParams) return false; } - // Choose unicode charmap + // Choose tqunicode charmap for(int charmap = 0; charmap < m_fontFace->num_charmaps; charmap++) { if(m_fontFace->charmaps[charmap]->encoding == ft_encoding_unicode) @@ -217,7 +217,7 @@ bool Font::load(const FontVisualParams *fontParams) if(error) { - std::cout << "Font::load(), unable to select unicode charmap. Aborting!" << std::endl; + std::cout << "Font::load(), unable to select tqunicode charmap. Aborting!" << std::endl; FT_Done_Face(m_fontFace); m_fontFace = 0; diff --git a/ksvg/impl/libs/libtext2path/src/Glyph.cpp b/ksvg/impl/libs/libtext2path/src/Glyph.cpp index 5d172018..08ad55a8 100644 --- a/ksvg/impl/libs/libtext2path/src/Glyph.cpp +++ b/ksvg/impl/libs/libtext2path/src/Glyph.cpp @@ -1,5 +1,4 @@ -/* - Copyright (C) 2003 Nikolas Zimmermann +/* Copyright (C) 2003 Nikolas Zimmermann This file is part of the KDE project This library is free software; you can redistribute it and/or @@ -310,14 +309,14 @@ void GlyphRenderParams::setFont(Font *font) m_font = font; } -const GlyphLayoutParams *GlyphRenderParams::layout() const +const GlyphLayoutParams *GlyphRenderParams::tqlayout() const { return m_layout; } -void GlyphRenderParams::setLayout(const GlyphLayoutParams *layout) +void GlyphRenderParams::setLayout(const GlyphLayoutParams *tqlayout) { - m_layout = layout; + m_layout = tqlayout; } unsigned int GlyphRenderParams::glyphIndex() const diff --git a/ksvg/impl/libs/libtext2path/src/Glyph.h b/ksvg/impl/libs/libtext2path/src/Glyph.h index b3bd3fb5..73951b47 100644 --- a/ksvg/impl/libs/libtext2path/src/Glyph.h +++ b/ksvg/impl/libs/libtext2path/src/Glyph.h @@ -171,8 +171,8 @@ namespace T2P Font *font() const; void setFont(Font *font); - const GlyphLayoutParams *layout() const; - void setLayout(const GlyphLayoutParams *layout); + const GlyphLayoutParams *tqlayout() const; + void setLayout(const GlyphLayoutParams *tqlayout); unsigned int glyphIndex() const; void setGlyphIndex(unsigned int glyphIndex); @@ -185,7 +185,7 @@ namespace T2P private: Font *m_font; - const GlyphLayoutParams *m_layout; // Glyph layouting params + const GlyphLayoutParams *m_layout; // Glyph tqlayouting params unsigned int m_glyphIndex; // 'character' index in font unsigned int m_lastGlyph; // Kerning diff --git a/ksvg/impl/libs/libtext2path/src/QtUnicode.cpp b/ksvg/impl/libs/libtext2path/src/QtUnicode.cpp index 33855a81..1103ab69 100644 --- a/ksvg/impl/libs/libtext2path/src/QtUnicode.cpp +++ b/ksvg/impl/libs/libtext2path/src/QtUnicode.cpp @@ -5,27 +5,27 @@ ** ** Copyright (C) 2002-2003 Trolltech AS. All rights reserved. ** -** This file is part of the kernel module of the Qt GUI Toolkit. +** This file is part of the kernel module of the TQt GUI Toolkit. ** ** This file may be distributed under the terms of the Q Public License ** as defined by Trolltech AS of Norway and appearing in the file -** LICENSE.QPL included in the packaging of this file. +** LICENSE.TQPL included in the packaging of this file. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** -** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition -** licenses may use this file in accordance with the Qt Commercial License +** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition +** licenses may use this file in accordance with the TQt Commercial License ** Agreement provided with the Software. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for -** information about Qt Commercial License Agreements. -** See http://www.trolltech.com/qpl/ for QPL licensing information. +** information about TQt Commercial License Agreements. +** See http://www.trolltech.com/qpl/ for TQPL licensing information. ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** ** Contact info@trolltech.com if any conditions of this licensing are diff --git a/ksvg/impl/libs/libtext2path/src/QtUnicode.h b/ksvg/impl/libs/libtext2path/src/QtUnicode.h index 41008500..29714502 100644 --- a/ksvg/impl/libs/libtext2path/src/QtUnicode.h +++ b/ksvg/impl/libs/libtext2path/src/QtUnicode.h @@ -18,8 +18,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef T2P_QT_UNICODE_H -#define T2P_QT_UNICODE_H +#ifndef T2P_TQT_UNICODE_H +#define T2P_TQT_UNICODE_H namespace T2P { diff --git a/ksvg/impl/libs/libtext2path/src/myboost/shared_ptr.hpp b/ksvg/impl/libs/libtext2path/src/myboost/shared_ptr.hpp index 3f2fe30d..696cfec3 100644 --- a/ksvg/impl/libs/libtext2path/src/myboost/shared_ptr.hpp +++ b/ksvg/impl/libs/libtext2path/src/myboost/shared_ptr.hpp @@ -372,7 +372,7 @@ template std::ostream & operator<< (std::ostream & os, shared_ptr co #if (defined(__GNUC__) && (__GNUC__ < 3)) || (defined(__EDG_VERSION__) && (__EDG_VERSION__ <= 238)) // g++ 2.9x doesn't allow static_cast(void *) -// apparently EDG 2.38 also doesn't accept it +// aptqparently EDG 2.38 also doesn't accept it template D * get_deleter(shared_ptr const & p) { 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: -- cgit v1.2.3