Browse Source

Remove additional unneeded tq method conversions

tags/r14.0.0
Timothy Pearson 7 years ago
parent
commit
f0de9e167e
100 changed files with 445 additions and 445 deletions
  1. 1
    1
      chalk/IMAGE_LIBRARIES
  2. 6
    6
      chalk/chalkcolor/kis_basic_histogram_producers.cc
  3. 1
    1
      chalk/chalkcolor/kis_profile.cc
  4. 12
    12
      chalk/colorspaces/wetsticky/ws/canvas.c
  5. 2
    2
      chalk/colorspaces/wetsticky/ws/canvas.h
  6. 1
    1
      chalk/colorspaces/wetsticky/ws/engine.c
  7. 1
    1
      chalk/colorspaces/wetsticky/ws/engine3.c
  8. 1
    1
      chalk/colorspaces/wetsticky/ws/ogl_interface.c
  9. 1
    1
      chalk/colorspaces/wetsticky/ws/x_interface.c
  10. 2
    2
      chalk/core/kis_brush.cc
  11. 34
    34
      chalk/core/kis_exif_value.cc
  12. 13
    13
      chalk/core/kis_gradient_painter.cc
  13. 1
    1
      chalk/core/kis_gradient_painter.h
  14. 2
    2
      chalk/core/kis_group_layer.cc
  15. 1
    1
      chalk/core/kis_group_layer.h
  16. 1
    1
      chalk/core/kis_nameserver.cc
  17. 1
    1
      chalk/core/kis_selection.cc
  18. 1
    1
      chalk/doc/DESIGN.obsolete
  19. 1
    1
      chalk/doc/background_paper.txt
  20. 3
    3
      chalk/doc/chalk-features
  21. 30
    30
      chalk/doc/chalk.xmi
  22. 22
    22
      chalk/doc/controller.xmi
  23. 1
    1
      chalk/doc/selections
  24. 3
    3
      chalk/plugins/filters/blur/kis_blur_filter.cc
  25. 1
    1
      chalk/plugins/filters/blur/kis_wdg_blur.cc
  26. 2
    2
      chalk/plugins/filters/bumpmap/wdgbumpmap.ui
  27. 11
    11
      chalk/plugins/filters/cimg/CImg.h
  28. 2
    2
      chalk/plugins/filters/cimg/kis_cimg_filter.cc
  29. 1
    1
      chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc
  30. 2
    2
      chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui
  31. 8
    8
      chalk/plugins/filters/levelfilter/kgradientslider.cc
  32. 1
    1
      chalk/plugins/filters/levelfilter/wdg_level.ui
  33. 2
    2
      chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp
  34. 6
    6
      chalk/plugins/filters/wavefilter/wavefilter.cc
  35. 4
    4
      chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc
  36. 2
    2
      chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc
  37. 5
    5
      chalk/plugins/tools/defaulttools/kis_tool_gradient.cc
  38. 1
    1
      chalk/plugins/tools/defaulttools/kis_tool_gradient.h
  39. 2
    2
      chalk/plugins/tools/defaulttools/kis_tool_text.cc
  40. 1
    1
      chalk/plugins/tools/selectiontools/kis_tool_select_brush.h
  41. 2
    2
      chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc
  42. 1
    1
      chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h
  43. 1
    1
      chalk/plugins/tools/tool_crop/kis_tool_crop.cc
  44. 1
    1
      chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.h
  45. 1
    1
      chalk/plugins/tools/tool_curves/kis_tool_example.h
  46. 1
    1
      chalk/plugins/tools/tool_star/kis_tool_star.h
  47. 1
    1
      chalk/plugins/tools/tool_transform/wdg_tool_transform.ui
  48. 1
    1
      chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui
  49. 2
    2
      chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc
  50. 3
    3
      chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui
  51. 2
    2
      chalk/plugins/viewplugins/imagesize/wdg_layersize.ui
  52. 1
    1
      chalk/plugins/viewplugins/imagesize/wdg_resolution.ui
  53. 56
    56
      chalk/plugins/viewplugins/performancetest/perftest.cc
  54. 1
    1
      chalk/plugins/viewplugins/performancetest/perftest.h
  55. 2
    2
      chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui
  56. 14
    14
      chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
  57. 4
    4
      chalk/plugins/viewplugins/screenshot/regiongrabber.cpp
  58. 4
    4
      chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp
  59. 2
    2
      chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.h
  60. 1
    1
      chalk/plugins/viewplugins/scripting/chalkcore/krs_filter.cpp
  61. 1
    1
      chalk/plugins/viewplugins/scripting/chalkcore/krs_image.cpp
  62. 2
    2
      chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h
  63. 2
    2
      chalk/plugins/viewplugins/scripting/chalkcore/krs_paint_layer.cpp
  64. 3
    3
      chalk/plugins/viewplugins/scripting/chalkcore/krs_painter.cpp
  65. 4
    4
      chalk/plugins/viewplugins/scripting/chalkcore/krs_wavelet.cpp
  66. 8
    8
      chalk/plugins/viewplugins/scripting/samples/ruby/randompaint.rb
  67. 8
    8
      chalk/plugins/viewplugins/scripting/samples/ruby/torture-painting.rb
  68. 12
    12
      chalk/plugins/viewplugins/variations/wdg_variations.ui
  69. 3
    3
      chalk/sdk/kis_canvas_controller.h
  70. 9
    9
      chalk/ui/kcurve.cc
  71. 3
    3
      chalk/ui/kis_autogradient.cc
  72. 1
    1
      chalk/ui/kis_brush_chooser.cc
  73. 10
    10
      chalk/ui/kis_canvas.cc
  74. 5
    5
      chalk/ui/kis_canvas.h
  75. 1
    1
      chalk/ui/kis_custom_palette.cc
  76. 1
    1
      chalk/ui/kis_dlg_preferences.cc
  77. 1
    1
      chalk/ui/kis_doc.cc
  78. 5
    5
      chalk/ui/kis_filter_manager.cc
  79. 3
    3
      chalk/ui/kis_gradient_slider_widget.cc
  80. 3
    3
      chalk/ui/kis_layerbox.cc
  81. 6
    6
      chalk/ui/kis_layerlist.cc
  82. 1
    1
      chalk/ui/kis_paintop_box.cc
  83. 6
    6
      chalk/ui/kis_part_layer.cc
  84. 5
    5
      chalk/ui/kis_part_layer.h
  85. 1
    1
      chalk/ui/kis_pattern_chooser.cc
  86. 2
    2
      chalk/ui/kis_qpaintdevice_canvas_painter.cc
  87. 2
    2
      chalk/ui/kis_ruler.cc
  88. 5
    5
      chalk/ui/kis_save_visitor.h
  89. 2
    2
      chalk/ui/kis_savexml_visitor.h
  90. 1
    1
      chalk/ui/kis_text_brush.cc
  91. 1
    1
      chalk/ui/kis_tool.cc
  92. 1
    1
      chalk/ui/kis_tool.h
  93. 1
    1
      chalk/ui/kis_tool_freehand.cc
  94. 8
    8
      chalk/ui/kis_tool_shape.cc
  95. 1
    1
      chalk/ui/kis_tool_shape.h
  96. 17
    17
      chalk/ui/kis_view.cc
  97. 2
    2
      chalk/ui/kobirdeyepanel.cpp
  98. 3
    3
      chalk/ui/layerlist.cpp
  99. 1
    1
      chalk/ui/wdgapplyprofile.ui
  100. 0
    0
      chalk/ui/wdgcolorsettings.ui

+ 1
- 1
chalk/IMAGE_LIBRARIES View File

@@ -153,7 +153,7 @@ Disadvantages:

Libart isn't really an image library, but rather a canvas that can be
used to paint images on. It is optimized for vector graphics, and is
used by Karbon to render tqshapes before display.
used by Karbon to render shapes before display.

Advantages:


+ 6
- 6
chalk/chalkcolor/kis_basic_histogram_producers.cc View File

@@ -89,7 +89,7 @@ KisBasicU8HistogramProducer::KisBasicU8HistogramProducer(const KisID& id, KisCol
}

