summaryrefslogtreecommitdiffstats
path: root/chalk/core
diff options
context:
space:
mode:
Diffstat (limited to 'chalk/core')
-rw-r--r--chalk/core/kis_brush.cc4
-rw-r--r--chalk/core/kis_exif_value.cc68
-rw-r--r--chalk/core/kis_gradient_painter.cc26
-rw-r--r--chalk/core/kis_gradient_painter.h2
-rw-r--r--chalk/core/kis_group_layer.cc4
-rw-r--r--chalk/core/kis_group_layer.h2
-rw-r--r--chalk/core/kis_nameserver.cc2
-rw-r--r--chalk/core/kis_selection.cc2
8 files changed, 55 insertions, 55 deletions
diff --git a/chalk/core/kis_brush.cc b/chalk/core/kis_brush.cc
index 31ee9d18..247bc7df 100644
--- a/chalk/core/kis_brush.cc
+++ b/chalk/core/kis_brush.cc
@@ -816,7 +816,7 @@ TQImage KisBrush::scaleImage(const TQImage& srcImage, int width, int height)
// or scaling it to less than half size.
scaledImage = srcImage.smoothScale(width, height);
- //filename = TQString("smoothScale_%1x%2.png").tqarg(width).tqarg(height);
+ //filename = TQString("smoothScale_%1x%2.png").arg(width).arg(height);
}
else {
scaledImage.create(width, height, 32);
@@ -936,7 +936,7 @@ TQImage KisBrush::scaleImage(const TQImage& srcImage, int width, int height)
}
}
- //filename = TQString("bilinear_%1x%2.png").tqarg(width).tqarg(height);
+ //filename = TQString("bilinear_%1x%2.png").arg(width).arg(height);
}
//scaledImage.save(filename, "PNG");
diff --git a/chalk/core/kis_exif_value.cc b/chalk/core/kis_exif_value.cc
index 85099877..1981bd02 100644
--- a/chalk/core/kis_exif_value.cc
+++ b/chalk/core/kis_exif_value.cc
@@ -157,7 +157,7 @@ bool ExifValue::load(const TQDomElement& elmt)
case EXIF_TYPE_BYTE:
for(uint i = 0; i < components(); i++)
{
- if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() )
+ if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() )
{
setValue(i, (TQ_UINT8)0);
} else {
@@ -171,7 +171,7 @@ bool ExifValue::load(const TQDomElement& elmt)
case EXIF_TYPE_SHORT:
for(uint i = 0; i < components(); i++)
{
- if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() )
+ if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() )
{
setValue(i, (TQ_UINT16)0);
} else {
@@ -182,7 +182,7 @@ bool ExifValue::load(const TQDomElement& elmt)
case EXIF_TYPE_LONG:
for(uint i = 0; i < components(); i++)
{
- if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() )
+ if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() )
{
setValue(i, (TQ_UINT32)0);
} else {
@@ -194,13 +194,13 @@ bool ExifValue::load(const TQDomElement& elmt)
for(uint i = 0; i < components(); i++)
{
KisExifRational r;
- if( (attr = elmt.attribute(TQString("numerator%1").tqarg(i) ) ).isNull() )
+ if( (attr = elmt.attribute(TQString("numerator%1").arg(i) ) ).isNull() )
{
r.numerator = (TQ_UINT32)0;
} else {
r.numerator = (TQ_UINT32) attr.toUInt();
}
- if( (attr = elmt.attribute(TQString("denominator%1").tqarg(i) ) ).isNull() )
+ if( (attr = elmt.attribute(TQString("denominator%1").arg(i) ) ).isNull() )
{
r.denominator = (TQ_UINT32)0;
} else {
@@ -212,7 +212,7 @@ bool ExifValue::load(const TQDomElement& elmt)
case EXIF_TYPE_SBYTE:
for(uint i = 0; i < components(); i++)
{
- if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() )
+ if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() )
{
setValue(i, (TQ_INT8)0);
} else {
@@ -233,7 +233,7 @@ bool ExifValue::load(const TQDomElement& elmt)
case EXIF_TYPE_SSHORT:
for(uint i = 0; i < components(); i++)
{
- if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() )
+ if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() )
{
setValue(i, (TQ_INT16)0);
} else {
@@ -244,7 +244,7 @@ bool ExifValue::load(const TQDomElement& elmt)
case EXIF_TYPE_SLONG:
for(uint i = 0; i < components(); i++)
{
- if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() )
+ if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() )
{
setValue(i, (TQ_INT32)0);
} else {
@@ -256,13 +256,13 @@ bool ExifValue::load(const TQDomElement& elmt)
for(uint i = 0; i < components(); i++)
{
KisExifSRational r;
- if( (attr = elmt.attribute(TQString("numerator%1").tqarg(i) ) ).isNull() )
+ if( (attr = elmt.attribute(TQString("numerator%1").arg(i) ) ).isNull() )
{
r.numerator = (TQ_INT32)0;
} else {
r.numerator = (TQ_INT32) attr.toInt();
}
- if( (attr = elmt.attribute(TQString("denominator%1").tqarg(i) ) ).isNull() )
+ if( (attr = elmt.attribute(TQString("denominator%1").arg(i) ) ).isNull() )
{
r.denominator = (TQ_UINT32)0;
} else {
@@ -274,7 +274,7 @@ bool ExifValue::load(const TQDomElement& elmt)
case EXIF_TYPE_FLOAT:
for(uint i = 0; i < components(); i++)
{
- if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() )
+ if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() )
{
setValue(i, (float)0);
} else {
@@ -285,7 +285,7 @@ bool ExifValue::load(const TQDomElement& elmt)
case EXIF_TYPE_DOUBLE:
for(uint i = 0; i < components(); i++)
{
- if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() )
+ if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() )
{
setValue(i, (double)0);
} else {
@@ -310,30 +310,30 @@ TQDomElement ExifValue::save(TQDomDocument& doc)
{
case EXIF_TYPE_BYTE:
for(uint i = 0; i < components(); i++)
- elmt.setAttribute(TQString("value%1").tqarg(i), asByte( i ) );
+ elmt.setAttribute(TQString("value%1").arg(i), asByte( i ) );
break;
case EXIF_TYPE_ASCII:
elmt.setAttribute("value", asAscii() );
break;
case EXIF_TYPE_SHORT:
for(uint i = 0; i < components(); i++)
- elmt.setAttribute(TQString("value%1").tqarg(i), asShort( i ) );
+ elmt.setAttribute(TQString("value%1").arg(i), asShort( i ) );
break;
case EXIF_TYPE_LONG:
for(uint i = 0; i < components(); i++)
- elmt.setAttribute(TQString("value%1").tqarg(i), asLong( i ) );
+ elmt.setAttribute(TQString("value%1").arg(i), asLong( i ) );
break;
case EXIF_TYPE_RATIONAL:
for(uint i = 0; i < components(); i++)
{
KisExifRational r = asRational(i);
- elmt.setAttribute(TQString("numerator%1").tqarg(i), r.numerator );
- elmt.setAttribute(TQString("denominator%1").tqarg(i), r.denominator );
+ elmt.setAttribute(TQString("numerator%1").arg(i), r.numerator );
+ elmt.setAttribute(TQString("denominator%1").arg(i), r.denominator );
}
break;
case EXIF_TYPE_SBYTE:
for(uint i = 0; i < components(); i++)
- elmt.setAttribute(TQString("value%1").tqarg(i), asSByte( i ) );
+ elmt.setAttribute(TQString("value%1").arg(i), asSByte( i ) );
break;
case EXIF_TYPE_UNDEFINED:
{
@@ -348,27 +348,27 @@ TQDomElement ExifValue::save(TQDomDocument& doc)
break;
case EXIF_TYPE_SSHORT:
for(uint i = 0; i < components(); i++)
- elmt.setAttribute(TQString("value%1").tqarg(i), asSShort( i ) );
+ elmt.setAttribute(TQString("value%1").arg(i), asSShort( i ) );
break;
case EXIF_TYPE_SLONG:
for(uint i = 0; i < components(); i++)
- elmt.setAttribute(TQString("value%1").tqarg(i), asSLong( i ) );
+ elmt.setAttribute(TQString("value%1").arg(i), asSLong( i ) );
break;
case EXIF_TYPE_SRATIONAL:
for(uint i = 0; i < components(); i++)
{
KisExifSRational r = asSRational(i);
- elmt.setAttribute(TQString("numerator%1").tqarg(i), r.numerator );
- elmt.setAttribute(TQString("denominator%1").tqarg(i), r.denominator );
+ elmt.setAttribute(TQString("numerator%1").arg(i), r.numerator );
+ elmt.setAttribute(TQString("denominator%1").arg(i), r.denominator );
}
break;
case EXIF_TYPE_FLOAT:
for(uint i = 0; i < components(); i++)
- elmt.setAttribute(TQString("value%1").tqarg(i), asFloat( i ) );
+ elmt.setAttribute(TQString("value%1").arg(i), asFloat( i ) );
break;
case EXIF_TYPE_DOUBLE:
for(uint i = 0; i < components(); i++)
- elmt.setAttribute(TQString("value%1").tqarg(i), asDouble( i ) );
+ elmt.setAttribute(TQString("value%1").arg(i), asDouble( i ) );
break;
case EXIF_TYPE_UNKNOW:
break;
@@ -660,25 +660,25 @@ TQString ExifValue::toString(uint i)
switch(type())
{
case EXIF_TYPE_BYTE:
- return TQString("%1 ").tqarg( asExifNumber( i ).m_byte );
+ return TQString("%1 ").arg( asExifNumber( i ).m_byte );
case EXIF_TYPE_SHORT:
- return TQString("%1 ").tqarg( asExifNumber( i ).m_short );
+ return TQString("%1 ").arg( asExifNumber( i ).m_short );
case EXIF_TYPE_LONG:
- return TQString("%1 ").tqarg( asExifNumber( i ).m_long );
+ return TQString("%1 ").arg( asExifNumber( i ).m_long );
case EXIF_TYPE_RATIONAL:
- return TQString("%1 / %2 ").tqarg( asExifNumber( i ).m_rational.numerator ).tqarg( asExifNumber( i ).m_rational.denominator );
+ return TQString("%1 / %2 ").arg( asExifNumber( i ).m_rational.numerator ).arg( asExifNumber( i ).m_rational.denominator );
case EXIF_TYPE_SBYTE:
- return TQString("%1 ").tqarg( asExifNumber( i ).m_sbyte );
+ return TQString("%1 ").arg( asExifNumber( i ).m_sbyte );
case EXIF_TYPE_SSHORT:
- return TQString("%1 ").tqarg( asExifNumber( i ).m_sshort );
+ return TQString("%1 ").arg( asExifNumber( i ).m_sshort );
case EXIF_TYPE_SLONG:
- return TQString("%1 ").tqarg( asExifNumber( i ).m_slong );
+ return TQString("%1 ").arg( asExifNumber( i ).m_slong );
case EXIF_TYPE_SRATIONAL:
- return TQString("%1 / %2 ").tqarg( asExifNumber( i ).m_srational.numerator ).tqarg( asExifNumber( i ).m_srational.denominator );
+ return TQString("%1 / %2 ").arg( asExifNumber( i ).m_srational.numerator ).arg( asExifNumber( i ).m_srational.denominator );
case EXIF_TYPE_FLOAT:
- return TQString("%1 ").tqarg( asExifNumber( i ).m_float );
+ return TQString("%1 ").arg( asExifNumber( i ).m_float );
case EXIF_TYPE_DOUBLE:
- return TQString("%1 ").tqarg( asExifNumber( i ).m_double );
+ return TQString("%1 ").arg( asExifNumber( i ).m_double );
default:
return "unknow ";
}
diff --git a/chalk/core/kis_gradient_painter.cc b/chalk/core/kis_gradient_painter.cc
index 2258d899..672747a5 100644
--- a/chalk/core/kis_gradient_painter.cc
+++ b/chalk/core/kis_gradient_painter.cc
@@ -483,7 +483,7 @@ KisGradientPainter::KisGradientPainter(KisPaintDeviceSP device) : super(device),
bool KisGradientPainter::paintGradient(const KisPoint& gradientVectorStart,
const KisPoint& gradientVectorEnd,
- enumGradientShape tqshape,
+ enumGradientShape shape,
enumGradientRepeat repeat,
double antiAliasThreshold,
bool reverseGradient,
@@ -496,29 +496,29 @@ bool KisGradientPainter::paintGradient(const KisPoint& gradientVectorStart,
if (!m_gradient) return false;
- GradientShapeStrategy *tqshapeStrategy = 0;
+ GradientShapeStrategy *shapeStrategy = 0;
- switch (tqshape) {
+ switch (shape) {
case GradientShapeLinear:
- tqshapeStrategy = new LinearGradientStrategy(gradientVectorStart, gradientVectorEnd);
+ shapeStrategy = new LinearGradientStrategy(gradientVectorStart, gradientVectorEnd);
break;
case GradientShapeBiLinear:
- tqshapeStrategy = new BiLinearGradientStrategy(gradientVectorStart, gradientVectorEnd);
+ shapeStrategy = new BiLinearGradientStrategy(gradientVectorStart, gradientVectorEnd);
break;
case GradientShapeRadial:
- tqshapeStrategy = new RadialGradientStrategy(gradientVectorStart, gradientVectorEnd);
+ shapeStrategy = new RadialGradientStrategy(gradientVectorStart, gradientVectorEnd);
break;
case GradientShapeSquare:
- tqshapeStrategy = new SquareGradientStrategy(gradientVectorStart, gradientVectorEnd);
+ shapeStrategy = new SquareGradientStrategy(gradientVectorStart, gradientVectorEnd);
break;
case GradientShapeConical:
- tqshapeStrategy = new ConicalGradientStrategy(gradientVectorStart, gradientVectorEnd);
+ shapeStrategy = new ConicalGradientStrategy(gradientVectorStart, gradientVectorEnd);
break;
case GradientShapeConicalSymetric:
- tqshapeStrategy = new ConicalSymetricGradientStrategy(gradientVectorStart, gradientVectorEnd);
+ shapeStrategy = new ConicalSymetricGradientStrategy(gradientVectorStart, gradientVectorEnd);
break;
}
- Q_CHECK_PTR(tqshapeStrategy);
+ Q_CHECK_PTR(shapeStrategy);
GradientRepeatStrategy *repeatStrategy = 0;
@@ -566,7 +566,7 @@ bool KisGradientPainter::paintGradient(const KisPoint& gradientVectorStart,
for (int y = starty; y <= endy; y++) {
for (int x = startx; x <= endx; x++) {
- double t = tqshapeStrategy->valueAt( x, y);
+ double t = shapeStrategy->valueAt( x, y);
t = repeatStrategy->valueAt(t);
if (reverseGradient) {
@@ -662,7 +662,7 @@ bool KisGradientPainter::paintGradient(const KisPoint& gradientVectorStart,
double sampleX = x - 0.5 + (sampleWidth / 2) + xSample * sampleWidth;
double sampleY = y - 0.5 + (sampleWidth / 2) + ySample * sampleWidth;
- double t = tqshapeStrategy->valueAt(sampleX, sampleY);
+ double t = shapeStrategy->valueAt(sampleX, sampleY);
t = repeatStrategy->valueAt(t);
if (reverseGradient) {
@@ -715,7 +715,7 @@ bool KisGradientPainter::paintGradient(const KisPoint& gradientVectorStart,
dev->writeBytes(layer.bits(), startx, starty, width, height);
bltSelection(startx, starty, m_compositeOp, dev, m_opacity, startx, starty, width, height);
}
- delete tqshapeStrategy;
+ delete shapeStrategy;
emit notifyProgressDone();
diff --git a/chalk/core/kis_gradient_painter.h b/chalk/core/kis_gradient_painter.h
index fc31b117..2c0e29c2 100644
--- a/chalk/core/kis_gradient_painter.h
+++ b/chalk/core/kis_gradient_painter.h
@@ -66,7 +66,7 @@ public:
*/
bool paintGradient(const KisPoint& gradientVectorStart,
const KisPoint& gradientVectorEnd,
- enumGradientShape tqshape,
+ enumGradientShape shape,
enumGradientRepeat repeat,
double antiAliasThreshold,
bool reverseGradient,
diff --git a/chalk/core/kis_group_layer.cc b/chalk/core/kis_group_layer.cc
index 1f08dbdd..0e2f90d2 100644
--- a/chalk/core/kis_group_layer.cc
+++ b/chalk/core/kis_group_layer.cc
@@ -207,7 +207,7 @@ bool KisGroupLayer::removeLayer(int x)
m_layers.erase(m_layers.begin() + reverseIndex(index));
setDirty(removedLayer->extent());
if (childCount() < 1) {
- // No tqchildren, nothing to show for it.
+ // No children, nothing to show for it.
m_projection->clear();
setDirty();
}
@@ -308,7 +308,7 @@ void KisGroupLayer::updateProjection(const TQRect & rc)
// Get the first layer in this group to start compositing with
KisLayerSP child = lastChild();
- // No child -- clear the projection. Without tqchildren, a group layer is empty.
+ // No child -- clear the projection. Without children, a group layer is empty.
if (!child) m_projection->clear();
KisLayerSP startWith = 0;
diff --git a/chalk/core/kis_group_layer.h b/chalk/core/kis_group_layer.h
index a516ac72..58a3ddab 100644
--- a/chalk/core/kis_group_layer.h
+++ b/chalk/core/kis_group_layer.h
@@ -80,7 +80,7 @@ public:
{
// kdDebug(41001) << "GROUP\t\t" << name()
// << " dirty: " << dirty()
-// << ", " << m_layers.count() << " tqchildren "
+// << ", " << m_layers.count() << " children "
// << ", projection: " << m_projection
// << "\n";
return v.visit(this);
diff --git a/chalk/core/kis_nameserver.cc b/chalk/core/kis_nameserver.cc
index ff66144d..4cb51a98 100644
--- a/chalk/core/kis_nameserver.cc
+++ b/chalk/core/kis_nameserver.cc
@@ -29,7 +29,7 @@ KisNameServer::~KisNameServer()
TQString KisNameServer::name()
{
- return m_prefix.tqarg(m_generator++);
+ return m_prefix.arg(m_generator++);
}
TQ_INT32 KisNameServer::currentSeed() const
diff --git a/chalk/core/kis_selection.cc b/chalk/core/kis_selection.cc
index 03d76616..69b90fe3 100644
--- a/chalk/core/kis_selection.cc
+++ b/chalk/core/kis_selection.cc
@@ -215,7 +215,7 @@ void KisSelection::paintUniformSelectionRegion(TQImage img, const TQRect& imageR
TQRegion region = uniformRegion & TQRegion(imageRect);
if (!region.isEmpty()) {
- TQMemArray<TQRect> rects = region.tqrects();
+ TQMemArray<TQRect> rects = region.rects();
for (unsigned int i = 0; i < rects.count(); i++) {
TQRect r = rects[i];
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-18 23:12:58 +0000