summaryrefslogtreecommitdiffstats
path: root/tdecore/svgicons
diff options
context:
space:
mode:
Diffstat (limited to 'tdecore/svgicons')
-rw-r--r--tdecore/svgicons/ksvgiconengine.cpp8
-rw-r--r--tdecore/svgicons/ksvgiconpainter.cpp70
-rw-r--r--tdecore/svgicons/ksvgiconpainter.h4
3 files changed, 41 insertions, 41 deletions
diff --git a/tdecore/svgicons/ksvgiconengine.cpp b/tdecore/svgicons/ksvgiconengine.cpp
index 85830126b..d035972ef 100644
--- a/tdecore/svgicons/ksvgiconengine.cpp
+++ b/tdecore/svgicons/ksvgiconengine.cpp
@@ -201,7 +201,7 @@ public:
// Combine new and old matrix
TQWMatrix matrix = m_engine->painter()->parseTransform(transform);
- TQWMatrix *current = m_engine->painter()->tqworldMatrix();
+ TQWMatrix *current = m_engine->painter()->worldMatrix();
#ifdef USE_QT4
printf("[FIXME] *current = matrix * *current locks up under Qt4; bypassing for now\n\r");
#else // USE_QT4
@@ -628,7 +628,7 @@ bool KSVGIconEngine::load(int width, int height, const TQString &path)
d->width = w;
d->height = h;
- d->painter->tqworldMatrix()->scale(vratiow, vratioh);
+ d->painter->worldMatrix()->scale(vratiow, vratioh);
}
else
{
@@ -637,10 +637,10 @@ bool KSVGIconEngine::load(int width, int height, const TQString &path)
double ratiow = width / d->width;
double ratioh = height / d->height;
- d->painter->tqworldMatrix()->scale(ratiow, ratioh);
+ d->painter->worldMatrix()->scale(ratiow, ratioh);
}
- TQWMatrix initialMatrix = *d->painter->tqworldMatrix();
+ TQWMatrix initialMatrix = *d->painter->worldMatrix();
d->helper->m_initialMatrix = initialMatrix;
// Apply transform
diff --git a/tdecore/svgicons/ksvgiconpainter.cpp b/tdecore/svgicons/ksvgiconpainter.cpp
index 6c4c52c6a..dbd867f13 100644
--- a/tdecore/svgicons/ksvgiconpainter.cpp
+++ b/tdecore/svgicons/ksvgiconpainter.cpp
@@ -65,7 +65,7 @@ public:
m_useFillGradient = false;
m_useStrokeGradient = false;
- m_tqworldMatrix = new TQWMatrix();
+ m_worldMatrix = new TQWMatrix();
// Create new image with alpha support
m_image = new TQImage(width, height, 32);
@@ -102,7 +102,7 @@ public:
art_free(m_buffer);
delete m_image;
- delete m_tqworldMatrix;
+ delete m_worldMatrix;
for(TQMap<TQString, ArtGradientLinear *>::Iterator it = m_linearGradientMap.begin(); it != m_linearGradientMap.end(); ++it)
{
@@ -233,12 +233,12 @@ public:
void drawBPath(ArtBpath *bpath)
{
double affine[6];
- affine[0] = m_tqworldMatrix->m11();
- affine[1] = m_tqworldMatrix->m12();
- affine[2] = m_tqworldMatrix->m21();
- affine[3] = m_tqworldMatrix->m22();
- affine[4] = m_tqworldMatrix->dx();
- affine[5] = m_tqworldMatrix->dy();
+ affine[0] = m_worldMatrix->m11();
+ affine[1] = m_worldMatrix->m12();
+ affine[2] = m_worldMatrix->m21();
+ affine[3] = m_worldMatrix->m22();
+ affine[4] = m_worldMatrix->dx();
+ affine[5] = m_worldMatrix->dy();
ArtBpath *temp = art_bpath_affine_transform(bpath, affine);
ArtVpath *vec = art_bez_path_to_vec(temp, 0.25);
@@ -249,12 +249,12 @@ public:
void drawVPath(ArtVpath *vec)
{
double affine[6];
- affine[0] = m_tqworldMatrix->m11();
- affine[1] = m_tqworldMatrix->m12();
- affine[2] = m_tqworldMatrix->m21();
- affine[3] = m_tqworldMatrix->m22();
- affine[4] = m_tqworldMatrix->dx();
- affine[5] = m_tqworldMatrix->dy();
+ affine[0] = m_worldMatrix->m11();
+ affine[1] = m_worldMatrix->m12();
+ affine[2] = m_worldMatrix->m21();
+ affine[3] = m_worldMatrix->m22();
+ affine[4] = m_worldMatrix->dx();
+ affine[5] = m_worldMatrix->dy();
ArtVpath *temp = art_vpath_affine_transform(vec, affine);
art_free(vec);
@@ -461,10 +461,10 @@ public:
m.map(x1, y1, &x1, &y1);
m.map(x2, y2, &x2, &y2);
- double x1n = x1 * m_tqworldMatrix->m11() + y1 * m_tqworldMatrix->m21() + m_tqworldMatrix->dx();
- double y1n = x1 * m_tqworldMatrix->m12() + y1 * m_tqworldMatrix->m22() + m_tqworldMatrix->dy();
- double x2n = x2 * m_tqworldMatrix->m11() + y2 * m_tqworldMatrix->m21() + m_tqworldMatrix->dx();
- double y2n = x2 * m_tqworldMatrix->m12() + y2 * m_tqworldMatrix->m22() + m_tqworldMatrix->dy();
+ double x1n = x1 * m_worldMatrix->m11() + y1 * m_worldMatrix->m21() + m_worldMatrix->dx();
+ double y1n = x1 * m_worldMatrix->m12() + y1 * m_worldMatrix->m22() + m_worldMatrix->dy();
+ double x2n = x2 * m_worldMatrix->m11() + y2 * m_worldMatrix->m21() + m_worldMatrix->dx();
+ double y2n = x2 * m_worldMatrix->m12() + y2 * m_worldMatrix->m22() + m_worldMatrix->dy();
double dx = x2n - x1n;
double dy = y2n - y1n;
@@ -515,12 +515,12 @@ public:
else
fy = cy;
- radial->affine[0] = m_tqworldMatrix->m11();
- radial->affine[1] = m_tqworldMatrix->m12();
- radial->affine[2] = m_tqworldMatrix->m21();
- radial->affine[3] = m_tqworldMatrix->m22();
- radial->affine[4] = m_tqworldMatrix->dx();
- radial->affine[5] = m_tqworldMatrix->dy();
+ radial->affine[0] = m_worldMatrix->m11();
+ radial->affine[1] = m_worldMatrix->m12();
+ radial->affine[2] = m_worldMatrix->m21();
+ radial->affine[3] = m_worldMatrix->m22();
+ radial->affine[4] = m_worldMatrix->dx();
+ radial->affine[5] = m_worldMatrix->dy();
radial->fx = (fx - cx) / r;
radial->fy = (fy - cy) / r;
@@ -1123,7 +1123,7 @@ private:
ArtSVP *m_clipSVP;
TQImage *m_image;
- TQWMatrix *m_tqworldMatrix;
+ TQWMatrix *m_worldMatrix;
TQString m_fillRule;
TQString m_joinStyle;
@@ -1211,17 +1211,17 @@ TQImage *KSVGIconPainter::image()
return new TQImage(*d->helper->m_image);
}
-TQWMatrix *KSVGIconPainter::tqworldMatrix()
+TQWMatrix *KSVGIconPainter::worldMatrix()
{
- return d->helper->m_tqworldMatrix;
+ return d->helper->m_worldMatrix;
}
void KSVGIconPainter::setWorldMatrix(TQWMatrix *matrix)
{
- if(d->helper->m_tqworldMatrix)
- delete d->helper->m_tqworldMatrix;
+ if(d->helper->m_worldMatrix)
+ delete d->helper->m_worldMatrix;
- d->helper->m_tqworldMatrix = matrix;
+ d->helper->m_worldMatrix = matrix;
}
void KSVGIconPainter::setStrokeWidth(double width)
@@ -2310,12 +2310,12 @@ void KSVGIconPainter::drawImage(double x, double y, TQImage &image)
image = image.convertDepth(32);
double affine[6];
- affine[0] = d->helper->m_tqworldMatrix->m11();
- affine[1] = d->helper->m_tqworldMatrix->m12();
- affine[2] = d->helper->m_tqworldMatrix->m21();
- affine[3] = d->helper->m_tqworldMatrix->m22();
+ affine[0] = d->helper->m_worldMatrix->m11();
+ affine[1] = d->helper->m_worldMatrix->m12();
+ affine[2] = d->helper->m_worldMatrix->m21();
+ affine[3] = d->helper->m_worldMatrix->m22();
// use the world matrix to convert the coordinates
- d->helper->m_tqworldMatrix->map(x, y, &affine[4], &affine[5]);
+ d->helper->m_worldMatrix->map(x, y, &affine[4], &affine[5]);
d->helper->art_rgba_rgba_affine(d->helper->m_buffer, 0, 0, d->helper->m_width, d->helper->m_height,
d->helper->m_rowstride, image.bits(), image.width(), image.height(),
diff --git a/tdecore/svgicons/ksvgiconpainter.h b/tdecore/svgicons/ksvgiconpainter.h
index b80eccea8..de5644187 100644
--- a/tdecore/svgicons/ksvgiconpainter.h
+++ b/tdecore/svgicons/ksvgiconpainter.h
@@ -41,7 +41,7 @@ public:
TQImage *image();
- TQWMatrix *tqworldMatrix();
+ TQWMatrix *worldMatrix();
void finish();
@@ -61,7 +61,7 @@ public:
void setStrokeDashOffset(const TQString &dashOffset);
void setStrokeDashArray(const TQString &dashes);
- void setWorldMatrix(TQWMatrix *tqworldMatrix);
+ void setWorldMatrix(TQWMatrix *worldMatrix);
void setClippingRect(int x, int y, int w, int h);
void drawRectangle(double x, double y, double w, double h, double rx, double ry);