TQString KisBasicU8HistogramProducer::positionToString(double pos) const {
return TQString("%1").tqarg(static_cast<TQ_UINT8>(pos * UINT8_MAX));
return TQString("%1").arg(static_cast<TQ_UINT8>(pos * UINT8_MAX));
}

void KisBasicU8HistogramProducer::addRegionToBin(TQ_UINT8 * pixels, TQ_UINT8 * selectionMask, TQ_UINT32 nPixels, KisColorSpace *cs)
@@ -142,7 +142,7 @@ KisBasicU16HistogramProducer::KisBasicU16HistogramProducer(const KisID& id, KisC

TQString KisBasicU16HistogramProducer::positionToString(double pos) const
{
return TQString("%1").tqarg(static_cast<TQ_UINT8>(pos * UINT8_MAX));
return TQString("%1").arg(static_cast<TQ_UINT8>(pos * UINT8_MAX));
}

double KisBasicU16HistogramProducer::maximalZoom() const
@@ -210,7 +210,7 @@ KisBasicF32HistogramProducer::KisBasicF32HistogramProducer(const KisID& id, KisC
}

TQString KisBasicF32HistogramProducer::positionToString(double pos) const {
return TQString("%1").tqarg(static_cast<float>(pos)); // XXX I doubt this is correct!
return TQString("%1").arg(static_cast<float>(pos)); // XXX I doubt this is correct!
}

double KisBasicF32HistogramProducer::maximalZoom() const {
@@ -282,7 +282,7 @@ KisBasicF16HalfHistogramProducer::KisBasicF16HalfHistogramProducer(const KisID&
}

TQString KisBasicF16HalfHistogramProducer::positionToString(double pos) const {
return TQString("%1").tqarg(static_cast<float>(pos)); // XXX I doubt this is correct!
return TQString("%1").arg(static_cast<float>(pos)); // XXX I doubt this is correct!
}

double KisBasicF16HalfHistogramProducer::maximalZoom() const {
@@ -356,7 +356,7 @@ TQValueVector<KisChannelInfo *> KisGenericRGBHistogramProducer::channels() {
}

TQString KisGenericRGBHistogramProducer::positionToString(double pos) const {
return TQString("%1").tqarg(static_cast<TQ_UINT8>(pos * UINT8_MAX));
return TQString("%1").arg(static_cast<TQ_UINT8>(pos * UINT8_MAX));
}

double KisGenericRGBHistogramProducer::maximalZoom() const {
@@ -433,7 +433,7 @@ TQValueVector<KisChannelInfo *> KisGenericLabHistogramProducer::channels() {
}

TQString KisGenericLabHistogramProducer::positionToString(double pos) const {
return TQString("%1").tqarg(static_cast<TQ_UINT16>(pos * UINT16_MAX));
return TQString("%1").arg(static_cast<TQ_UINT16>(pos * UINT16_MAX));
}

double KisGenericLabHistogramProducer::maximalZoom() const {

+ 1
- 1
chalk/chalkcolor/kis_profile.cc View File

@@ -65,7 +65,7 @@ KisProfile::KisProfile(const cmsHPROFILE profile)

// Make a raw data image ready for saving
_cmsSaveProfileToMem(m_profile, 0, &bytesNeeded); // calc size
if(m_rawData.tqresize(bytesNeeded))
if(m_rawData.resize(bytesNeeded))
{
_cmsSaveProfileToMem(m_profile, m_rawData.data(), &bytesNeeded); // fill buffer
cmsHPROFILE newprofile = cmsOpenProfileFromMem(m_rawData.data(), (DWORD) bytesNeeded);

+ 12
- 12
chalk/colorspaces/wetsticky/ws/canvas.c View File

@@ -31,13 +31,13 @@ CELL canvas[CANVAS_WIDTH][CANVAS_HEIGHT];

/* This module maintains a list of the addresses of cells that have
been modified since the last redraw and therefore need updating.
Points are added to this list by the need_to_tqrepaint() routine
and are removed by the next_cell_for_tqrepaint() function. The
Points are added to this list by the need_to_repaint() routine
and are removed by the next_cell_for_repaint() function. The
pointer to the current tail of the list is updated by side-effect. */

static POINT need_repainting[REDRAW_LIMIT];
static int next_free = 0;
static int next_to_tqrepaint = 0;
static int next_to_repaint = 0;

/* *********************************************************************** */

@@ -50,7 +50,7 @@ int number_of_repaints_needed()

/* *********************************************************************** */

void need_to_tqrepaint(point)
void need_to_repaint(point)
/* The cell at this location needs to be redrawn since it has
been altered. Scan the list to see if it is already
scheduled for a repainting operation and only add it if
@@ -62,7 +62,7 @@ POINT point;
int k;


/* If the list is already full then simply ignore the tqrepaint
/* If the list is already full then simply ignore the repaint
request - it will get done eventually anyway. */

if (next_free == REDRAW_LIMIT) return;
@@ -85,7 +85,7 @@ POINT point;

/* *********************************************************************** */

void next_cell_for_tqrepaint(cell, locus)
void next_cell_for_repaint(cell, locus)
/* This routine returns the next cell to be repainted, together with its
location on the canvas. This is determined by taking the next point
from the need_repainting list and accessing its cell. If the list is
@@ -97,16 +97,16 @@ void next_cell_for_tqrepaint(cell, locus)
POINT_PTR locus;

{
if (next_to_tqrepaint >= next_free) {
next_to_tqrepaint = next_free = 0;
if (next_to_repaint >= next_free) {
next_to_repaint = next_free = 0;
*(cell) = NIL;
return;
}

*(cell) = get_cell(need_repainting[next_to_tqrepaint]);
locus->x = need_repainting[next_to_tqrepaint].x;
locus->y = need_repainting[next_to_tqrepaint].y;
next_to_tqrepaint++;
*(cell) = get_cell(need_repainting[next_to_repaint]);
locus->x = need_repainting[next_to_repaint].x;
locus->y = need_repainting[next_to_repaint].y;
next_to_repaint++;
}

/* *********************************************************************** */

+ 2
- 2
chalk/colorspaces/wetsticky/ws/canvas.h View File

@@ -22,11 +22,11 @@ Wet and Sticky is free software; you can redistribute it and/or modify it under
extern int number_of_repaints_needed();
/* Returns the number of cells needing to repainted. */

extern void need_to_tqrepaint (/* POINT */);
extern void need_to_repaint (/* POINT */);
/* Requests that the cell at the given point be repainted
at the next update as it has been modified. */

extern void next_cell_for_tqrepaint (/* *CELL_PTR, POINT_PTR */);
extern void next_cell_for_repaint (/* *CELL_PTR, POINT_PTR */);
/* Returns a pointer to a cell that needs to be updated as well
as the location of that cell on the canvas. If there are
no more cells to be redrawn then the pointer will be NIL. */

+ 1
- 1
chalk/colorspaces/wetsticky/ws/engine.c View File

@@ -192,7 +192,7 @@ int amount;

}

need_to_tqrepaint(destLocus);
need_to_repaint(destLocus);
}

/* *********************************************************************** */

+ 1
- 1
chalk/colorspaces/wetsticky/ws/engine3.c View File

@@ -191,7 +191,7 @@ int amount;

}

need_to_tqrepaint(destLocus);
need_to_repaint(destLocus);
}

/* *********************************************************************** */

+ 1
- 1
chalk/colorspaces/wetsticky/ws/ogl_interface.c View File

@@ -255,7 +255,7 @@ void evolve_paint()

for (k=0; k < STEP_LIMIT; k++) single_step();
while (TRUE) {
next_cell_for_tqrepaint(&cell, &p);
next_cell_for_repaint(&cell, &p);
if (cell == NIL) return;
paint_cell(cell, p.x, p.y);
glFlush();

+ 1
- 1
chalk/colorspaces/wetsticky/ws/x_interface.c View File

@@ -700,7 +700,7 @@ void evolve_paint()

for (k=0; k < STEP_LIMIT; k++) single_step();
while (TRUE) {
next_cell_for_tqrepaint(&cell, &p);
next_cell_for_repaint(&cell, &p);
if (cell == NIL) return;
paint_cell(cell, p.x, p.y);
}

+ 2
- 2
chalk/core/kis_brush.cc View File

@@ -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");

+ 34
- 34
chalk/core/kis_exif_value.cc View File

@@ -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 ";
}

+ 13
- 13
chalk/core/kis_gradient_painter.cc View File

@@ -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();


+ 1
- 1
chalk/core/kis_gradient_painter.h View File

@@ -66,7 +66,7 @@ public:
*/
bool paintGradient(const KisPoint& gradientVectorStart,
const KisPoint& gradientVectorEnd,
enumGradientShape tqshape,
enumGradientShape shape,
enumGradientRepeat repeat,
double antiAliasThreshold,
bool reverseGradient,

+ 2
- 2
chalk/core/kis_group_layer.cc View File

@@ -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;

+ 1
- 1
chalk/core/kis_group_layer.h View File

@@ -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);

+ 1
- 1
chalk/core/kis_nameserver.cc View File

@@ -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

+ 1
- 1
chalk/core/kis_selection.cc View File

@@ -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];

+ 1
- 1
chalk/doc/DESIGN.obsolete View File

@@ -21,7 +21,7 @@ Design Patterns
changes:

* Change brushes handling to a generic Mediator pattern
(kis_resource_mediator). Resources are brush tqshapes,
(kis_resource_mediator). Resources are brush shapes,
patterns (and colours, too?) Patrick intended a Flyweight
here.


+ 1
- 1
chalk/doc/background_paper.txt View File

@@ -79,6 +79,6 @@ We need perhaps to add a light source or two, in OpenGL mode... I think
we do.

On top of the layers are what Xara calls blobs: the temporary droppings of
tools, like rubber bands, vector paths, brush tqshape cursors.
tools, like rubber bands, vector paths, brush shape cursors.



+ 3
- 3
chalk/doc/chalk-features View File

@@ -201,10 +201,10 @@ of a tablet. Tilt and rotation is not yet supported.

* Brushes

** gimp brush tqshapes. Support for colored and grayscale brushes and
** gimp brush shapes. Support for colored and grayscale brushes and
pipe brushes. Support from Gimp parasites in brushes.
** custom brush tqshapes
** text brush tqshapes
** custom brush shapes
** text brush shapes
** brushes created from layers or images. These brushes can be saved
** colored brushes can also be used as masks


+ 30
- 30
chalk/doc/chalk.xmi View File

@@ -473,15 +473,15 @@ managed by this KisTileMgr" visibility="public" xmi.id="354" type="Q_INT32" name
<UML:Operation comment="Returns true if this KisTileMgr does not manage any
tiles." visibility="public" xmi.id="362" type="bool" name="empty" />
<UML:Operation comment="Height in pixels of the total area managed by this KisTileMgr" visibility="public" xmi.id="363" type="Q_INT32" name="height" />
<UML:Operation comment="XXX" visibility="public" xmi.id="364" type="KisTileSP" name="tqinvalidate" >
<UML:Operation comment="XXX" visibility="public" xmi.id="364" type="KisTileSP" name="invalidate" >
<UML:Parameter visibility="private" xmi.id="365" value="" type="KisTileSP" name="tile" />
<UML:Parameter visibility="private" xmi.id="366" value="" type="Q_INT32" name="xpix" />
<UML:Parameter visibility="private" xmi.id="367" value="" type="Q_INT32" name="ypix" />
</UML:Operation>
<UML:Operation comment="XXX" visibility="public" xmi.id="368" type="KisTileSP" name="tqinvalidate" >
<UML:Operation comment="XXX" visibility="public" xmi.id="368" type="KisTileSP" name="invalidate" >
<UML:Parameter visibility="private" xmi.id="369" value="" type="Q_INT32" name="tileno" />
</UML:Operation>
<UML:Operation comment="XXX" visibility="public" xmi.id="370" type="KisTileSP" name="tqinvalidate" >
<UML:Operation comment="XXX" visibility="public" xmi.id="370" type="KisTileSP" name="invalidate" >
<UML:Parameter visibility="private" xmi.id="371" value="" type="Q_INT32" name="xpix" />
<UML:Parameter visibility="private" xmi.id="372" value="" type="Q_INT32" name="ypix" />
</UML:Operation>
@@ -1705,17 +1705,17 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
<UML:Parameter visibility="private" xmi.id="1359" value="" type="const enumImgType &amp;" name="imgType" />
<UML:Parameter visibility="private" xmi.id="1360" value="" type="const QString &amp;" name="name" />
</UML:Operation>
<UML:Operation visibility="public" xmi.id="1361" type="virtual void" name="tqinvalidate" />
<UML:Operation visibility="public" xmi.id="1362" type="virtual void" name="tqinvalidate" >
<UML:Operation visibility="public" xmi.id="1361" type="virtual void" name="invalidate" />
<UML:Operation visibility="public" xmi.id="1362" type="virtual void" name="invalidate" >
<UML:Parameter visibility="private" xmi.id="1363" value="" type="Q_INT32" name="tileno" />
</UML:Operation>
<UML:Operation visibility="public" xmi.id="1364" type="virtual void" name="tqinvalidate" >
<UML:Operation visibility="public" xmi.id="1364" type="virtual void" name="invalidate" >
<UML:Parameter visibility="private" xmi.id="1365" value="" type="Q_INT32" name="x" />
<UML:Parameter visibility="private" xmi.id="1366" value="" type="Q_INT32" name="y" />
<UML:Parameter visibility="private" xmi.id="1367" value="" type="Q_INT32" name="w" />
<UML:Parameter visibility="private" xmi.id="1368" value="" type="Q_INT32" name="h" />
</UML:Operation>
<UML:Operation visibility="public" xmi.id="1369" type="virtual void" name="tqinvalidate" >
<UML:Operation visibility="public" xmi.id="1369" type="virtual void" name="invalidate" >
<UML:Parameter visibility="private" xmi.id="1370" value="" type="const QRect &amp;" name="rc" />
</UML:Operation>
<UML:Operation visibility="public" xmi.id="1371" type="KisLayerSP" name="layer" >
@@ -1930,17 +1930,17 @@ cannot be abstract, because otherwise this class would be abstract." visibility=
</UML:Operation>
<UML:Operation visibility="public" xmi.id="1529" type="const KisImageSP" name="image" />
<UML:Operation visibility="protected" xmi.id="1530" type="void" name="init" />
<UML:Operation visibility="public" xmi.id="1531" type="virtual void" name="tqinvalidate" />
<UML:Operation visibility="public" xmi.id="1532" type="virtual void" name="tqinvalidate" >
<UML:Operation visibility="public" xmi.id="1531" type="virtual void" name="invalidate" />
<UML:Operation visibility="public" xmi.id="1532" type="virtual void" name="invalidate" >
<UML:Parameter visibility="private" xmi.id="1533" value="" type="Q_INT32" name="tileno" />
</UML:Operation>
<UML:Operation visibility="public" xmi.id="1534" type="virtual void" name="tqinvalidate" >
<UML:Operation visibility="public" xmi.id="1534" type="virtual void" name="invalidate" >
<UML:Parameter visibility="private" xmi.id="1535" value="" type="Q_INT32" name="x" />
<UML:Parameter visibility="private" xmi.id="1536" value="" type="Q_INT32" name="y" />
<UML:Parameter visibility="private" xmi.id="1537" value="" type="Q_INT32" name="w" />
<UML:Parameter visibility="private" xmi.id="1538" value="" type="Q_INT32" name="h" />
</UML:Operation>
<UML:Operation visibility="public" xmi.id="1539" type="virtual void" name="tqinvalidate" >
<UML:Operation visibility="public" xmi.id="1539" type="virtual void" name="invalidate" >
<UML:Parameter visibility="private" xmi.id="1540" value="" type="const QRect &amp;" name="rc" />
</UML:Operation>
<UML:Operation visibility="public" xmi.id="1541" type="void" name="maskBounds" >
@@ -2649,17 +2649,17 @@ in the constructor, you have to call loadAsync.
<UML:Operation visibility="public" xmi.id="2090" type="" name="KisRenderInterface" >
<UML:Parameter visibility="private" xmi.id="2091" value="" type="const KisRenderInterface &amp;" name="rhs" />
</UML:Operation>
<UML:Operation visibility="public" xmi.id="2092" type="virtual void" isAbstract="true" name="tqinvalidate" />
<UML:Operation visibility="public" xmi.id="2093" type="virtual void" isAbstract="true" name="tqinvalidate" >
<UML:Operation visibility="public" xmi.id="2092" type="virtual void" isAbstract="true" name="invalidate" />
<UML:Operation visibility="public" xmi.id="2093" type="virtual void" isAbstract="true" name="invalidate" >
<UML:Parameter visibility="private" xmi.id="2094" value="" type="Q_INT32" name="tileno" />
</UML:Operation>
<UML:Operation visibility="public" xmi.id="2095" type="virtual void" isAbstract="true" name="tqinvalidate" >
<UML:Operation visibility="public" xmi.id="2095" type="virtual void" isAbstract="true" name="invalidate" >
<UML:Parameter visibility="private" xmi.id="2096" value="" type="Q_INT32" name="x" />
<UML:Parameter visibility="private" xmi.id="2097" value="" type="Q_INT32" name="y" />
<UML:Parameter visibility="private" xmi.id="2098" value="" type="Q_INT32" name="w" />
<UML:Parameter visibility="private" xmi.id="2099" value="" type="Q_INT32" name="h" />
</UML:Operation>
<UML:Operation visibility="public" xmi.id="2100" type="virtual void" isAbstract="true" name="tqinvalidate" >
<UML:Operation visibility="public" xmi.id="2100" type="virtual void" isAbstract="true" name="invalidate" >
<UML:Parameter visibility="private" xmi.id="2101" value="" type="const QRect &amp;" name="rc" />
</UML:Operation>
<UML:Operation visibility="public" xmi.id="2102" type="virtual Q_INT32" isAbstract="true" name="tileNum" >
@@ -3926,10 +3926,10 @@ in the constructor, you have to call loadAsync.
<listitem open="0" type="815" id="1353" label="index" />
<listitem open="0" type="815" id="1351" label="index" />
<listitem open="0" type="815" id="1355" label="init" />
<listitem open="0" type="815" id="1362" label="tqinvalidate" />
<listitem open="0" type="815" id="1361" label="tqinvalidate" />
<listitem open="0" type="815" id="1369" label="tqinvalidate" />
<listitem open="0" type="815" id="1364" label="tqinvalidate" />
<listitem open="0" type="815" id="1362" label="invalidate" />
<listitem open="0" type="815" id="1361" label="invalidate" />
<listitem open="0" type="815" id="1369" label="invalidate" />
<listitem open="0" type="815" id="1364" label="invalidate" />
<listitem open="0" type="815" id="1371" label="layer" />
<listitem open="0" type="815" id="1373" label="layer" />
<listitem open="0" type="815" id="1375" label="layers" />
@@ -4126,10 +4126,10 @@ in the constructor, you have to call loadAsync.
<listitem open="0" type="815" id="1526" label="height" />
<listitem open="0" type="815" id="1529" label="image" />
<listitem open="0" type="815" id="1530" label="init" />
<listitem open="0" type="815" id="1532" label="tqinvalidate" />
<listitem open="0" type="815" id="1531" label="tqinvalidate" />
<listitem open="0" type="815" id="1539" label="tqinvalidate" />
<listitem open="0" type="815" id="1534" label="tqinvalidate" />
<listitem open="0" type="815" id="1532" label="invalidate" />
<listitem open="0" type="815" id="1531" label="invalidate" />
<listitem open="0" type="815" id="1539" label="invalidate" />
<listitem open="0" type="815" id="1534" label="invalidate" />
<listitem open="0" type="815" id="1541" label="maskBounds" />
<listitem open="0" type="815" id="1543" label="maskBounds" />
<listitem open="0" type="815" id="1548" label="move" />
@@ -4263,10 +4263,10 @@ in the constructor, you have to call loadAsync.
<listitem open="0" type="815" id="2087" label="=" />
<listitem open="0" type="815" id="2089" label="KisRenderInterface" />
<listitem open="0" type="815" id="2090" label="KisRenderInterface" />
<listitem open="0" type="815" id="2093" label="tqinvalidate" />
<listitem open="0" type="815" id="2095" label="tqinvalidate" />
<listitem open="0" type="815" id="2092" label="tqinvalidate" />
<listitem open="0" type="815" id="2100" label="tqinvalidate" />
<listitem open="0" type="815" id="2093" label="invalidate" />
<listitem open="0" type="815" id="2095" label="invalidate" />
<listitem open="0" type="815" id="2092" label="invalidate" />
<listitem open="0" type="815" id="2100" label="invalidate" />
<listitem open="0" type="815" id="2102" label="tileNum" />
<listitem open="0" type="815" id="2105" label="tiles" />
<listitem open="0" type="815" id="2106" label="validate" />
@@ -4535,9 +4535,9 @@ in the constructor, you have to call loadAsync.
<listitem open="0" type="815" id="359" label="duplicate" />
<listitem open="0" type="815" id="362" label="empty" />
<listitem open="0" type="815" id="363" label="height" />
<listitem open="0" type="815" id="364" label="tqinvalidate" />
<listitem open="0" type="815" id="370" label="tqinvalidate" />
<listitem open="0" type="815" id="368" label="tqinvalidate" />
<listitem open="0" type="815" id="364" label="invalidate" />
<listitem open="0" type="815" id="370" label="invalidate" />
<listitem open="0" type="815" id="368" label="invalidate" />
<listitem open="0" type="815" id="373" label="invalidateTile" />
<listitem open="0" type="815" id="376" label="invalidateTiles" />
<listitem open="0" type="815" id="378" label="memSize" />

+ 22
- 22
chalk/doc/controller.xmi View File

@@ -3219,12 +3219,12 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
<UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1726" isRoot="false" initialValue="" type="1701" isAbstract="false" name="m_ac" />
<UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1751" isRoot="false" initialValue="" type="1750" isAbstract="false" name="m_toolDockManager" />
<UML:Attribute comment="// Sliders" isSpecification="false" isLeaf="false" visibility="private" xmi.id="1753" isRoot="false" initialValue="" type="1752" isAbstract="false" name="m_layerchannelslider" />
<UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1754" isRoot="false" initialValue="" type="1752" isAbstract="false" name="m_tqshapesslider" />
<UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1754" isRoot="false" initialValue="" type="1752" isAbstract="false" name="m_shapesslider" />
<UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1755" isRoot="false" initialValue="" type="1752" isAbstract="false" name="m_fillsslider" />
<UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1756" isRoot="false" initialValue="" type="1752" isAbstract="false" name="m_toolcontrolslider" />
<UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1757" isRoot="false" initialValue="" type="1752" isAbstract="false" name="m_colorslider" />
<UML:Attribute comment="// Dockers" isSpecification="false" isLeaf="false" visibility="private" xmi.id="1759" isRoot="false" initialValue="" type="1758" isAbstract="false" name="m_layerchanneldocker" />
<UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1760" isRoot="false" initialValue="" type="1758" isAbstract="false" name="m_tqshapesdocker" />
<UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1760" isRoot="false" initialValue="" type="1758" isAbstract="false" name="m_shapesdocker" />
<UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1761" isRoot="false" initialValue="" type="1758" isAbstract="false" name="m_fillsdocker" />
<UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1762" isRoot="false" initialValue="" type="1758" isAbstract="false" name="m_toolcontroldocker" />
<UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1763" isRoot="false" initialValue="" type="1758" isAbstract="false" name="m_colordocker" />
@@ -36138,7 +36138,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
<codecomment tag="" indentLevel="1" text="// Sliders" />
</header>
</ccfdeclarationcodeblock>
<ccfdeclarationcodeblock parent_id="1754" tag="tblock_23" canDelete="false" indentLevel="1" text="private KoTabbedToolDock* m_tqshapesslider;" >
<ccfdeclarationcodeblock parent_id="1754" tag="tblock_23" canDelete="false" indentLevel="1" text="private KoTabbedToolDock* m_shapesslider;" >
<header>
<codecomment tag="" indentLevel="1" />
</header>
@@ -36163,7 +36163,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
<codecomment tag="" indentLevel="1" text="// Dockers" />
</header>
</ccfdeclarationcodeblock>
<ccfdeclarationcodeblock parent_id="1760" tag="tblock_38" canDelete="false" indentLevel="1" text="private KisDockFrameDocker* m_tqshapesdocker;" >
<ccfdeclarationcodeblock parent_id="1760" tag="tblock_38" canDelete="false" indentLevel="1" text="private KisDockFrameDocker* m_shapesdocker;" >
<header>
<codecomment tag="" indentLevel="1" />
</header>
@@ -36382,14 +36382,14 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
<javacodedocumentation tag="" indentLevel="1" text="// Sliders" />
</header>
</codeaccessormethod>
<codeaccessormethod accessType="0" parent_id="1754" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="1754" text="return m_tqshapesslider;" >
<codeaccessormethod accessType="0" parent_id="1754" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="1754" text="return m_shapesslider;" >
<header>
<javacodedocumentation tag="" indentLevel="1" text="Get the value of m_tqshapesslider&amp;#010;&amp;#010;@return the value of m_tqshapesslider" />
<javacodedocumentation tag="" indentLevel="1" text="Get the value of m_shapesslider&amp;#010;&amp;#010;@return the value of m_shapesslider" />
</header>
</codeaccessormethod>
<codeaccessormethod accessType="1" parent_id="1754" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1754" text="m_tqshapesslider = value;" >
<codeaccessormethod accessType="1" parent_id="1754" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1754" text="m_shapesslider = value;" >
<header>
<javacodedocumentation tag="" indentLevel="1" text="Set the value of m_tqshapesslider&amp;#010;&amp;#010;" />
<javacodedocumentation tag="" indentLevel="1" text="Set the value of m_shapesslider&amp;#010;&amp;#010;" />
</header>
</codeaccessormethod>
<codeaccessormethod accessType="0" parent_id="1755" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="1755" text="return m_fillsslider;" >
@@ -36432,14 +36432,14 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
<javacodedocumentation tag="" indentLevel="1" text="// Dockers" />
</header>
</codeaccessormethod>
<codeaccessormethod accessType="0" parent_id="1760" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="1760" text="return m_tqshapesdocker;" >
<codeaccessormethod accessType="0" parent_id="1760" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="1760" text="return m_shapesdocker;" >
<header>
<javacodedocumentation tag="" indentLevel="1" text="Get the value of m_tqshapesdocker&amp;#010;&amp;#010;@return the value of m_tqshapesdocker" />
<javacodedocumentation tag="" indentLevel="1" text="Get the value of m_shapesdocker&amp;#010;&amp;#010;@return the value of m_shapesdocker" />
</header>
</codeaccessormethod>
<codeaccessormethod accessType="1" parent_id="1760" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="1760" text="m_tqshapesdocker = value;" >
<codeaccessormethod accessType="1" parent_id="1760" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="1760" text="m_shapesdocker = value;" >
<header>
<javacodedocumentation tag="" indentLevel="1" text="Set the value of m_tqshapesdocker&amp;#010;&amp;#010;" />
<javacodedocumentation tag="" indentLevel="1" text="Set the value of m_shapesdocker&amp;#010;&amp;#010;" />
</header>
</codeaccessormethod>
<codeaccessormethod accessType="0" parent_id="1761" tag="hblock_tag_42" canDelete="false" indentLevel="1" classfield_id="1761" text="return m_fillsdocker;" >
@@ -36982,19 +36982,19 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
<header>
<codecomment tag="" />
</header>
<ccfdeclarationcodeblock parent_id="1754" tag="tblock_23" canDelete="false" indentLevel="1" text="private KoTabbedToolDock* m_tqshapesslider;" >
<ccfdeclarationcodeblock parent_id="1754" tag="tblock_23" canDelete="false" indentLevel="1" text="private KoTabbedToolDock* m_shapesslider;" >
<header>
<codecomment tag="" indentLevel="1" />
</header>
</ccfdeclarationcodeblock>
<codeaccessormethod accessType="0" parent_id="1754" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="1754" text="return m_tqshapesslider;" >
<codeaccessormethod accessType="0" parent_id="1754" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="1754" text="return m_shapesslider;" >
<header>
<javacodedocumentation tag="" indentLevel="1" text="Get the value of m_tqshapesslider&amp;#010;&amp;#010;@return the value of m_tqshapesslider" />
<javacodedocumentation tag="" indentLevel="1" text="Get the value of m_shapesslider&amp;#010;&amp;#010;@return the value of m_shapesslider" />
</header>
</codeaccessormethod>
<codeaccessormethod accessType="1" parent_id="1754" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1754" text="m_tqshapesslider = value;" >
<codeaccessormethod accessType="1" parent_id="1754" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1754" text="m_shapesslider = value;" >
<header>
<javacodedocumentation tag="" indentLevel="1" text="Set the value of m_tqshapesslider&amp;#010;&amp;#010;" />
<javacodedocumentation tag="" indentLevel="1" text="Set the value of m_shapesslider&amp;#010;&amp;#010;" />
</header>
</codeaccessormethod>
</codeclassfield>
@@ -37082,19 +37082,19 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
<header>
<codecomment tag="" />
</header>
<ccfdeclarationcodeblock parent_id="1760" tag="tblock_38" canDelete="false" indentLevel="1" text="private KisDockFrameDocker* m_tqshapesdocker;" >
<ccfdeclarationcodeblock parent_id="1760" tag="tblock_38" canDelete="false" indentLevel="1" text="private KisDockFrameDocker* m_shapesdocker;" >
<header>
<codecomment tag="" indentLevel="1" />
</header>
</ccfdeclarationcodeblock>
<codeaccessormethod accessType="0" parent_id="1760" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="1760" text="return m_tqshapesdocker;" >
<codeaccessormethod accessType="0" parent_id="1760" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="1760" text="return m_shapesdocker;" >
<header>
<javacodedocumentation tag="" indentLevel="1" text="Get the value of m_tqshapesdocker&amp;#010;&amp;#010;@return the value of m_tqshapesdocker" />
<javacodedocumentation tag="" indentLevel="1" text="Get the value of m_shapesdocker&amp;#010;&amp;#010;@return the value of m_shapesdocker" />
</header>
</codeaccessormethod>
<codeaccessormethod accessType="1" parent_id="1760" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="1760" text="m_tqshapesdocker = value;" >
<codeaccessormethod accessType="1" parent_id="1760" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="1760" text="m_shapesdocker = value;" >
<header>
<javacodedocumentation tag="" indentLevel="1" text="Set the value of m_tqshapesdocker&amp;#010;&amp;#010;" />
<javacodedocumentation tag="" indentLevel="1" text="Set the value of m_shapesdocker&amp;#010;&amp;#010;" />
</header>
</codeaccessormethod>
</codeclassfield>

+ 1
- 1
chalk/doc/selections View File

@@ -117,7 +117,7 @@ discarded.

If a transform is applied to a image, all layers are transformed. The
selection is transformed, too: in the new situation, the layer that has a
selection active still has a selection, but the tqshape of the selection is
selection active still has a selection, but the shape of the selection is
transformed.

If a layer is moved, the selection moves with the layer (this is not

+ 3
- 3
chalk/plugins/filters/blur/kis_blur_filter.cc View File

@@ -72,7 +72,7 @@ KisFilterConfiguration* KisBlurFilter::configuration(TQWidget* w)
config->setProperty("halfHeight", wCTA->widget()->intHalfWidth->value() );
config->setProperty("rotate", wCTA->widget()->intAngle->value() );
config->setProperty("strength", wCTA->widget()->intStrength->value() );
config->setProperty("tqshape", wCTA->widget()->cbShape->currentItem());
config->setProperty("shape", wCTA->widget()->cbShape->currentItem());
}
return config;
}
@@ -87,7 +87,7 @@ void KisBlurFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilte
if(!config) config = new KisFilterConfiguration(id().id(), 1);

