summaryrefslogtreecommitdiffstats
path: root/chalk/plugins/viewplugins/scripting
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-19 11:38:41 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-19 11:38:41 -0600
commitf0de9e167e289ab7dc33e57f077c1f04ec7c68c8 (patch)
tree1fc538e179833e62caec21956bfe47a252be5a72 /chalk/plugins/viewplugins/scripting
parent11191ef0b9908604d1d7aaca382b011ef22c454c (diff)
downloadkoffice-f0de9e167e289ab7dc33e57f077c1f04ec7c68c8.tar.gz
koffice-f0de9e167e289ab7dc33e57f077c1f04ec7c68c8.zip
Remove additional unneeded tq method conversions
Diffstat (limited to 'chalk/plugins/viewplugins/scripting')
-rw-r--r--chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp8
-rw-r--r--chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.h4
-rw-r--r--chalk/plugins/viewplugins/scripting/chalkcore/krs_filter.cpp2
-rw-r--r--chalk/plugins/viewplugins/scripting/chalkcore/krs_image.cpp2
-rw-r--r--chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h4
-rw-r--r--chalk/plugins/viewplugins/scripting/chalkcore/krs_paint_layer.cpp4
-rw-r--r--chalk/plugins/viewplugins/scripting/chalkcore/krs_painter.cpp6
-rw-r--r--chalk/plugins/viewplugins/scripting/chalkcore/krs_wavelet.cpp8
-rw-r--r--chalk/plugins/viewplugins/scripting/samples/ruby/randompaint.rb16
-rw-r--r--chalk/plugins/viewplugins/scripting/samples/ruby/torture-painting.rb16
10 files changed, 35 insertions, 35 deletions
diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp
index 04f7b653..45c1705a 100644
--- a/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp
+++ b/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp
@@ -209,7 +209,7 @@ Kross::Api::Object::Ptr ChalkCoreFactory::newImage(Kross::Api::List::Ptr args)
KisColorSpace * cs = KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID(csname, ""), "");
if(!cs)
{
- throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("Colorspace %0 is not available, please check your installation.").tqarg(csname ) ) );
+ throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("Colorspace %0 is not available, please check your installation.").arg(csname ) ) );
return 0;
}
@@ -225,9 +225,9 @@ ChalkCoreModule::ChalkCoreModule(Kross::Api::Manager* manager)
: Kross::Api::Module("chalkcore") , m_manager(manager), m_factory(0)
{
- TQMap<TQString, Object::Ptr> tqchildren = manager->getChildren();
- kdDebug(41011) << " there are " << tqchildren.size() << endl;
- for(TQMap<TQString, Object::Ptr>::const_iterator it = tqchildren.begin(); it != tqchildren.end(); it++)
+ TQMap<TQString, Object::Ptr> children = manager->getChildren();
+ kdDebug(41011) << " there are " << children.size() << endl;
+ for(TQMap<TQString, Object::Ptr>::const_iterator it = children.begin(); it != children.end(); it++)
{
kdDebug(41011) << it.key() << " " << it.data() << endl;
}
diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.h b/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.h
index d719edd6..5ddb004d 100644
--- a/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.h
+++ b/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.h
@@ -108,7 +108,7 @@ namespace Kross { namespace ChalkCore {
*/
Kross::Api::Object::Ptr getBrush(Kross::Api::List::Ptr);
/**
- * This function return a Brush with a circular tqshape
+ * This function return a Brush with a circular shape
* It takes at least two arguments :
* - width
* - height
@@ -127,7 +127,7 @@ namespace Kross { namespace ChalkCore {
*/
Kross::Api::Object::Ptr newCircleBrush(Kross::Api::List::Ptr);
/**
- * This function return a Brush with a rectangular tqshape
+ * This function return a Brush with a rectangular shape
* It takes at least two arguments :
* - width
* - height
diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_filter.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/krs_filter.cpp
index ecac5501..e2f09a58 100644
--- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_filter.cpp
+++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_filter.cpp
@@ -53,7 +53,7 @@ Kross::Api::Object::Ptr Filter::process(Kross::Api::List::Ptr args)
PaintLayer* src = (PaintLayer*)args->item(0).data();
if(!m_filter->workWith( src->paintLayer()->paintDevice()->colorSpace()))
{
- throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("process") ) );
+ throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("process") ) );
}
TQRect rect;
if( args->count() >1)
diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_image.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/krs_image.cpp
index c93d6e88..1486d415 100644
--- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_image.cpp
+++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_image.cpp
@@ -80,7 +80,7 @@ Kross::Api::Object::Ptr Image::convertToColorspace(Kross::Api::List::Ptr args)
KisColorSpace * dstCS = KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID(Kross::Api::Variant::toString(args->item(0)), ""), "");
if(!dstCS)
{
- throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("Colorspace %0 is not available, please check your installation.").tqarg(Kross::Api::Variant::toString(args->item(0))) ) );
+ throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("Colorspace %0 is not available, please check your installation.").arg(Kross::Api::Variant::toString(args->item(0))) ) );
return 0;
}
m_image->convertTo(dstCS);
diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h b/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h
index b01ba0a8..0b22ebf5 100644
--- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h
+++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h
@@ -246,7 +246,7 @@ class Iterator : public Kross::Api::Class<Iterator<_T_It> >, private IteratorMem
pixel.push_back( *((float*) data) );
break;
default:
- kdDebug(41011) << i18n("An error has occurred in %1").tqarg("getPixel") << endl;
+ kdDebug(41011) << i18n("An error has occurred in %1").arg("getPixel") << endl;
kdDebug(41011) << i18n("unsupported data format in scripts") << endl;
break;
}
@@ -274,7 +274,7 @@ class Iterator : public Kross::Api::Class<Iterator<_T_It> >, private IteratorMem
*((float*) data) = pixel[i].toDouble();
break;
default:
- kdDebug(41011) << i18n("An error has occurred in %1").tqarg("setPixel") << endl;
+ kdDebug(41011) << i18n("An error has occurred in %1").arg("setPixel") << endl;
kdDebug(41011) << i18n("unsupported data format in scripts") << endl;
break;
}
diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_paint_layer.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/krs_paint_layer.cpp
index 5f800f6a..9f27adc6 100644
--- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_paint_layer.cpp
+++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_paint_layer.cpp
@@ -130,7 +130,7 @@ Kross::Api::Object::Ptr PaintLayer::createHistogram(Kross::Api::List::Ptr args)
{
return new Histogram( paintLayer().data(), factory->generate() , type);
} else {
- throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("createHistogram") + "\n" + i18n("The histogram %1 is not available").tqarg(histoname) ) );
+ throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("createHistogram") + "\n" + i18n("The histogram %1 is not available").arg(histoname) ) );
}
return 0;
}
@@ -172,7 +172,7 @@ Kross::Api::Object::Ptr PaintLayer::convertToColorspace(Kross::Api::List::Ptr ar
if(!dstCS)
{
// FIXME: inform user
- throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("convertToColorspace") + "\n" + i18n("Colorspace %1 is not available, please check your installation.").tqarg(Kross::Api::Variant::toString(args->item(0))) ) );
+ throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("convertToColorspace") + "\n" + i18n("Colorspace %1 is not available, please check your installation.").arg(Kross::Api::Variant::toString(args->item(0))) ) );
return 0;
}
paintLayer()->paintDevice()->convertTo(dstCS);
diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_painter.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/krs_painter.cpp
index 44991303..5aee1431 100644
--- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_painter.cpp
+++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_painter.cpp
@@ -110,7 +110,7 @@ Kross::Api::Object::Ptr Painter::convolve(Kross::Api::List::Ptr args)
TQVariant firstlineVariant = *kernelH.begin();
if(firstlineVariant.type() != TQVariant::List)
{
- throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").tqarg("applyConvolution")) );
+ throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").arg("applyConvolution")) );
}
TQValueList<TQVariant> firstline = firstlineVariant.toList();
@@ -126,12 +126,12 @@ Kross::Api::Object::Ptr Painter::convolve(Kross::Api::List::Ptr args)
TQVariant lineVariant = *kernelH.begin();
if(lineVariant.type() != TQVariant::List)
{
- throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").tqarg("applyConvolution")) );
+ throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").arg("applyConvolution")) );
}
TQValueList<TQVariant> line = firstlineVariant.toList();
if(line.size() != kernel.width)
{
- throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").tqarg("applyConvolution")) );
+ throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").arg("applyConvolution")) );
}
uint j = 0;
for(TQValueList<TQVariant>::iterator itLine = line.begin(); itLine != line.end(); itLine++, j ++ )
diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_wavelet.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/krs_wavelet.cpp
index e166de7c..c8ef92c5 100644
--- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_wavelet.cpp
+++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_wavelet.cpp
@@ -52,7 +52,7 @@ Kross::Api::Object::Ptr Wavelet::getNCoeff(Kross::Api::List::Ptr args)
TQ_UINT32 n = Kross::Api::Variant::toUInt(args->item(0));
if( n > m_numCoeff)
{
- throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("getNCoeff") + "\n" + i18n("Index out of bound") ) );
+ throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("getNCoeff") + "\n" + i18n("Index out of bound") ) );
}
return new Kross::Api::Variant(*(m_wavelet->coeffs + n ));
}
@@ -63,7 +63,7 @@ Kross::Api::Object::Ptr Wavelet::setNCoeff(Kross::Api::List::Ptr args)
double v = Kross::Api::Variant::toDouble(args->item(1));
if( n > m_numCoeff)
{
- throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("setNCoeff") + "\n" + i18n("Index out of bound") ) );
+ throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("setNCoeff") + "\n" + i18n("Index out of bound") ) );
}
*(m_wavelet->coeffs + n ) = v;
return 0;
@@ -75,7 +75,7 @@ Kross::Api::Object::Ptr Wavelet::getXYCoeff(Kross::Api::List::Ptr args)
TQ_UINT32 y = Kross::Api::Variant::toUInt(args->item(1));
if( x > m_wavelet->size && y > m_wavelet->size)
{
- throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("getXYCoeff") + "\n" + i18n("Index out of bound") ) );
+ throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("getXYCoeff") + "\n" + i18n("Index out of bound") ) );
}
return new Kross::Api::Variant(*(m_wavelet->coeffs + (x + y * m_wavelet->size ) * m_wavelet->depth ));
}
@@ -87,7 +87,7 @@ Kross::Api::Object::Ptr Wavelet::setXYCoeff(Kross::Api::List::Ptr args)
double v = Kross::Api::Variant::toDouble(args->item(2));
if( x > m_wavelet->size && y > m_wavelet->size)
{
- throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("setXYCoeff") + "\n" + i18n("Index out of bound") ));
+ throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("setXYCoeff") + "\n" + i18n("Index out of bound") ));
}
*(m_wavelet->coeffs + (x + y * m_wavelet->size ) * m_wavelet->depth ) = v;
return 0;
diff --git a/chalk/plugins/viewplugins/scripting/samples/ruby/randompaint.rb b/chalk/plugins/viewplugins/scripting/samples/ruby/randompaint.rb
index 1ec25dcd..7f6a9b05 100644
--- a/chalk/plugins/viewplugins/scripting/samples/ruby/randompaint.rb
+++ b/chalk/plugins/viewplugins/scripting/samples/ruby/randompaint.rb
@@ -60,11 +60,11 @@ for i in 1..100
painter.setBrush( Krosschalkcore::newCircleBrush(rand*20,rand*20,rand*10,rand*10) )
end
# paint a point
- tqshape = rand * 7
+ shape = rand * 7
painter.setStrokeStyle(1)
- if( tqshape < 1 )
+ if( shape < 1 )
painter.paintAt(rand * width , rand * height,1.1)
- elsif(tqshape < 2 )
+ elsif(shape < 2 )
xs = Array.new
ys = Array.new
for i in 0..6
@@ -72,14 +72,14 @@ for i in 1..100
ys[i] = rand*height
end
painter.paintPolyline(xs,ys)
- elsif(tqshape < 3)
+ elsif(shape < 3)
painter.paintLine(rand * width, rand * height, 1.1, rand * width, rand * height,1.1)
- elsif(tqshape < 4)
+ elsif(shape < 4)
painter.paintBezierCurve(rand * width, rand * height, 1.1, rand * width, rand * height, rand * width , rand * height, rand * width, rand * height, 1.1)
- elsif(tqshape < 5)
+ elsif(shape < 5)
randomizeStyle(painter)
painter.paintEllipse(rand * width, rand * height, rand * width, rand * height, 1.1)
- elsif(tqshape < 6)
+ elsif(shape < 6)
xs = Array.new
ys = Array.new
for i in 0..6
@@ -88,7 +88,7 @@ for i in 1..100
end
randomizeStyle(painter)
painter.paintPolygon(xs, ys)
- elsif(tqshape < 7)
+ elsif(shape < 7)
randomizeStyle(painter)
painter.paintRect(rand * width, rand * height, rand * width, rand * height, 1.1)
end
diff --git a/chalk/plugins/viewplugins/scripting/samples/ruby/torture-painting.rb b/chalk/plugins/viewplugins/scripting/samples/ruby/torture-painting.rb
index b7c784fc..68610cc5 100644
--- a/chalk/plugins/viewplugins/scripting/samples/ruby/torture-painting.rb
+++ b/chalk/plugins/viewplugins/scripting/samples/ruby/torture-painting.rb
@@ -91,11 +91,11 @@ class TorturePainting
painter.setBrush( Krosschalkcore::newCircleBrush(rand*20,rand*20,rand*10,rand*10) )
end
# paint a point
- tqshape = rand * 7
+ shape = rand * 7
painter.setStrokeStyle(1)
- if( tqshape < 1 )
+ if( shape < 1 )
painter.paintAt(rand * @width , rand * @height,1.1)
- elsif(tqshape < 2 )
+ elsif(shape < 2 )
xs = Array.new
ys = Array.new
for i in 0..6
@@ -103,14 +103,14 @@ class TorturePainting
ys[i] = rand*@height
end
painter.paintPolyline(xs,ys)
- elsif(tqshape < 3)
+ elsif(shape < 3)
painter.paintLine(rand * @width, rand * @height, 1.1, rand * @width, rand * @height,1.1)
- elsif(tqshape < 4)
+ elsif(shape < 4)
painter.paintBezierCurve(rand * @width, rand * @height, 1.1, rand * @width, rand * @height, rand * @width , rand * @height, rand * @width, rand * @height, 1.1)
- elsif(tqshape < 5)
+ elsif(shape < 5)
randomizeStyle(painter)
painter.paintEllipse(rand * @width, rand * @height, rand * @width, rand * @height, 1.1)
- elsif(tqshape < 6)
+ elsif(shape < 6)
xs = Array.new
ys = Array.new
for i in 0..6
@@ -119,7 +119,7 @@ class TorturePainting
end
randomizeStyle(painter)
painter.paintPolygon(xs, ys)
- elsif(tqshape < 7)
+ elsif(shape < 7)
randomizeStyle(painter)
painter.paintRect(rand * @width, rand * @height, rand * @width, rand * @height, 1.1)
end