summaryrefslogtreecommitdiffstats
path: root/chalk/plugins/viewplugins
diff options
context:
space:
mode:
Diffstat (limited to 'chalk/plugins/viewplugins')
-rw-r--r--chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui2
-rw-r--r--chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc4
-rw-r--r--chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui6
-rw-r--r--chalk/plugins/viewplugins/imagesize/wdg_layersize.ui4
-rw-r--r--chalk/plugins/viewplugins/imagesize/wdg_resolution.ui2
-rw-r--r--chalk/plugins/viewplugins/performancetest/perftest.cc112
-rw-r--r--chalk/plugins/viewplugins/performancetest/perftest.h2
-rw-r--r--chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui4
-rw-r--r--chalk/plugins/viewplugins/screenshot/ksnapshot.cpp28
-rw-r--r--chalk/plugins/viewplugins/screenshot/regiongrabber.cpp8
-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
-rw-r--r--chalk/plugins/viewplugins/variations/wdg_variations.ui24
21 files changed, 133 insertions, 133 deletions
diff --git a/chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui b/chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui
index 6dba5c01f..4655a4d90 100644
--- a/chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui
+++ b/chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui
@@ -233,7 +233,7 @@
<property name="scaledContents">
<bool>false</bool>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
diff --git a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc
index 0498505d1..00c0c8200 100644
--- a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc
+++ b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc
@@ -91,7 +91,7 @@ void ColorSpaceConversion::slotImgColorSpaceConversion()
if (KMessageBox::warningContinueCancel(m_view,
i18n("This conversion will convert your %1 image through 16-bit L*a*b* and back.\n"
"Watercolor and openEXR colorspaces will even be converted through 8-bit RGB.\n")
- .tqarg(image->colorSpace()->id().name()),
+ .arg(image->colorSpace()->id().name()),
i18n("Colorspace Conversion"),
KGuiItem(i18n("Continue")),
"lab16degradation") != KMessageBox::Continue) return;
@@ -128,7 +128,7 @@ void ColorSpaceConversion::slotLayerColorSpaceConversion()
if (KMessageBox::warningContinueCancel(m_view,
i18n("This conversion will convert your %1 layer through 16-bit L*a*b* and back.\n"
"Watercolor and openEXR colorspaces will even be converted through 8-bit RGB.\n")
- .tqarg(dev->colorSpace()->id().name()),
+ .arg(dev->colorSpace()->id().name()),
i18n("Colorspace Conversion"),
KGuiItem(i18n("Continue")),
"lab16degradation") != KMessageBox::Continue) return;
diff --git a/chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui b/chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui
index 854dcd0af..8e8ca43df 100644
--- a/chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui
+++ b/chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui
@@ -197,7 +197,7 @@
<property name="text">
<string></string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -214,7 +214,7 @@
<property name="text">
<string></string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -307,7 +307,7 @@
<property name="text">
<string>Filter:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
diff --git a/chalk/plugins/viewplugins/imagesize/wdg_layersize.ui b/chalk/plugins/viewplugins/imagesize/wdg_layersize.ui
index 13cd72a8c..b9b3e400a 100644
--- a/chalk/plugins/viewplugins/imagesize/wdg_layersize.ui
+++ b/chalk/plugins/viewplugins/imagesize/wdg_layersize.ui
@@ -76,7 +76,7 @@
<property name="text">
<string></string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -93,7 +93,7 @@
<property name="text">
<string></string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
diff --git a/chalk/plugins/viewplugins/imagesize/wdg_resolution.ui b/chalk/plugins/viewplugins/imagesize/wdg_resolution.ui
index d3a8326a9..72a70c8a3 100644
--- a/chalk/plugins/viewplugins/imagesize/wdg_resolution.ui
+++ b/chalk/plugins/viewplugins/imagesize/wdg_resolution.ui
@@ -96,7 +96,7 @@
<property name="text">
<string>100</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
diff --git a/chalk/plugins/viewplugins/performancetest/perftest.cc b/chalk/plugins/viewplugins/performancetest/perftest.cc
index 8a137374a..b88dac9d9 100644
--- a/chalk/plugins/viewplugins/performancetest/perftest.cc
+++ b/chalk/plugins/viewplugins/performancetest/perftest.cc
@@ -140,7 +140,7 @@ void PerfTest::slotPerfTest()
}
if (dlgPerfTest->page()->chkShape->isChecked()) {
kdDebug() << "Shapetest\n";
- TQString s = tqshapeTest(testCount);
+ TQString s = shapeTest(testCount);
report = report.append(s);
kdDebug() << s << "\n";
}
@@ -293,10 +293,10 @@ TQString PerfTest::doBlit(const KisCompositeOp& op,
p.end();
report = report.append(TQString(" %1 blits of rectangles < tilesize with opacity %2 and composite op %3: %4ms\n")
- .tqarg(testCount)
- .tqarg(opacity)
- .tqarg(op.id().name())
- .tqarg(t.elapsed()));
+ .arg(testCount)
+ .arg(opacity)
+ .arg(op.id().name())
+ .arg(t.elapsed()));
// ------------------------------------------------------------------------------
@@ -316,10 +316,10 @@ TQString PerfTest::doBlit(const KisCompositeOp& op,
p.end();
report = report.append(TQString(" %1 blits of rectangles 3 * tilesize with opacity %2 and composite op %3: %4ms\n")
- .tqarg(testCount)
- .tqarg(opacity)
- .tqarg(op.id().name())
- .tqarg(t.elapsed()));
+ .arg(testCount)
+ .arg(opacity)
+ .arg(op.id().name())
+ .arg(t.elapsed()));
// ------------------------------------------------------------------------------
@@ -339,10 +339,10 @@ TQString PerfTest::doBlit(const KisCompositeOp& op,
}
p.end();
report = report.append(TQString(" %1 blits of rectangles 800 x 800 with opacity %2 and composite op %3: %4ms\n")
- .tqarg(testCount)
- .tqarg(opacity)
- .tqarg(op.id().name())
- .tqarg(t.elapsed()));
+ .arg(testCount)
+ .arg(opacity)
+ .arg(op.id().name())
+ .arg(t.elapsed()));
// ------------------------------------------------------------------------------
@@ -362,10 +362,10 @@ TQString PerfTest::doBlit(const KisCompositeOp& op,
}
p.end();
report = report.append(TQString(" %1 blits of rectangles 500 x 500 at 600,600 with opacity %2 and composite op %3: %4ms\n")
- .tqarg(testCount)
- .tqarg(opacity)
- .tqarg(op.id().name())
- .tqarg(t.elapsed()));
+ .arg(testCount)
+ .arg(opacity)
+ .arg(op.id().name())
+ .arg(t.elapsed()));
// ------------------------------------------------------------------------------
// Small with varied source opacity
@@ -387,10 +387,10 @@ TQString PerfTest::doBlit(const KisCompositeOp& op,
p.end();
report = report.append(TQString(" %1 blits of rectangles < tilesize with source alpha, with opacity %2 and composite op %3: %4ms\n")
- .tqarg(testCount)
- .tqarg(opacity)
- .tqarg(op.id().name())
- .tqarg(t.elapsed()));
+ .arg(testCount)
+ .arg(opacity)
+ .arg(op.id().name())
+ .arg(t.elapsed()));
return report;
@@ -418,21 +418,21 @@ TQString PerfTest::fillTest(TQ_UINT32 testCount)
for (TQ_UINT32 i = 0; i < testCount; ++i) {
p.eraseRect(0, 0, 1000, 1000);
}
- report = report.append(TQString(" Erased 1000 x 1000 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
+ report = report.append(TQString(" Erased 1000 x 1000 layer %1 times: %2\n").arg(testCount).arg(t.elapsed()));
t.restart();
for (TQ_UINT32 i = 0; i < testCount; ++i) {
p.eraseRect(50, 50, 500, 500);
}
- report = report.append(TQString(" Erased 500 x 500 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
+ report = report.append(TQString(" Erased 500 x 500 layer %1 times: %2\n").arg(testCount).arg(t.elapsed()));
t.restart();
for (TQ_UINT32 i = 0; i < testCount; ++i) {
p.eraseRect(-50, -50, 1100, 1100);
}
- report = report.append(TQString(" Erased rect bigger than layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
+ report = report.append(TQString(" Erased rect bigger than layer %1 times: %2\n").arg(testCount).arg(t.elapsed()));
// Opaque Rect fill
@@ -440,21 +440,21 @@ TQString PerfTest::fillTest(TQ_UINT32 testCount)
for (TQ_UINT32 i = 0; i < testCount; ++i) {
p.fillRect(0, 0, 1000, 1000, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()));
}
- report = report.append(TQString(" Opaque fill 1000 x 1000 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
+ report = report.append(TQString(" Opaque fill 1000 x 1000 layer %1 times: %2\n").arg(testCount).arg(t.elapsed()));
t.restart();
for (TQ_UINT32 i = 0; i < testCount; ++i) {
p.fillRect(50, 50, 500, 500, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()));
}
- report = report.append(TQString(" Opaque fill 500 x 500 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
+ report = report.append(TQString(" Opaque fill 500 x 500 layer %1 times: %2\n").arg(testCount).arg(t.elapsed()));
t.restart();
for (TQ_UINT32 i = 0; i < testCount; ++i) {
p.fillRect(-50, -50, 1100, 1100, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()));
}
- report = report.append(TQString(" Opaque fill rect bigger than layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
+ report = report.append(TQString(" Opaque fill rect bigger than layer %1 times: %2\n").arg(testCount).arg(t.elapsed()));
// Transparent rect fill
@@ -462,21 +462,21 @@ TQString PerfTest::fillTest(TQ_UINT32 testCount)
for (TQ_UINT32 i = 0; i < testCount; ++i) {
p.fillRect(0, 0, 1000, 1000, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()), OPACITY_OPAQUE / 2);
}
- report = report.append(TQString(" Opaque fill 1000 x 1000 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
+ report = report.append(TQString(" Opaque fill 1000 x 1000 layer %1 times: %2\n").arg(testCount).arg(t.elapsed()));
t.restart();
for (TQ_UINT32 i = 0; i < testCount; ++i) {
p.fillRect(50, 50, 500, 500, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()), OPACITY_OPAQUE / 2);
}
- report = report.append(TQString(" Opaque fill 500 x 500 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
+ report = report.append(TQString(" Opaque fill 500 x 500 layer %1 times: %2\n").arg(testCount).arg(t.elapsed()));
t.restart();
for (TQ_UINT32 i = 0; i < testCount; ++i) {
p.fillRect(-50, -50, 1100, 1100, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()), OPACITY_OPAQUE / 2);
}
- report = report.append(TQString(" Opaque fill rect bigger than layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
+ report = report.append(TQString(" Opaque fill rect bigger than layer %1 times: %2\n").arg(testCount).arg(t.elapsed()));
// Colour fill
@@ -489,7 +489,7 @@ TQString PerfTest::fillTest(TQ_UINT32 testCount)
p.setCompositeOp(COMPOSITE_OVER);
p.fillColor(0,0);
}
- report = report.append(TQString(" Opaque floodfill of whole circle (incl. erase and painting of circle) %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
+ report = report.append(TQString(" Opaque floodfill of whole circle (incl. erase and painting of circle) %1 times: %2\n").arg(testCount).arg(t.elapsed()));
// Pattern fill
@@ -505,7 +505,7 @@ TQString PerfTest::fillTest(TQ_UINT32 testCount)
p.setCompositeOp(COMPOSITE_OVER);
p.fillPattern(0,0);
}
- report = report.append(TQString(" Opaque patternfill of whole circle (incl. erase and painting of circle) %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
+ report = report.append(TQString(" Opaque patternfill of whole circle (incl. erase and painting of circle) %1 times: %2\n").arg(testCount).arg(t.elapsed()));
@@ -549,7 +549,7 @@ TQString PerfTest::pixelTest(TQ_UINT32 testCount)
}
}
}
- report = report.append(TQString(" read 1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
+ report = report.append(TQString(" read 1000 x 1000 pixels %1 times: %2\n").arg(testCount).arg(t.elapsed()));
c= TQt::black;
t.restart();
@@ -560,7 +560,7 @@ TQString PerfTest::pixelTest(TQ_UINT32 testCount)
}
}
}
- report = report.append(TQString(" written 1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
+ report = report.append(TQString(" written 1000 x 1000 pixels %1 times: %2\n").arg(testCount).arg(t.elapsed()));
}
@@ -571,7 +571,7 @@ TQString PerfTest::pixelTest(TQ_UINT32 testCount)
}
-TQString PerfTest::tqshapeTest(TQ_UINT32 testCount)
+TQString PerfTest::shapeTest(TQ_UINT32 testCount)
{
return TQString("Shape test\n");
}
@@ -606,7 +606,7 @@ TQString PerfTest::rotateTest(TQ_UINT32 testCount)
delete img;
}
}
- report = report.append(TQString(" rotated 1000 x 1000 pixels over 360 degrees, degree by degree, %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
+ report = report.append(TQString(" rotated 1000 x 1000 pixels over 360 degrees, degree by degree, %1 times: %2\n").arg(testCount).arg(t.elapsed()));
}
return report;
}
@@ -643,7 +643,7 @@ TQString PerfTest::colorConversionTest(TQ_UINT32 testCount)
img2->convertTo(KisMetaRegistry::instance()->csRegistry()->getColorSpace(*it2,""));
delete img2;
}
- report = report.append(TQString(" converted from " + (*it).name() + " to " + (*it2).name() + " 1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
+ report = report.append(TQString(" converted from " + (*it).name() + " to " + (*it2).name() + " 1000 x 1000 pixels %1 times: %2\n").arg(testCount).arg(t.elapsed()));
}
@@ -681,7 +681,7 @@ TQString PerfTest::filterTest(TQ_UINT32 testCount)
f->process(l.data(), l.data(), f->configuration(f->createConfigurationWidget(m_view, l.data())), TQRect(0, 0, 1000, 1000));
f->disableProgress();
}
- report = report.append(TQString(" filtered " + (*it).name() + "1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
+ report = report.append(TQString(" filtered " + (*it).name() + "1000 x 1000 pixels %1 times: %2\n").arg(testCount).arg(t.elapsed()));
}
@@ -709,7 +709,7 @@ TQString PerfTest::readBytesTest(TQ_UINT32 testCount)
delete[] newData;
}
- report = report.append(TQString(" read 1000 x 1000 pixels %1 times from empty image: %2\n").tqarg(testCount).tqarg(t.elapsed()));
+ report = report.append(TQString(" read 1000 x 1000 pixels %1 times from empty image: %2\n").arg(testCount).arg(t.elapsed()));
// On tiles with data
@@ -726,7 +726,7 @@ TQString PerfTest::readBytesTest(TQ_UINT32 testCount)
delete[] newData;
}
- report = report.append(TQString(" read 1000 x 1000 pixels %1 times from filled image: %2\n").tqarg(testCount).tqarg(t.elapsed()));
+ report = report.append(TQString(" read 1000 x 1000 pixels %1 times from filled image: %2\n").arg(testCount).arg(t.elapsed()));
return report;
}
@@ -755,7 +755,7 @@ TQString PerfTest::writeBytesTest(TQ_UINT32 testCount)
l->writeBytes(data, 0, 0, 1000, 1000);
}
delete[] data;
- report = report.append(TQString(" written 1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
+ report = report.append(TQString(" written 1000 x 1000 pixels %1 times: %2\n").arg(testCount).arg(t.elapsed()));
return report;
@@ -788,7 +788,7 @@ TQString hlineRODefault(KisDoc * doc, TQ_UINT32 testCount)
}
- return TQString(" hline iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed());
+ return TQString(" hline iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed());
}
@@ -820,7 +820,7 @@ TQString hlineRO(KisDoc * doc, TQ_UINT32 testCount)
}
- return TQString(" hline iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed());
+ return TQString(" hline iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed());
}
@@ -847,7 +847,7 @@ TQString hlineWRDefault(KisDoc * doc, TQ_UINT32 testCount)
}
- return TQString(" hline iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed());
+ return TQString(" hline iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed());
}
@@ -878,7 +878,7 @@ TQString hlineWR(KisDoc * doc, TQ_UINT32 testCount)
}
- return TQString(" hline iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed());
+ return TQString(" hline iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed());
}
@@ -903,7 +903,7 @@ TQString vlineRODefault(KisDoc * doc, TQ_UINT32 testCount)
}
- return TQString(" vline iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed());
+ return TQString(" vline iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed());
}
@@ -932,7 +932,7 @@ TQString vlineRO(KisDoc * doc, TQ_UINT32 testCount)
}
- return TQString(" vline iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed());
+ return TQString(" vline iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed());
}
@@ -957,7 +957,7 @@ TQString vlineWRDefault(KisDoc * doc, TQ_UINT32 testCount)
}
- return TQString(" vline iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed());
+ return TQString(" vline iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed());
}
TQString vlineWR(KisDoc * doc, TQ_UINT32 testCount)
@@ -985,7 +985,7 @@ TQString vlineWR(KisDoc * doc, TQ_UINT32 testCount)
}
- return TQString(" vline iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed());
+ return TQString(" vline iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed());
}
@@ -1005,7 +1005,7 @@ TQString rectRODefault(KisDoc * doc, TQ_UINT32 testCount)
}
}
- return TQString(" rect iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed());
+ return TQString(" rect iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed());
}
@@ -1030,7 +1030,7 @@ TQString rectRO(KisDoc * doc, TQ_UINT32 testCount)
}
}
- return TQString(" rect iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed());
+ return TQString(" rect iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed());
}
@@ -1052,7 +1052,7 @@ TQString rectWRDefault(KisDoc * doc, TQ_UINT32 testCount)
}
}
- return TQString(" rect iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed());
+ return TQString(" rect iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed());
}
@@ -1079,7 +1079,7 @@ TQString rectWR(KisDoc * doc, TQ_UINT32 testCount)
}
- return TQString(" rect iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed());
+ return TQString(" rect iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed());
}
@@ -1140,7 +1140,7 @@ TQString PerfTest::paintViewTest(TQ_UINT32 testCount)
CALLGRIND_DUMP_STATS();
#endif
- report = report.append(TQString(" painted a 512 x 512 image %1 times: %2 ms\n").tqarg(testCount).tqarg(t.elapsed()));
+ report = report.append(TQString(" painted a 512 x 512 image %1 times: %2 ms\n").arg(testCount).arg(t.elapsed()));
img->newLayer("layer 2", OPACITY_OPAQUE);
l = img->activeDevice();
@@ -1162,7 +1162,7 @@ TQString PerfTest::paintViewTest(TQ_UINT32 testCount)
m_view->getCanvasController()->updateCanvas(TQRect(0, 0, 512, 512));
}
- report = report.append(TQString(" painted a 512 x 512 image with 3 layers %1 times: %2 ms\n").tqarg(testCount).tqarg(t.elapsed()));
+ report = report.append(TQString(" painted a 512 x 512 image with 3 layers %1 times: %2 ms\n").arg(testCount).arg(t.elapsed()));
return report;
}
@@ -1190,7 +1190,7 @@ TQString PerfTest::paintViewFPSTest()
CALLGRIND_DUMP_STATS();
#endif
- report = report.append(TQString(" painted current view at %1 frames per second\n").tqarg(numViewsPainted));
+ report = report.append(TQString(" painted current view at %1 frames per second\n").arg(numViewsPainted));
return report;
}
diff --git a/chalk/plugins/viewplugins/performancetest/perftest.h b/chalk/plugins/viewplugins/performancetest/perftest.h
index cbd8799fb..959233e4c 100644
--- a/chalk/plugins/viewplugins/performancetest/perftest.h
+++ b/chalk/plugins/viewplugins/performancetest/perftest.h
@@ -46,7 +46,7 @@ private:
TQString fillTest(TQ_UINT32 testCount);
TQString gradientTest(TQ_UINT32 testCount);
TQString pixelTest(TQ_UINT32 testCount);
- TQString tqshapeTest(TQ_UINT32 testCount);
+ TQString shapeTest(TQ_UINT32 testCount);
TQString layerTest(TQ_UINT32 testCount);
TQString scaleTest(TQ_UINT32 testCount);
TQString rotateTest(TQ_UINT32 testCount);
diff --git a/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui b/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui
index 450f8fda0..841341f7b 100644
--- a/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui
+++ b/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui
@@ -65,7 +65,7 @@
<property name="scaledContents">
<bool>false</bool>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -96,7 +96,7 @@
<property name="scaledContents">
<bool>false</bool>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
index 6e942c389..2a4c5029f 100644
--- a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
+++ b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
@@ -153,7 +153,7 @@ bool KSnapshot::save( const KURL& url )
TQString caption = i18n("Unable to Save Image");
TQString text = i18n("KSnapshot was unable to save the image to\n%1.")
- .tqarg(url.prettyURL());
+ .arg(url.prettyURL());
KMessageBox::error(this, text, caption);
}
@@ -320,16 +320,16 @@ Window findRealWindow( Window w, int depth = 0 )
return w;
}
Window root, parent;
- Window* tqchildren;
- unsigned int ntqchildren;
+ Window* children;
+ unsigned int nchildren;
Window ret = None;
- if( XQueryTree( qt_xdisplay(), w, &root, &parent, &tqchildren, &ntqchildren ) != 0 ) {
+ if( XQueryTree( qt_xdisplay(), w, &root, &parent, &children, &nchildren ) != 0 ) {
for( unsigned int i = 0;
- i < ntqchildren && ret == None;
+ i < nchildren && ret == None;
++i )
- ret = findRealWindow( tqchildren[ i ], depth + 1 );
- if( tqchildren != NULL )
- XFree( tqchildren );
+ ret = findRealWindow( children[ i ], depth + 1 );
+ if( children != NULL )
+ XFree( children );
}
return ret;
}
@@ -365,12 +365,12 @@ void KSnapshot::performGrab()
h += 2 * border;
Window parent;
- Window* tqchildren;
- unsigned int ntqchildren;
+ Window* children;
+ unsigned int nchildren;
if( XQueryTree( qt_xdisplay(), child, &root, &parent,
- &tqchildren, &ntqchildren ) != 0 ) {
- if( tqchildren != NULL )
- XFree( tqchildren );
+ &children, &nchildren ) != 0 ) {
+ if( children != NULL )
+ XFree( children );
int newx, newy;
Window dummy;
if( XTranslateCoordinates( qt_xdisplay(), parent, qt_xrootwin(),
@@ -390,7 +390,7 @@ void KSnapshot::performGrab()
int count, order;
XRectangle* rects = XShapeGetRectangles( qt_xdisplay(), child,
ShapeBounding, &count, &order);
- //The ShapeBounding region is the outermost tqshape of the window;
+ //The ShapeBounding region is the outermost shape of the window;
//ShapeBounding - ShapeClipping is defined to be the border.
//Since the border area is part of the window, we use bounding
// to limit our work region
diff --git a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp
index 7d6e52f44..374033d6d 100644
--- a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp
+++ b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp
@@ -41,8 +41,8 @@ SizeTip::SizeTip( TQWidget *parent, const char *name )
void SizeTip::setTip( const TQRect &rect )
{
- TQString tip = TQString( "%1x%2" ).tqarg( rect.width() )
- .tqarg( rect.height() );
+ TQString tip = TQString( "%1x%2" ).arg( rect.width() )
+ .arg( rect.height() );
setText( tip );
adjustSize();
@@ -52,7 +52,7 @@ void SizeTip::setTip( const TQRect &rect )
void SizeTip::positionTip( const TQRect &rect )
{
- TQRect tipRect = tqgeometry();
+ TQRect tipRect = geometry();
tipRect.moveTopLeft( TQPoint( 0, 0 ) );
if ( rect.intersects( tipRect ) )
@@ -61,7 +61,7 @@ void SizeTip::positionTip( const TQRect &rect )
tipRect.moveCenter( TQPoint( deskR.width()/2, deskR.height()/2 ) );
if ( !rect.contains( tipRect, true ) && rect.intersects( tipRect ) )
- tipRect.moveBottomRight( tqgeometry().bottomRight() );
+ tipRect.moveBottomRight( geometry().bottomRight() );
}
move( tipRect.topLeft() );
diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp
index 04f7b6537..45c1705af 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 d719edd6e..5ddb004de 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 ecac55013..e2f09a582 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 c93d6e880..1486d4153 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 b01ba0a89..0b22ebf56 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 5f800f6ae..9f27adc6a 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 449913036..5aee14319 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 e166de7cb..c8ef92c50 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 1ec25dcdd..7f6a9b05b 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 b7c784fc1..68610cc58 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
diff --git a/chalk/plugins/viewplugins/variations/wdg_variations.ui b/chalk/plugins/viewplugins/variations/wdg_variations.ui
index 41553bd2c..45795b42b 100644
--- a/chalk/plugins/viewplugins/variations/wdg_variations.ui
+++ b/chalk/plugins/viewplugins/variations/wdg_variations.ui
@@ -121,7 +121,7 @@
<property name="text">
<string>Current Pick</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -132,7 +132,7 @@
<property name="text">
<string>Original</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -348,7 +348,7 @@
<property name="text">
<string>Lighter</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -390,7 +390,7 @@
<property name="text">
<string>Current Pick</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -432,7 +432,7 @@
<property name="text">
<string>Darker</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -531,7 +531,7 @@
<property name="text">
<string>More Red</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -550,7 +550,7 @@
<property name="text">
<string>More Cyan</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -608,7 +608,7 @@
<property name="text">
<string>More Green</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -744,7 +744,7 @@
<property name="text">
<string>Current Pick</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -763,7 +763,7 @@
<property name="text">
<string>More Yellow</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -863,7 +863,7 @@
<property name="text">
<string>More Magenta</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -882,7 +882,7 @@
<property name="text">
<string>More Blue</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>