TQVariant value;
int tqshape = (config->getProperty("tqshape", value)) ? value.toInt() : 0;
int shape = (config->getProperty("shape", value)) ? value.toInt() : 0;
uint halfWidth = (config->getProperty("halfWidth", value)) ? value.toUInt() : 5;
uint width = 2 * halfWidth + 1;
uint halfHeight = (config->getProperty("halfHeight", value)) ? value.toUInt() : 5;
@@ -100,7 +100,7 @@ void KisBlurFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilte

KisAutobrushShape* kas;
kdDebug() << width << " " << height << " " << hFade << " " << vFade << endl;
switch(tqshape)
switch(shape)
{
case 1:
kas = new KisAutobrushRectShape(width, height , hFade, vFade);

+ 1
- 1
chalk/plugins/filters/blur/kis_wdg_blur.cc View File

@@ -55,7 +55,7 @@ KisWdgBlur::KisWdgBlur( KisFilter* nfilter, TQWidget * parent, const char * name
void KisWdgBlur::setConfiguration(KisFilterConfiguration* config)
{
TQVariant value;
if (config->getProperty("tqshape", value))
if (config->getProperty("shape", value))
{
widget()->cbShape->setCurrentItem( value.toUInt() );
}

+ 2
- 2
chalk/plugins/filters/bumpmap/wdgbumpmap.ui View File

@@ -52,7 +52,7 @@ layer, the current layer will be used.</string>
<property name="textFormat">
<enum>RichText</enum>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -82,7 +82,7 @@ layer, the current layer will be used.</string>
<property name="title">
<string>Settings</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignAuto</set>
</property>
<grid>

+ 11
- 11
chalk/plugins/filters/cimg/CImg.h View File

@@ -3749,8 +3749,8 @@ namespace cimg_library {
then this image is displayed in the current display window.
\param list : The list of images to display.
\param axe : The axe used to append the image for visualization. Can be 'x' (default),'y','z' or 'v'.
\param align : Defines the relative tqalignment of images when displaying images of different sizes.
Can be '\p c' (centered, which is the default), '\p p' (top tqalignment) and '\p n' (bottom aligment).
\param align : Defines the relative alignment of images when displaying images of different sizes.
Can be '\p c' (centered, which is the default), '\p p' (top alignment) and '\p n' (bottom aligment).

\see CImg::get_append()
**/
@@ -7772,7 +7772,7 @@ namespace cimg_library {

//! Return a resized image.
/**
\param src = Image giving the tqgeometry of the resize.
\param src = Image giving the geometry of the resize.
\param interp = Resizing type :
- 0 = no interpolation : additionnal space is filled with 0.
- 1 = bloc interpolation (nearest point).
@@ -7788,7 +7788,7 @@ namespace cimg_library {

//! Return a resized image.
/**
\param disp = Display giving the tqgeometry of the resize.
\param disp = Display giving the geometry of the resize.
\param interp = Resizing type :
- 0 = no interpolation : additionnal space is filled with 0.
- 1 = bloc interpolation (nearest point).
@@ -7830,7 +7830,7 @@ namespace cimg_library {

//! Resize the image.
/**
\param src = Image giving the tqgeometry of the resize.
\param src = Image giving the geometry of the resize.
\param interp = Resizing type :
- 0 = no interpolation : additionnal space is filled with 0.
- 1 = bloc interpolation (nearest point).
@@ -7846,7 +7846,7 @@ namespace cimg_library {

//! Resize the image
/**
\param disp = Display giving the tqgeometry of the resize.
\param disp = Display giving the geometry of the resize.
\param interp = Resizing type :
- 0 = no interpolation : additionnal space is filled with 0.
- 1 = bloc interpolation (nearest point).
@@ -12881,7 +12881,7 @@ namespace cimg_library {
\param sharpness = define the contour preservation.
\param anisotropy = define the smoothing anisotropy.
\param alpha = image pre-blurring (gaussian).
\param sigma = regularity of the tensor-valued tqgeometry.
\param sigma = regularity of the tensor-valued geometry.
\param dl = spatial discretization.
\param da = angular discretization.
\param gauss_prec = precision of the gaussian function.
@@ -17550,7 +17550,7 @@ namespace cimg_library {
//! Return a single image which is the concatenation of all images of the current CImgl instance.
/**
\param axe : specify the axe for image concatenation. Can be 'x','y','z' or 'v'.
\param align : specify the tqalignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom).
\param align : specify the alignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom).
\return A CImg<T> image corresponding to the concatenation is returned.
**/
CImg<T> get_append(const char axe='x',const char align='c') const {
@@ -17740,7 +17740,7 @@ namespace cimg_library {
The function returns immediately.
\param disp : reference to an existing CImgDisplay instance, where the current image list will be displayed.
\param axe : specify the axe for image concatenation. Can be 'x','y','z' or 'v'.
\param align : specify the tqalignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom).
\param align : specify the alignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom).
\return A reference to the current CImgl instance is returned.
**/
const CImgl& display(CImgDisplay& disp,const char axe='x',const char align='c') const {
@@ -17755,7 +17755,7 @@ namespace cimg_library {
The function returns when a key is pressed or the display window is closed by the user.
\param title : specify the title of the opening display window.
\param axe : specify the axe for image concatenation. Can be 'x','y','z' or 'v'.
\param align : specify the tqalignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom).
\param align : specify the alignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom).
\param min_size : specify the minimum size of the opening display window. Images having dimensions below this
size will be upscaled.
\param max_size : specify the maximum size of the opening display window. Images having dimensions above this
@@ -17774,7 +17774,7 @@ namespace cimg_library {
Images of the list are concatenated in a single temporarly image for visualization purposes.
The function returns when a key is pressed or the display window is closed by the user.
\param axe : specify the axe for image concatenation. Can be 'x','y','z' or 'v'.
\param align : specify the tqalignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom).
\param align : specify the alignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom).
\param min_size : specify the minimum size of the opening display window. Images having dimensions below this
size will be upscaled.
\param max_size : specify the maximum size of the opening display window. Images having dimensions above this

+ 2
- 2
chalk/plugins/filters/cimg/kis_cimg_filter.cc View File

@@ -429,7 +429,7 @@ bool KisCImgFilter::prepare_inpaint()

bool KisCImgFilter::prepare_resize()
{
const char *geom = NULL; //cimg_option("-g",(const char*)NULL,"Output image tqgeometry");
const char *geom = NULL; //cimg_option("-g",(const char*)NULL,"Output image geometry");
const bool anchor = true; //cimg_option("-anchor",true,"Anchor original pixels");
if (!geom) throw CImgArgumentException("You need to specify an output geomety (option -g)");
int w,h; get_geom(geom,w,h);
@@ -445,7 +445,7 @@ bool KisCImgFilter::prepare_resize()

bool KisCImgFilter::prepare_visuflow()
{
const char *geom = "100%x100%"; //cimg_option("-g","100%x100%","Output tqgeometry");
const char *geom = "100%x100%"; //cimg_option("-g","100%x100%","Output geometry");
//const char *file_i = (const char *)NULL; //cimg_option("-i",(const char*)NULL,"Input init image");
const bool normalize = false; //cimg_option("-norm",false,"Normalize input flow");


+ 1
- 1
chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc View File

@@ -98,7 +98,7 @@ void KisBrightnessContrastFilterConfiguration::fromXML( const TQString& s )
}
n = n.nextSibling();
}
// If the adjustment was cached, it now has changed - tqinvalidate it
// If the adjustment was cached, it now has changed - invalidate it
delete m_adjustment;
m_adjustment = 0;
}

+ 2
- 2
chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui View File

@@ -193,7 +193,7 @@
<property name="text">
<string>Contrast</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -226,7 +226,7 @@
<property name="text">
<string>Brightness</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
</widget>

+ 8
- 8
chalk/plugins/filters/levelfilter/kgradientslider.cc View File

@@ -66,7 +66,7 @@ void KGradientSlider::paintEvent(TQPaintEvent *)
/*if (!m_dragging) {*/
TQPixmap pm(size());
TQPainter p1;
p1.tqbegin(TQT_TQPAINTDEVICE(&pm), this);
p1.begin(TQT_TQPAINTDEVICE(&pm), this);

pm.fill();

@@ -203,7 +203,7 @@ void KGradientSlider::mousePressEvent ( TQMouseEvent * e )
m_gamma = 1.0 / pow (10, tmp);
break;
}
tqrepaint(false);
repaint(false);
}

void KGradientSlider::mouseReleaseEvent ( TQMouseEvent * e )
@@ -212,7 +212,7 @@ void KGradientSlider::mouseReleaseEvent ( TQMouseEvent * e )
return;

m_dragging = false;
tqrepaint(false);
repaint(false);

switch (m_grab_cursor) {
case BlackCursor:
@@ -283,7 +283,7 @@ void KGradientSlider::mouseMoveEvent ( TQMouseEvent * e )
}
}

tqrepaint(false);
repaint(false);
}

void KGradientSlider::leaveEvent( TQEvent * )
@@ -294,7 +294,7 @@ void KGradientSlider::leaveEvent( TQEvent * )
void KGradientSlider::enableGamma(bool b)
{
m_gammaEnabled = b;
tqrepaint(false);
repaint(false);
}

double KGradientSlider::getGamma(void)
@@ -311,7 +311,7 @@ void KGradientSlider::modifyBlack(int v) {
double tmp = log10 (1.0 / m_gamma);
m_gammacursor = (unsigned int)tqRound(mid + delta * tmp);
}
tqrepaint(false);
repaint(false);
}
}
void KGradientSlider::modifyWhite(int v) {
@@ -323,7 +323,7 @@ void KGradientSlider::modifyWhite(int v) {
double tmp = log10 (1.0 / m_gamma);
m_gammacursor = (unsigned int)tqRound(mid + delta * tmp);
}
tqrepaint(false);
repaint(false);
}
}
void KGradientSlider::modifyGamma(double v) {
@@ -332,7 +332,7 @@ void KGradientSlider::modifyGamma(double v) {
double mid = (double)m_blackcursor + delta;
double tmp = log10 (1.0 / m_gamma);
m_gammacursor = (unsigned int)tqRound(mid + delta * tmp);
tqrepaint(false);
repaint(false);
}

#include "kgradientslider.moc"

+ 1
- 1
chalk/plugins/filters/levelfilter/wdg_level.ui View File

@@ -148,7 +148,7 @@
<property name="text">
<string>1.0</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
</widget>

+ 2
- 2
chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp View File

@@ -63,7 +63,7 @@ void KisWdgWave::setConfiguration(KisFilterConfiguration* config)
{
widget()->intHAmplitude->setValue( value.toUInt() );
}
if (config->getProperty("horizontaltqshape", value))
if (config->getProperty("horizontalshape", value))
{
widget()->cbHShape->setCurrentItem( value.toUInt() );
}
@@ -79,7 +79,7 @@ void KisWdgWave::setConfiguration(KisFilterConfiguration* config)
{
widget()->intVAmplitude->setValue( value.toUInt() );
}
if (config->getProperty("verticaltqshape", value))
if (config->getProperty("verticalshape", value))
{
widget()->cbVShape->setCurrentItem( value.toUInt() );
}

+ 6
- 6
chalk/plugins/filters/wavefilter/wavefilter.cc View File

@@ -112,11 +112,11 @@ KisFilterConfiguration* KisFilterWave::configuration(TQWidget* w)
config->setProperty("horizontalwavelength", wN->widget()->intHWavelength->value() );
config->setProperty("horizontalshift", wN->widget()->intHShift->value() );
config->setProperty("horizontalamplitude", wN->widget()->intHAmplitude->value() );
config->setProperty("horizontaltqshape", wN->widget()->cbHShape->currentItem() );
config->setProperty("horizontalshape", wN->widget()->cbHShape->currentItem() );
config->setProperty("verticalwavelength", wN->widget()->intVWavelength->value() );
config->setProperty("verticalshift", wN->widget()->intVShift->value() );
config->setProperty("verticalamplitude", wN->widget()->intVAmplitude->value() );
config->setProperty("verticaltqshape", wN->widget()->cbVShape->currentItem() );
config->setProperty("verticalshape", wN->widget()->cbVShape->currentItem() );
}
return config;
}
@@ -137,19 +137,19 @@ void KisFilterWave::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilte
int horizontalwavelength = (config && config->getProperty("horizontalwavelength", value)) ? value.toInt() : 50;
int horizontalshift = (config && config->getProperty("horizontalshift", value)) ? value.toInt() : 50;
int horizontalamplitude = (config && config->getProperty("horizontalamplitude", value)) ? value.toInt() : 4;
int horizontaltqshape = (config && config->getProperty("horizontaltqshape", value)) ? value.toInt() : 0;
int horizontalshape = (config && config->getProperty("horizontalshape", value)) ? value.toInt() : 0;
int verticalwavelength = (config && config->getProperty("verticalwavelength", value)) ? value.toInt() : 50;
int verticalshift = (config && config->getProperty("verticalshift", value)) ? value.toInt() : 50;
int verticalamplitude = (config && config->getProperty("verticalamplitude", value)) ? value.toInt() : 4;
int verticaltqshape = (config && config->getProperty("verticaltqshape", value)) ? value.toInt() : 0;
int verticalshape = (config && config->getProperty("verticalshape", value)) ? value.toInt() : 0;
KisRectIteratorPixel dstIt = dst->createRectIterator(rect.x(), rect.y(), rect.width(), rect.height(), true );
KisWaveCurve* verticalcurve;
if(verticaltqshape == 1)
if(verticalshape == 1)
verticalcurve = new KisTriangleWaveCurve(verticalamplitude, verticalwavelength, verticalshift);
else
verticalcurve = new KisSinusoidalWaveCurve(verticalamplitude, verticalwavelength, verticalshift);
KisWaveCurve* horizontalcurve;
if(horizontaltqshape == 1)
if(horizontalshape == 1)
horizontalcurve = new KisTriangleWaveCurve(horizontalamplitude, horizontalwavelength, horizontalshift);
else
horizontalcurve = new KisSinusoidalWaveCurve(horizontalamplitude, horizontalwavelength, horizontalshift);

+ 4
- 4
chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc View File

@@ -59,18 +59,18 @@ void KisAirbrushOp::paintAt(const KisPoint &pos, const KisPaintInformation& info
//
// Most graphics apps -- especially the simple ones like Kolourpaint
// and the previous version of this routine in Chalk took a brush
// tqshape -- often a simple ellipse -- and filled that tqshape with a
// shape -- often a simple ellipse -- and filled that shape with a
// random 'spray' of single pixels.
//
// Other, more advanced graphics apps, like the Gimp or Photoshop,
// take the brush tqshape and paint just as with the brush paint op,
// take the brush shape and paint just as with the brush paint op,
// only making the initial dab more transparent, and perhaps adding
// extra transparence near the edges. Then, using a timer, when the
// cursor stays in place, dab upon dab is positioned in the same
// place, which makes the result less and less transparent.
//
// What I want to do here is create an airbrush that approaches a real
// one. It won't use brush tqshapes, instead going for the old-fashioned
// one. It won't use brush shapes, instead going for the old-fashioned
// circle. Depending upon pressure, both the size of the dab and the
// rate of paint deposition is determined. The edges of the dab are
// more transparent than the center, with perhaps even some fully
@@ -91,7 +91,7 @@ void KisAirbrushOp::paintAt(const KisPoint &pos, const KisPaintInformation& info

KisPaintDeviceSP device = m_painter->device();

// For now: use the current brush tqshape -- it beats calculating
// For now: use the current brush shape -- it beats calculating
// ellipes and cones, and it shows the working of the timer.
if (!device) return;


+ 2
- 2
chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc View File

@@ -180,7 +180,7 @@ void KisToolColorPicker::buttonPress(KisButtonPressEvent *e)
palette->add(ent);

if (!palette->save()) {
KMessageBox::error(0, i18n("Cannot write to palette file %1. Maybe it is read-only.").tqarg(palette->filename()), i18n("Palette"));
KMessageBox::error(0, i18n("Cannot write to palette file %1. Maybe it is read-only.").arg(palette->filename()), i18n("Palette"));
}
}
}
@@ -197,7 +197,7 @@ void KisToolColorPicker::displayPickedColor()
TQString channelValueText;

if (m_normaliseValues) {
channelValueText = i18n("%1%").tqarg(m_pickedColor.colorSpace()->normalisedChannelValueText(m_pickedColor.data(), i));
channelValueText = i18n("%1%").arg(m_pickedColor.colorSpace()->normalisedChannelValueText(m_pickedColor.data(), i));
} else {
channelValueText = m_pickedColor.colorSpace()->channelValueText(m_pickedColor.data(), i);
}

+ 5
- 5
chalk/plugins/tools/defaulttools/kis_tool_gradient.cc View File

@@ -58,7 +58,7 @@ KisToolGradient::KisToolGradient()
m_endPos = KisPoint(0, 0);

m_reverse = false;
m_tqshape = KisGradientPainter::GradientShapeLinear;
m_shape = KisGradientPainter::GradientShapeLinear;
m_repeat = KisGradientPainter::GradientRepeatNone;
m_antiAliasThreshold = 0.2;
}
@@ -157,7 +157,7 @@ void KisToolGradient::buttonRelease(KisButtonReleaseEvent *e)
progress->setSubject(&painter, true, true);
}

bool painted = painter.paintGradient(m_startPos, m_endPos, m_tqshape, m_repeat, m_antiAliasThreshold, m_reverse, 0, 0, m_subject->currentImg()->width(), m_subject->currentImg()->height());
bool painted = painter.paintGradient(m_startPos, m_endPos, m_shape, m_repeat, m_antiAliasThreshold, m_reverse, 0, 0, m_subject->currentImg()->width(), m_subject->currentImg()->height());

if (painted) {
// does whole thing at moment
@@ -237,7 +237,7 @@ TQWidget* KisToolGradient::createOptionWidget(TQWidget* parent)
m_ckReverse = new TQCheckBox(i18n("Reverse"), widget, "reverse_check");
connect(m_ckReverse, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetReverse(bool)));

m_cmbShape = new TQComboBox(false, widget, "tqshape_combo");
m_cmbShape = new TQComboBox(false, widget, "shape_combo");
connect(m_cmbShape, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetShape(int)));
m_cmbShape->insertItem(i18n("Linear"));
m_cmbShape->insertItem(i18n("Bi-Linear"));
@@ -270,9 +270,9 @@ TQWidget* KisToolGradient::createOptionWidget(TQWidget* parent)
return widget;
}

void KisToolGradient::slotSetShape(int tqshape)
void KisToolGradient::slotSetShape(int shape)
{
m_tqshape = static_cast<KisGradientPainter::enumGradientShape>(tqshape);
m_shape = static_cast<KisGradientPainter::enumGradientShape>(shape);
}

void KisToolGradient::slotSetRepeat(int repeat)

+ 1
- 1
chalk/plugins/tools/defaulttools/kis_tool_gradient.h View File

@@ -88,7 +88,7 @@ private:

KisCanvasSubject *m_subject;

KisGradientPainter::enumGradientShape m_tqshape;
KisGradientPainter::enumGradientShape m_shape;
KisGradientPainter::enumGradientRepeat m_repeat;

bool m_reverse;

+ 2
- 2
chalk/plugins/tools/defaulttools/kis_tool_text.cc View File

@@ -156,7 +156,7 @@ void KisToolText::buttonRelease(KisButtonReleaseEvent *e)

void KisToolText::setFont() {
KFontDialog::getFont( m_font, false/*, TQWidget* parent! */ );
m_lbFontName->setText(TQString(m_font.family() + ", %1").tqarg(m_font.pointSize()));
m_lbFontName->setText(TQString(m_font.family() + ", %1").arg(m_font.pointSize()));
}

TQWidget* KisToolText::createOptionWidget(TQWidget* parent)
@@ -167,7 +167,7 @@ TQWidget* KisToolText::createOptionWidget(TQWidget* parent)

TQHBox *fontBox = new TQHBox(widget);
m_lbFontName = new KSqueezedTextLabel(TQString(m_font.family() + ", %1")
.tqarg(m_font.pointSize()), fontBox);
.arg(m_font.pointSize()), fontBox);
m_btnMoreFonts = new TQPushButton("...", fontBox);

connect(m_btnMoreFonts, TQT_SIGNAL(released()), this, TQT_SLOT(setFont()));

+ 1
- 1
chalk/plugins/tools/selectiontools/kis_tool_select_brush.h View File

@@ -32,7 +32,7 @@ class KisSelectionOptions;

/**
* The selection brush creates a selection by painting with the current
* brush tqshape. Not sure what kind of an icon could represent this...
* brush shape. Not sure what kind of an icon could represent this...
* Depends a bit on how we're going to visualize selections.
*/
class KisToolSelectBrush : public KisToolFreehand {

+ 2
- 2
chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc View File

@@ -203,12 +203,12 @@ void KisToolSelectElliptical::buttonRelease(KisButtonReleaseEvent *e)
rc = rc.normalize();
KisSelectionSP tmpSel = new KisSelection(dev);
KisAutobrushCircleShape tqshape(rc.width(),rc.height(), 1, 1);
KisAutobrushCircleShape shape(rc.width(),rc.height(), 1, 1);
TQ_UINT8 value;
for (int y = 0; y <= rc.height(); y++)
for (int x = 0; x <= rc.width(); x++)
{
value = MAX_SELECTED - tqshape.valueAt(x,y);
value = MAX_SELECTED - shape.valueAt(x,y);
tmpSel->setSelected( x+rc.x(), y+rc.y(), value);
}
switch(m_selectAction)

+ 1
- 1
chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h View File

@@ -30,7 +30,7 @@ class KisSelectionOptions;

/**
* The selection eraser makes a selection smaller by painting with the
* current eraser tqshape. Not sure what kind of an icon could represent
* current eraser shape. Not sure what kind of an icon could represent
* this... Depends a bit on how we're going to visualize selections.
*/
class KisToolSelectEraser : public KisToolFreehand {

+ 1
- 1
chalk/plugins/tools/tool_crop/kis_tool_crop.cc View File

@@ -500,7 +500,7 @@ void KisToolCrop::paintOutlineWithHandles(KisCanvasPainter& gc, const TQRect&)
gc.drawLine(startx,endy + m_handleSize / 2 + 1, startx, controller->kiscanvas()->height());
gc.drawLine(endx,0,endx,starty - m_handleSize / 2);
gc.drawLine(endx + m_handleSize / 2 + 1,starty, controller->kiscanvas()->width(), starty);
TQMemArray <TQRect> rects = m_handlesRegion.tqrects ();
TQMemArray <TQRect> rects = m_handlesRegion.rects ();
for (TQMemArray <TQRect>::ConstIterator it = rects.begin (); it != rects.end (); ++it)
{
gc.fillRect (*it, TQt::black);

+ 1
- 1
chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.h View File

@@ -57,7 +57,7 @@ public:
t->setup(ac);
return t;
}
virtual KisID id() { return KisID("beziertqshape", i18n("Bezier Painting Tool")); }
virtual KisID id() { return KisID("beziershape", i18n("Bezier Painting Tool")); }
};

#endif //__KIS_TOOL_CURVE_PAINT_H_

+ 1
- 1
chalk/plugins/tools/tool_curves/kis_tool_example.h View File

@@ -60,7 +60,7 @@ public:
t->setup(ac);
return t;
}
virtual KisID id() { return KisID("exampletqshape", i18n("Example Tool")); }
virtual KisID id() { return KisID("exampleshape", i18n("Example Tool")); }
};



+ 1
- 1
chalk/plugins/tools/tool_star/kis_tool_star.h View File

@@ -94,7 +94,7 @@ public:
t->setup(ac);
return t;
}
virtual KisID id() { return KisID("startqshape", i18n("Star Tool")); }
virtual KisID id() { return KisID("starshape", i18n("Star Tool")); }
};



+ 1
- 1
chalk/plugins/tools/tool_transform/wdg_tool_transform.ui View File

@@ -178,7 +178,7 @@
<property name="text">
<string>Filter:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>

+ 1
- 1
chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui View File

@@ -233,7 +233,7 @@
<property name="scaledContents">
<bool>false</bool>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
</widget>

+ 2
- 2
chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc View File

@@ -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;

+ 3
- 3
chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui View File

@@ -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">

+ 2
- 2
chalk/plugins/viewplugins/imagesize/wdg_layersize.ui View File

@@ -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>

+ 1
- 1
chalk/plugins/viewplugins/imagesize/wdg_resolution.ui View File

@@ -96,7 +96,7 @@
<property name="text">
<string>100</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>

+ 56
- 56
chalk/plugins/viewplugins/performancetest/perftest.cc View File

@@ -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());

}