Browse Source

Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 9484481655.
tags/r14.0.0
Timothy Pearson 8 years ago
parent
commit
c9cb4f4874
100 changed files with 349 additions and 349 deletions
  1. +1
    -1
      chalk/HACKING
  2. +1
    -1
      chalk/IMAGE_LIBRARIES
  3. +6
    -6
      chalk/chalkcolor/kis_basic_histogram_producers.cc
  4. +1
    -1
      chalk/chalkcolor/kis_basic_histogram_producers.h
  5. +2
    -2
      chalk/chalkcolor/kis_colorspace_factory_registry.cc
  6. +2
    -2
      chalk/chalkcolor/kis_profile.cc
  7. +3
    -3
      chalk/colorspaces/wet/kis_wet_palette_widget.cc
  8. +1
    -1
      chalk/colorspaces/wet/wet_plugin.cc
  9. +12
    -12
      chalk/colorspaces/wetsticky/ws/canvas.c
  10. +2
    -2
      chalk/colorspaces/wetsticky/ws/canvas.h
  11. +1
    -1
      chalk/colorspaces/wetsticky/ws/engine.c
  12. +1
    -1
      chalk/colorspaces/wetsticky/ws/engine3.c
  13. +1
    -1
      chalk/colorspaces/wetsticky/ws/ogl_interface.c
  14. +1
    -1
      chalk/colorspaces/wetsticky/ws/x_interface.c
  15. +2
    -2
      chalk/core/kis_brush.cc
  16. +1
    -1
      chalk/core/kis_convolution_painter.cc
  17. +37
    -37
      chalk/core/kis_exif_value.cc
  18. +4
    -4
      chalk/core/kis_fill_painter.cc
  19. +2
    -2
      chalk/core/kis_filter_registry.cc
  20. +1
    -1
      chalk/core/kis_gradient.cc
  21. +14
    -14
      chalk/core/kis_gradient_painter.cc
  22. +1
    -1
      chalk/core/kis_gradient_painter.h
  23. +2
    -2
      chalk/core/kis_group_layer.cc
  24. +1
    -1
      chalk/core/kis_group_layer.h
  25. +1
    -1
      chalk/core/kis_imagepipe_brush.cc
  26. +1
    -1
      chalk/core/kis_nameserver.cc
  27. +1
    -1
      chalk/core/kis_painter.cc
  28. +2
    -2
      chalk/core/kis_paintop_registry.cc
  29. +1
    -1
      chalk/core/kis_palette.cc
  30. +1
    -1
      chalk/core/kis_selection.cc
  31. +1
    -1
      chalk/doc/DESIGN.obsolete
  32. +1
    -1
      chalk/doc/background_paper.txt
  33. +3
    -3
      chalk/doc/chalk-features
  34. +32
    -32
      chalk/doc/chalk.xmi
  35. +22
    -22
      chalk/doc/controller.xmi
  36. +2
    -2
      chalk/doc/doc-outline
  37. +1
    -1
      chalk/doc/selections
  38. +1
    -1
      chalk/doc/the preview widget
  39. +3
    -3
      chalk/plugins/filters/blur/kis_blur_filter.cc
  40. +2
    -2
      chalk/plugins/filters/blur/kis_wdg_blur.cc
  41. +5
    -5
      chalk/plugins/filters/blur/wdgblur.ui
  42. +1
    -1
      chalk/plugins/filters/bumpmap/bumpmap.cc
  43. +3
    -3
      chalk/plugins/filters/bumpmap/wdgbumpmap.ui
  44. +11
    -11
      chalk/plugins/filters/cimg/CImg.h
  45. +2
    -2
      chalk/plugins/filters/cimg/kis_cimg_filter.cc
  46. +1
    -1
      chalk/plugins/filters/cimg/kis_cimgconfig_widget.cc
  47. +1
    -1
      chalk/plugins/filters/cimg/wdg_cimg.ui
  48. +1
    -1
      chalk/plugins/filters/colorify/KisWdgColorify.cpp
  49. +3
    -3
      chalk/plugins/filters/colorify/WdgColorifyBase.ui
  50. +1
    -1
      chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cc
  51. +3
    -3
      chalk/plugins/filters/colors/wdgcolortoalphabase.ui
  52. +2
    -2
      chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc
  53. +1
    -1
      chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc
  54. +13
    -13
      chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui
  55. +6
    -6
      chalk/plugins/filters/colorsfilters/wdg_perchannel.ui
  56. +7
    -7
      chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui
  57. +1
    -1
      chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc
  58. +1
    -1
      chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp
  59. +2
    -2
      chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui
  60. +1
    -1
      chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp
  61. +4
    -4
      chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui
  62. +8
    -8
      chalk/plugins/filters/levelfilter/kgradientslider.cc
  63. +1
    -1
      chalk/plugins/filters/levelfilter/kis_level_filter.cc
  64. +17
    -17
      chalk/plugins/filters/levelfilter/wdg_level.ui
  65. +1
    -1
      chalk/plugins/filters/noisefilter/kis_wdg_noise.cpp
  66. +2
    -2
      chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui
  67. +1
    -1
      chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc
  68. +1
    -1
      chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp
  69. +2
    -2
      chalk/plugins/filters/randompickfilter/wdgrandompickoptions.ui
  70. +1
    -1
      chalk/plugins/filters/unsharp/kis_wdg_unsharp.cc
  71. +2
    -2
      chalk/plugins/filters/unsharp/wdgunsharp.ui
  72. +3
    -3
      chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp
  73. +6
    -6
      chalk/plugins/filters/wavefilter/wavefilter.cc
  74. +2
    -2
      chalk/plugins/filters/wavefilter/wdgwaveoptions.ui
  75. +4
    -4
      chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc
  76. +2
    -2
      chalk/plugins/paintops/defaultpaintops/kis_brushop.cc
  77. +4
    -4
      chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui
  78. +2
    -2
      chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc
  79. +1
    -1
      chalk/plugins/tools/defaulttools/kis_tool_brush.cc
  80. +3
    -3
      chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc
  81. +1
    -1
      chalk/plugins/tools/defaulttools/kis_tool_fill.cc
  82. +6
    -6
      chalk/plugins/tools/defaulttools/kis_tool_gradient.cc
  83. +1
    -1
      chalk/plugins/tools/defaulttools/kis_tool_gradient.h
  84. +1
    -1
      chalk/plugins/tools/defaulttools/kis_tool_line.cc
  85. +3
    -3
      chalk/plugins/tools/defaulttools/kis_tool_text.cc
  86. +4
    -4
      chalk/plugins/tools/defaulttools/wdgcolorpicker.ui
  87. +2
    -2
      chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc
  88. +1
    -1
      chalk/plugins/tools/selectiontools/kis_tool_select_brush.h
  89. +2
    -2
      chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc
  90. +4
    -4
      chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc
  91. +2
    -2
      chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc
  92. +1
    -1
      chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h
  93. +2
    -2
      chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc
  94. +2
    -2
      chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc
  95. +2
    -2
      chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc
  96. +1
    -1
      chalk/plugins/tools/tool_crop/kis_tool_crop.cc
  97. +3
    -3
      chalk/plugins/tools/tool_crop/wdg_tool_crop.ui
  98. +1
    -1
      chalk/plugins/tools/tool_curves/kis_tool_bezier.cc
  99. +1
    -1
      chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc
  100. +1
    -1
      chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.h

+ 1
- 1
chalk/HACKING View File

@@ -62,7 +62,7 @@ Variable/Parameter names

Designer

Chalk has started to use designer. All dialogs and all widgets that have a layout
Chalk has started to use designer. All dialogs and all widgets that have a tqlayout
manager must be done in designer. We don't add code nor add signal/slot connections
in designer



+ 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 shapes before display.
used by Karbon to render tqshapes 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").arg(static_cast<TQ_UINT8>(pos * UINT8_MAX));
return TQString("%1").tqarg(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").arg(static_cast<TQ_UINT8>(pos * UINT8_MAX));
return TQString("%1").tqarg(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").arg(static_cast<float>(pos)); // XXX I doubt this is correct!
return TQString("%1").tqarg(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").arg(static_cast<float>(pos)); // XXX I doubt this is correct!
return TQString("%1").tqarg(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").arg(static_cast<TQ_UINT8>(pos * UINT8_MAX));
return TQString("%1").tqarg(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").arg(static_cast<TQ_UINT16>(pos * UINT16_MAX));
return TQString("%1").tqarg(static_cast<TQ_UINT16>(pos * UINT16_MAX));
}

double KisGenericLabHistogramProducer::maximalZoom() const {


+ 1
- 1
chalk/chalkcolor/kis_basic_histogram_producers.h View File

@@ -60,7 +60,7 @@ protected:
/**
* The order in which channels() returns is not the same as the internal representation,
* that of the pixel internally. This method converts external usage to internal usage.
* This method uses some basic assumtpions about the layout of the pixel, so _extremely_
* This method uses some basic assumtpions about the tqlayout of the pixel, so _extremely_
* exotic spaces might want to override this (see makeExternalToInternal source for
* those assumptions)
**/


+ 2
- 2
chalk/chalkcolor/kis_colorspace_factory_registry.cc View File

@@ -62,8 +62,8 @@ KisColorSpaceFactoryRegistry::KisColorSpaceFactoryRegistry(TQStringList profileF
*/

// Load all colorspace modules
KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/ColorSpace"),
TQString::fromLatin1("(Type == 'Service') and "
KTrader::OfferList offers = KTrader::self()->query(TQString::tqfromLatin1("Chalk/ColorSpace"),
TQString::tqfromLatin1("(Type == 'Service') and "
"([X-Chalk-Version] == 2)"));

if (offers.empty()) {


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

@@ -25,7 +25,7 @@
#include LCMS_HEADER

#include <tqimage.h>
#include <textstream.h>
#include <tqtextstream.h>
#include <tqfile.h>

#include <kdebug.h>
@@ -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.resize(bytesNeeded))
if(m_rawData.tqresize(bytesNeeded))
{
_cmsSaveProfileToMem(m_profile, m_rawData.data(), &bytesNeeded); // fill buffer
cmsHPROFILE newprofile = cmsOpenProfileFromMem(m_rawData.data(), (DWORD) bytesNeeded);


+ 3
- 3
chalk/colorspaces/wet/kis_wet_palette_widget.cc View File

@@ -21,12 +21,12 @@

#include <tqpushbutton.h>
#include <tqapplication.h>
#include <clipboard.h>
#include <tqclipboard.h>
#include <tqcolor.h>
#include <tqdrawutil.h>
#include <tqhbox.h>
#include <tqlabel.h>
#include <layout.h>
#include <tqlayout.h>
#include <tqpainter.h>
#include <tqspinbox.h>
#include <tqstyle.h>
@@ -50,7 +50,7 @@ KisWetPaletteWidget::KisWetPaletteWidget(TQWidget *parent, const char *name) : s
{
m_subject = 0;

TQVBoxLayout * vl = new TQVBoxLayout(this, 0, -1, "main layout");
TQVBoxLayout * vl = new TQVBoxLayout(this, 0, -1, "main tqlayout");

TQGridLayout * l = new TQGridLayout(vl, 2, 8, 2, "color wells grid");



+ 1
- 1
chalk/colorspaces/wet/wet_plugin.cc View File

@@ -22,7 +22,7 @@

#include <tqobject.h>
#include <tqapplication.h>
#include <clipboard.h>
#include <tqclipboard.h>
#include <tqdockwindow.h>
#include <tqpoint.h>
#include <tqlabel.h>


+ 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_repaint() routine
and are removed by the next_cell_for_repaint() function. The
Points are added to this list by the need_to_tqrepaint() routine
and are removed by the next_cell_for_tqrepaint() 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_repaint = 0;
static int next_to_tqrepaint = 0;

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

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

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

void need_to_repaint(point)
void need_to_tqrepaint(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 repaint
/* If the list is already full then simply ignore the tqrepaint
request - it will get done eventually anyway. */

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

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

void next_cell_for_repaint(cell, locus)
void next_cell_for_tqrepaint(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_repaint(cell, locus)
POINT_PTR locus;

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

*(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++;
*(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++;
}

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


+ 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_repaint (/* POINT */);
extern void need_to_tqrepaint (/* 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_repaint (/* *CELL_PTR, POINT_PTR */);
extern void next_cell_for_tqrepaint (/* *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_repaint(destLocus);
need_to_tqrepaint(destLocus);
}

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


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

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

}

need_to_repaint(destLocus);
need_to_tqrepaint(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_repaint(&cell, &p);
next_cell_for_tqrepaint(&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_repaint(&cell, &p);
next_cell_for_tqrepaint(&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").arg(width).arg(height);
//filename = TQString("smoothScale_%1x%2.png").tqarg(width).tqarg(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").arg(width).arg(height);
//filename = TQString("bilinear_%1x%2.png").tqarg(width).tqarg(height);
}

//scaledImage.save(filename, "PNG");


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

@@ -20,7 +20,7 @@
#include <string.h>
#include <cfloat>

#include "brush.h"
#include "tqbrush.h"
#include "tqcolor.h"
#include "tqfontinfo.h"
#include "tqfontmetrics.h"


+ 37
- 37
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").arg(i) ) ).isNull() )
if( (attr = elmt.attribute(TQString("value%1").tqarg(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").arg(i) ) ).isNull() )
if( (attr = elmt.attribute(TQString("value%1").tqarg(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").arg(i) ) ).isNull() )
if( (attr = elmt.attribute(TQString("value%1").tqarg(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").arg(i) ) ).isNull() )
if( (attr = elmt.attribute(TQString("numerator%1").tqarg(i) ) ).isNull() )
{
r.numerator = (TQ_UINT32)0;
} else {
r.numerator = (TQ_UINT32) attr.toUInt();
}
if( (attr = elmt.attribute(TQString("denominator%1").arg(i) ) ).isNull() )
if( (attr = elmt.attribute(TQString("denominator%1").tqarg(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").arg(i) ) ).isNull() )
if( (attr = elmt.attribute(TQString("value%1").tqarg(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").arg(i) ) ).isNull() )
if( (attr = elmt.attribute(TQString("value%1").tqarg(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").arg(i) ) ).isNull() )
if( (attr = elmt.attribute(TQString("value%1").tqarg(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").arg(i) ) ).isNull() )
if( (attr = elmt.attribute(TQString("numerator%1").tqarg(i) ) ).isNull() )
{
r.numerator = (TQ_INT32)0;
} else {
r.numerator = (TQ_INT32) attr.toInt();
}
if( (attr = elmt.attribute(TQString("denominator%1").arg(i) ) ).isNull() )
if( (attr = elmt.attribute(TQString("denominator%1").tqarg(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").arg(i) ) ).isNull() )
if( (attr = elmt.attribute(TQString("value%1").tqarg(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").arg(i) ) ).isNull() )
if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() )
{
setValue(i, (double)0);
} else {
@@ -310,65 +310,65 @@ TQDomElement ExifValue::save(TQDomDocument& doc)
{
case EXIF_TYPE_BYTE:
for(uint i = 0; i < components(); i++)
elmt.setAttribute(TQString("value%1").arg(i), asByte( i ) );
elmt.setAttribute(TQString("value%1").tqarg(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").arg(i), asShort( i ) );
elmt.setAttribute(TQString("value%1").tqarg(i), asShort( i ) );
break;
case EXIF_TYPE_LONG:
for(uint i = 0; i < components(); i++)
elmt.setAttribute(TQString("value%1").arg(i), asLong( i ) );
elmt.setAttribute(TQString("value%1").tqarg(i), asLong( i ) );
break;
case EXIF_TYPE_RATIONAL:
for(uint i = 0; i < components(); i++)
{
KisExifRational r = asRational(i);
elmt.setAttribute(TQString("numerator%1").arg(i), r.numerator );
elmt.setAttribute(TQString("denominator%1").arg(i), r.denominator );
elmt.setAttribute(TQString("numerator%1").tqarg(i), r.numerator );
elmt.setAttribute(TQString("denominator%1").tqarg(i), r.denominator );
}
break;
case EXIF_TYPE_SBYTE:
for(uint i = 0; i < components(); i++)
elmt.setAttribute(TQString("value%1").arg(i), asSByte( i ) );
elmt.setAttribute(TQString("value%1").tqarg(i), asSByte( i ) );
break;
case EXIF_TYPE_UNDEFINED:
{
UByteArray value = asUndefined();
TQByteArray data;
data.setRawData((char*)value.data(), value.size());
TQByteArray encodedData;
KCodecs::base64Encode( data, encodedData );
TQByteArray tqencodedData;
KCodecs::base64Encode( data, tqencodedData );
data.resetRawData( (char*)value.data(), value.size());
elmt.setAttribute("value", TQString(encodedData));
elmt.setAttribute("value", TQString(tqencodedData));
}
break;
case EXIF_TYPE_SSHORT:
for(uint i = 0; i < components(); i++)
elmt.setAttribute(TQString("value%1").arg(i), asSShort( i ) );
elmt.setAttribute(TQString("value%1").tqarg(i), asSShort( i ) );
break;
case EXIF_TYPE_SLONG:
for(uint i = 0; i < components(); i++)
elmt.setAttribute(TQString("value%1").arg(i), asSLong( i ) );
elmt.setAttribute(TQString("value%1").tqarg(i), asSLong( i ) );
break;
case EXIF_TYPE_SRATIONAL:
for(uint i = 0; i < components(); i++)
{
KisExifSRational r = asSRational(i);
elmt.setAttribute(TQString("numerator%1").arg(i), r.numerator );
elmt.setAttribute(TQString("denominator%1").arg(i), r.denominator );
elmt.setAttribute(TQString("numerator%1").tqarg(i), r.numerator );
elmt.setAttribute(TQString("denominator%1").tqarg(i), r.denominator );
}
break;
case EXIF_TYPE_FLOAT:
for(uint i = 0; i < components(); i++)
elmt.setAttribute(TQString("value%1").arg(i), asFloat( i ) );
elmt.setAttribute(TQString("value%1").tqarg(i), asFloat( i ) );
break;
case EXIF_TYPE_DOUBLE:
for(uint i = 0; i < components(); i++)
elmt.setAttribute(TQString("value%1").arg(i), asDouble( i ) );
elmt.setAttribute(TQString("value%1").tqarg(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 ").arg( asExifNumber( i ).m_byte );
return TQString("%1 ").tqarg( asExifNumber( i ).m_byte );
case EXIF_TYPE_SHORT:
return TQString("%1 ").arg( asExifNumber( i ).m_short );
return TQString("%1 ").tqarg( asExifNumber( i ).m_short );
case EXIF_TYPE_LONG:
return TQString("%1 ").arg( asExifNumber( i ).m_long );
return TQString("%1 ").tqarg( asExifNumber( i ).m_long );
case EXIF_TYPE_RATIONAL:
return TQString("%1 / %2 ").arg( asExifNumber( i ).m_rational.numerator ).arg( asExifNumber( i ).m_rational.denominator );
return TQString("%1 / %2 ").tqarg( asExifNumber( i ).m_rational.numerator ).tqarg( asExifNumber( i ).m_rational.denominator );
case EXIF_TYPE_SBYTE:
return TQString("%1 ").arg( asExifNumber( i ).m_sbyte );
return TQString("%1 ").tqarg( asExifNumber( i ).m_sbyte );
case EXIF_TYPE_SSHORT:
return TQString("%1 ").arg( asExifNumber( i ).m_sshort );
return TQString("%1 ").tqarg( asExifNumber( i ).m_sshort );
case EXIF_TYPE_SLONG:
return TQString("%1 ").arg( asExifNumber( i ).m_slong );
return TQString("%1 ").tqarg( asExifNumber( i ).m_slong );
case EXIF_TYPE_SRATIONAL:
return TQString("%1 / %2 ").arg( asExifNumber( i ).m_srational.numerator ).arg( asExifNumber( i ).m_srational.denominator );
return TQString("%1 / %2 ").tqarg( asExifNumber( i ).m_srational.numerator ).tqarg( asExifNumber( i ).m_srational.denominator );
case EXIF_TYPE_FLOAT:
return TQString("%1 ").arg( asExifNumber( i ).m_float );
return TQString("%1 ").tqarg( asExifNumber( i ).m_float );
case EXIF_TYPE_DOUBLE:
return TQString("%1 ").arg( asExifNumber( i ).m_double );
return TQString("%1 ").tqarg( asExifNumber( i ).m_double );
default:
return "unknow ";
}


+ 4
- 4
chalk/core/kis_fill_painter.cc View File

@@ -22,7 +22,7 @@
#include <cfloat>
#include <stack>

#include "brush.h"
#include "tqbrush.h"
#include "tqfontinfo.h"
#include "tqfontmetrics.h"
#include "tqpen.h"
@@ -209,7 +209,7 @@ struct FillSegment {
// FillSegment* parent;
};

typedef enum { None = 0, Added = 1, Checked = 2 } Status;
typedef enum { None = 0, Added = 1, Checked = 2 } tqStatus;

KisSelectionSP KisFillPainter::createFloodSelection(int startX, int startY) {
if (m_width < 0 || m_height < 0) {
@@ -260,9 +260,9 @@ KisSelectionSP KisFillPainter::createFloodSelection(int startX, int startY) {

stack.push(new FillSegment(startX, startY/*, 0*/));

Status* map = new Status[m_size];
tqStatus* map = new tqStatus[m_size];

memset(map, None, m_size * sizeof(Status));
memset(map, None, m_size * sizeof(tqStatus));

int progressPercent = 0; int pixelsDone = 0; int currentPercent = 0;
emit notifyProgressStage(i18n("Making fill outline..."), 0);


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

@@ -40,8 +40,8 @@ KisFilterRegistry::KisFilterRegistry()
Q_ASSERT(KisFilterRegistry::m_singleton == 0);
KisFilterRegistry::m_singleton = this;

KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/Filter"),
TQString::fromLatin1("(Type == 'Service') and "
KTrader::OfferList offers = KTrader::self()->query(TQString::tqfromLatin1("Chalk/Filter"),
TQString::tqfromLatin1("(Type == 'Service') and "
"([X-Chalk-Version] == 2)"));

KTrader::OfferList::ConstIterator iter;


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

@@ -26,7 +26,7 @@
#include <cmath>

#include <tqimage.h>
#include <textstream.h>
#include <tqtextstream.h>
#include <tqfile.h>

#include <koColor.h>


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

@@ -20,7 +20,7 @@
#include <string.h>
#include <cfloat>

#include "brush.h"
#include "tqbrush.h"
#include "tqcolor.h"
#include "tqfontinfo.h"
#include "tqfontmetrics.h"
@@ -483,7 +483,7 @@ KisGradientPainter::KisGradientPainter(KisPaintDeviceSP device) : super(device),

bool KisGradientPainter::paintGradient(const KisPoint& gradientVectorStart,
const KisPoint& gradientVectorEnd,
enumGradientShape shape,
enumGradientShape tqshape,
enumGradientRepeat repeat,
double antiAliasThreshold,
bool reverseGradient,
@@ -496,29 +496,29 @@ bool KisGradientPainter::paintGradient(const KisPoint& gradientVectorStart,

if (!m_gradient) return false;

GradientShapeStrategy *shapeStrategy = 0;
GradientShapeStrategy *tqshapeStrategy = 0;

switch (shape) {
switch (tqshape) {
case GradientShapeLinear:
shapeStrategy = new LinearGradientStrategy(gradientVectorStart, gradientVectorEnd);
tqshapeStrategy = new LinearGradientStrategy(gradientVectorStart, gradientVectorEnd);
break;
case GradientShapeBiLinear:
shapeStrategy = new BiLinearGradientStrategy(gradientVectorStart, gradientVectorEnd);
tqshapeStrategy = new BiLinearGradientStrategy(gradientVectorStart, gradientVectorEnd);
break;
case GradientShapeRadial:
shapeStrategy = new RadialGradientStrategy(gradientVectorStart, gradientVectorEnd);
tqshapeStrategy = new RadialGradientStrategy(gradientVectorStart, gradientVectorEnd);
break;
case GradientShapeSquare:
shapeStrategy = new SquareGradientStrategy(gradientVectorStart, gradientVectorEnd);
tqshapeStrategy = new SquareGradientStrategy(gradientVectorStart, gradientVectorEnd);
break;
case GradientShapeConical:
shapeStrategy = new ConicalGradientStrategy(gradientVectorStart, gradientVectorEnd);
tqshapeStrategy = new ConicalGradientStrategy(gradientVectorStart, gradientVectorEnd);
break;
case GradientShapeConicalSymetric:
shapeStrategy = new ConicalSymetricGradientStrategy(gradientVectorStart, gradientVectorEnd);
tqshapeStrategy = new ConicalSymetricGradientStrategy(gradientVectorStart, gradientVectorEnd);
break;
}
Q_CHECK_PTR(shapeStrategy);
Q_CHECK_PTR(tqshapeStrategy);

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 = shapeStrategy->valueAt( x, y);
double t = tqshapeStrategy->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 = shapeStrategy->valueAt(sampleX, sampleY);
double t = tqshapeStrategy->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 shapeStrategy;
delete tqshapeStrategy;

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 shape,
enumGradientShape tqshape,
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 children, nothing to show for it.
// No tqchildren, 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 children, a group layer is empty.
// No child -- clear the projection. Without tqchildren, 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() << " children "
// << ", " << m_layers.count() << " tqchildren "
// << ", projection: " << m_projection
// << "\n";
return v.visit(this);


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

@@ -37,7 +37,7 @@
#include <tqfile.h>
#include <tqregexp.h>
#include <tqstringlist.h>
#include <textstream.h>
#include <tqtextstream.h>

#include <kdebug.h>
#include <klocale.h>


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

@@ -29,7 +29,7 @@ KisNameServer::~KisNameServer()

TQString KisNameServer::name()
{
return m_prefix.arg(m_generator++);
return m_prefix.tqarg(m_generator++);
}

TQ_INT32 KisNameServer::currentSeed() const


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

@@ -26,7 +26,7 @@
#include <climits>
#include <strings.h>

#include "brush.h"
#include "tqbrush.h"
#include "tqfontinfo.h"
#include "tqfontmetrics.h"
#include "tqpen.h"


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

@@ -43,8 +43,8 @@ KisPaintOpRegistry::KisPaintOpRegistry()
Q_ASSERT(KisPaintOpRegistry::m_singleton == 0);
KisPaintOpRegistry::m_singleton = this;

KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/Paintop"),
TQString::fromLatin1("(Type == 'Service') and "
KTrader::OfferList offers = KTrader::self()->query(TQString::tqfromLatin1("Chalk/Paintop"),
TQString::tqfromLatin1("(Type == 'Service') and "
"([X-Chalk-Version] == 2)"));

KTrader::OfferList::ConstIterator iter;


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

@@ -33,7 +33,7 @@
#include <tqpoint.h>
#include <tqvaluevector.h>
#include <tqfile.h>
#include <textstream.h>
#include <tqtextstream.h>

#include <kdebug.h>
#include <klocale.h>


+ 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.rects();
TQMemArray<TQRect> rects = region.tqrects();

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 shapes,
(kis_resource_mediator). Resources are brush tqshapes,
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 shape cursors.
tools, like rubber bands, vector paths, brush tqshape 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 shapes. Support for colored and grayscale brushes and
** gimp brush tqshapes. Support for colored and grayscale brushes and
pipe brushes. Support from Gimp parasites in brushes.
** custom brush shapes
** text brush shapes
** custom brush tqshapes
** text brush tqshapes
** brushes created from layers or images. These brushes can be saved
** colored brushes can also be used as masks



+ 32
- 32
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="invalidate" >
<UML:Operation comment="XXX" visibility="public" xmi.id="364" type="KisTileSP" name="tqinvalidate" >
<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="invalidate" >
<UML:Operation comment="XXX" visibility="public" xmi.id="368" type="KisTileSP" name="tqinvalidate" >
<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="invalidate" >
<UML:Operation comment="XXX" visibility="public" xmi.id="370" type="KisTileSP" name="tqinvalidate" >
<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>
@@ -645,7 +645,7 @@ of tile in x and y." visibility="public" xmi.id="408" type="void" name="tileCoor
<UML:Operation visibility="public" xmi.id="476" type="virtual void" isAbstract="true" name="insert" >
<UML:Parameter visibility="private" xmi.id="477" value="" type="KisTileSP" name="tile" />
</UML:Operation>
<UML:Operation visibility="public" xmi.id="478" type="virtual void" isAbstract="true" name="sizeHint" >
<UML:Operation visibility="public" xmi.id="478" type="virtual void" isAbstract="true" name="tqsizeHint" >
<UML:Parameter visibility="private" xmi.id="479" value="" type="Q_INT32" name="nelements" />
</UML:Operation>
<UML:Operation visibility="public" xmi.id="480" type="virtual " name="~KisTileCacheInterface" />
@@ -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="invalidate" />
<UML:Operation visibility="public" xmi.id="1362" type="virtual void" name="invalidate" >
<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: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="invalidate" >
<UML:Operation visibility="public" xmi.id="1364" type="virtual void" name="tqinvalidate" >
<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="invalidate" >
<UML:Operation visibility="public" xmi.id="1369" type="virtual void" name="tqinvalidate" >
<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="invalidate" />
<UML:Operation visibility="public" xmi.id="1532" type="virtual void" name="invalidate" >
<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: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="invalidate" >
<UML:Operation visibility="public" xmi.id="1534" type="virtual void" name="tqinvalidate" >
<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="invalidate" >
<UML:Operation visibility="public" xmi.id="1539" type="virtual void" name="tqinvalidate" >
<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="invalidate" />
<UML:Operation visibility="public" xmi.id="2093" type="virtual void" isAbstract="true" name="invalidate" >
<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: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="invalidate" >
<UML:Operation visibility="public" xmi.id="2095" type="virtual void" isAbstract="true" name="tqinvalidate" >
<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="invalidate" >
<UML:Operation visibility="public" xmi.id="2100" type="virtual void" isAbstract="true" name="tqinvalidate" >
<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="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="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="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="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="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="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="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="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="2102" label="tileNum" />
<listitem open="0" type="815" id="2105" label="tiles" />
<listitem open="0" type="815" id="2106" label="validate" />
@@ -4485,7 +4485,7 @@ in the constructor, you have to call loadAsync.
<listitem open="0" type="815" id="473" label="KisTileCacheInterface" />
<listitem open="0" type="815" id="474" label="flush" />
<listitem open="0" type="815" id="476" label="insert" />
<listitem open="0" type="815" id="478" label="sizeHint" />
<listitem open="0" type="815" id="478" label="tqsizeHint" />
<listitem open="0" type="815" id="480" label="~KisTileCacheInterface" />
</listitem>
<listitem open="0" type="813" id="1996" label="KisTileCommand" >
@@ -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="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="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="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_shapesslider" />
<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="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_shapesdocker" />
<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="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_shapesslider;" >
<ccfdeclarationcodeblock parent_id="1754" tag="tblock_23" canDelete="false" indentLevel="1" text="private KoTabbedToolDock* m_tqshapesslider;" >
<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_shapesdocker;" >
<ccfdeclarationcodeblock parent_id="1760" tag="tblock_38" canDelete="false" indentLevel="1" text="private KisDockFrameDocker* m_tqshapesdocker;" >
<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_shapesslider;" >
<codeaccessormethod accessType="0" parent_id="1754" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="1754" text="return m_tqshapesslider;" >
<header>
<javacodedocumentation tag="" indentLevel="1" text="Get the value of m_shapesslider&amp;#010;&amp;#010;@return the value of m_shapesslider" />
<javacodedocumentation tag="" indentLevel="1" text="Get the value of m_tqshapesslider&amp;#010;&amp;#010;@return the value of m_tqshapesslider" />
</header>
</codeaccessormethod>
<codeaccessormethod accessType="1" parent_id="1754" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1754" text="m_shapesslider = value;" >
<codeaccessormethod accessType="1" parent_id="1754" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1754" text="m_tqshapesslider = value;" >
<header>
<javacodedocumentation tag="" indentLevel="1" text="Set the value of m_shapesslider&amp;#010;&amp;#010;" />
<javacodedocumentation tag="" indentLevel="1" text="Set the value of m_tqshapesslider&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_shapesdocker;" >
<codeaccessormethod accessType="0" parent_id="1760" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="1760" text="return m_tqshapesdocker;" >
<header>
<javacodedocumentation tag="" indentLevel="1" text="Get the value of m_shapesdocker&amp;#010;&amp;#010;@return the value of m_shapesdocker" />
<javacodedocumentation tag="" indentLevel="1" text="Get the value of m_tqshapesdocker&amp;#010;&amp;#010;@return the value of m_tqshapesdocker" />
</header>
</codeaccessormethod>
<codeaccessormethod accessType="1" parent_id="1760" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="1760" text="m_shapesdocker = value;" >
<codeaccessormethod accessType="1" parent_id="1760" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="1760" text="m_tqshapesdocker = value;" >
<header>
<javacodedocumentation tag="" indentLevel="1" text="Set the value of m_shapesdocker&amp;#010;&amp;#010;" />
<javacodedocumentation tag="" indentLevel="1" text="Set the value of m_tqshapesdocker&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_shapesslider;" >
<ccfdeclarationcodeblock parent_id="1754" tag="tblock_23" canDelete="false" indentLevel="1" text="private KoTabbedToolDock* m_tqshapesslider;" >
<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_shapesslider;" >
<codeaccessormethod accessType="0" parent_id="1754" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="1754" text="return m_tqshapesslider;" >
<header>
<javacodedocumentation tag="" indentLevel="1" text="Get the value of m_shapesslider&amp;#010;&amp;#010;@return the value of m_shapesslider" />
<javacodedocumentation tag="" indentLevel="1" text="Get the value of m_tqshapesslider&amp;#010;&amp;#010;@return the value of m_tqshapesslider" />
</header>
</codeaccessormethod>
<codeaccessormethod accessType="1" parent_id="1754" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1754" text="m_shapesslider = value;" >
<codeaccessormethod accessType="1" parent_id="1754" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1754" text="m_tqshapesslider = value;" >
<header>
<javacodedocumentation tag="" indentLevel="1" text="Set the value of m_shapesslider&amp;#010;&amp;#010;" />
<javacodedocumentation tag="" indentLevel="1" text="Set the value of m_tqshapesslider&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_shapesdocker;" >
<ccfdeclarationcodeblock parent_id="1760" tag="tblock_38" canDelete="false" indentLevel="1" text="private KisDockFrameDocker* m_tqshapesdocker;" >
<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_shapesdocker;" >
<codeaccessormethod accessType="0" parent_id="1760" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="1760" text="return m_tqshapesdocker;" >
<header>
<javacodedocumentation tag="" indentLevel="1" text="Get the value of m_shapesdocker&amp;#010;&amp;#010;@return the value of m_shapesdocker" />
<javacodedocumentation tag="" indentLevel="1" text="Get the value of m_tqshapesdocker&amp;#010;&amp;#010;@return the value of m_tqshapesdocker" />
</header>
</codeaccessormethod>
<codeaccessormethod accessType="1" parent_id="1760" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="1760" text="m_shapesdocker = value;" >
<codeaccessormethod accessType="1" parent_id="1760" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="1760" text="m_tqshapesdocker = value;" >
<header>
<javacodedocumentation tag="" indentLevel="1" text="Set the value of m_shapesdocker&amp;#010;&amp;#010;" />
<javacodedocumentation tag="" indentLevel="1" text="Set the value of m_tqshapesdocker&amp;#010;&amp;#010;" />
</header>
</codeaccessormethod>
</codeclassfield>


+ 2
- 2
chalk/doc/doc-outline View File

@@ -85,7 +85,7 @@ The current outline (working towards 1.6):
- [TODO] properties, usage, converting, ...

- Commands
- General layout
- General tqlayout
- Menus
- Toolbars
- Palettes
@@ -142,7 +142,7 @@ Outline for the 1.5 manual (final as of 2006-05-31):
- Available colorspaces

- Commands ([TODO] make up-to-date)
- General layout
- General tqlayout
- Menus
- Toolbars
- Palettes


+ 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 shape of the selection is
selection active still has a selection, but the tqshape of the selection is
transformed.

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


+ 1
- 1
chalk/doc/the preview widget View File

@@ -2,7 +2,7 @@
On Tuesday 21 June 2005 14:16, Casper Boemann wrote:
> Hi
>
> As you might have noticed I have changed the layout of the preview, to lo=
> As you might have noticed I have changed the tqlayout of the preview, to lo=
ok
> more like digikam.
>


+ 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("shape", wCTA->widget()->cbShape->currentItem());
config->setProperty("tqshape", 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 shape = (config->getProperty("shape", value)) ? value.toInt() : 0;
int tqshape = (config->getProperty("tqshape", 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(shape)
switch(tqshape)
{
case 1:
kas = new KisAutobrushRectShape(width, height , hFade, vFade);


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

@@ -20,7 +20,7 @@

#include "kis_wdg_blur.h"

#include <layout.h>
#include <tqlayout.h>
#include <tqtoolbutton.h>

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


+ 5
- 5
chalk/plugins/filters/blur/wdgblur.ui View File

@@ -32,7 +32,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -49,7 +49,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -58,7 +58,7 @@
</spacer>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>layout17</cstring>
<cstring>tqlayout17</cstring>
</property>
<grid>
<property name="name">
@@ -76,13 +76,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<property name="tqminimumSize">
<size>
<width>16</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<property name="tqmaximumSize">
<size>
<width>16</width>
<height>32767</height>


+ 1
- 1
chalk/plugins/filters/bumpmap/bumpmap.cc View File

@@ -31,7 +31,7 @@
#include <vector>

#include <tqpoint.h>
#include <layout.h>
#include <tqlayout.h>
#include <tqcombobox.h>
#include <tqcheckbox.h>
#include <tqbuttongroup.h>


+ 3
- 3
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="alignment">
<property name="tqalignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -66,7 +66,7 @@ layer, the current layer will be used.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -82,7 +82,7 @@ layer, the current layer will be used.</string>
<property name="title">
<string>Settings</string>
</property>
<property name="alignment">
<property name="tqalignment">
<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 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).
\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).

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

//! Return a resized image.
/**
\param src = Image giving the geometry of the resize.
\param src = Image giving the tqgeometry 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 geometry of the resize.
\param disp = Display giving the tqgeometry 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 geometry of the resize.
\param src = Image giving the tqgeometry 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 geometry of the resize.
\param disp = Display giving the tqgeometry 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 geometry.
\param sigma = regularity of the tensor-valued tqgeometry.
\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 alignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom).
\param align : specify the tqalignment 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 alignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom).
\param align : specify the tqalignment 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 alignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom).
\param align : specify the tqalignment 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 alignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom).
\param align : specify the tqalignment 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 geometry");
const char *geom = NULL; //cimg_option("-g",(const char*)NULL,"Output image tqgeometry");
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 geometry");
const char *geom = "100%x100%"; //cimg_option("-g","100%x100%","Output tqgeometry");
//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/cimg/kis_cimgconfig_widget.cc View File

@@ -19,7 +19,7 @@
*
* Ported from the CImg Gimp plugin by Victor Stinner and David Tschumperlé.
*/
#include "layout.h"
#include "tqlayout.h"
#include "tqcheckbox.h"
#include "tqpushbutton.h"



+ 1
- 1
chalk/plugins/filters/cimg/wdg_cimg.ui View File

@@ -42,7 +42,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>51</width>
<height>20</height>


+ 1
- 1
chalk/plugins/filters/colorify/KisWdgColorify.cpp View File

@@ -21,7 +21,7 @@
#include "KisWdgColorify.h"

#include <tqcheckbox.h>
#include <layout.h>
#include <tqlayout.h>
#include <tqspinbox.h>

#include <kcolorbutton.h>


+ 3
- 3
chalk/plugins/filters/colorify/WdgColorifyBase.ui View File

@@ -29,7 +29,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>61</width>
<height>20</height>
@@ -38,7 +38,7 @@
</spacer>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>layout1</cstring>
<cstring>tqlayout1</cstring>
</property>
<hbox>
<property name="name">
@@ -79,7 +79,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>20</width>
<height>50</height>


+ 1
- 1
chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cc View File

@@ -21,7 +21,7 @@
#include "kis_wdg_color_to_alpha.h"

#include <tqcheckbox.h>
#include <layout.h>
#include <tqlayout.h>
#include <tqspinbox.h>

#include <kcolorbutton.h>


+ 3
- 3
chalk/plugins/filters/colors/wdgcolortoalphabase.ui View File

@@ -29,7 +29,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>61</width>
<height>20</height>
@@ -38,7 +38,7 @@
</spacer>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>layout1</cstring>
<cstring>tqlayout1</cstring>
</property>
<hbox>
<property name="name">
@@ -95,7 +95,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>20</width>
<height>50</height>


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

@@ -23,7 +23,7 @@

#include <klocale.h>

#include <layout.h>
#include <tqlayout.h>
#include <tqpixmap.h>
#include <tqpainter.h>
#include <tqlabel.h>
@@ -98,7 +98,7 @@ void KisBrightnessContrastFilterConfiguration::fromXML( const TQString& s )
}
n = n.nextSibling();
}
// If the adjustment was cached, it now has changed - invalidate it
// If the adjustment was cached, it now has changed - tqinvalidate it
delete m_adjustment;
m_adjustment = 0;
}


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

@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <layout.h>
#include <tqlayout.h>
#include <tqpixmap.h>
#include <tqpainter.h>
#include <tqlabel.h>


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

@@ -32,7 +32,7 @@
</property>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>layout4</cstring>
<cstring>tqlayout4</cstring>
</property>
<grid>
<property name="name">
@@ -50,13 +50,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<property name="tqminimumSize">
<size>
<width>250</width>
<height>20</height>
</size>
</property>
<property name="maximumSize">
<property name="tqmaximumSize">
<size>
<width>250</width>
<height>20</height>
@@ -84,13 +84,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<property name="tqminimumSize">
<size>
<width>254</width>
<height>254</height>
</size>
</property>
<property name="maximumSize">
<property name="tqmaximumSize">
<size>
<width>254</width>
<height>254</height>
@@ -116,13 +116,13 @@
<property name="name">
<cstring>kCurve</cstring>
</property>
<property name="minimumSize">
<property name="tqminimumSize">
<size>
<width>250</width>
<height>250</height>
</size>
</property>
<property name="maximumSize">
<property name="tqmaximumSize">
<size>
<width>250</width>
<height>250</height>
@@ -143,13 +143,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<property name="tqminimumSize">
<size>
<width>20</width>
<height>250</height>
</size>
</property>
<property name="maximumSize">
<property name="tqmaximumSize">
<size>
<width>20</width>
<height>250</height>
@@ -169,7 +169,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
<cstring>layout7</cstring>
<cstring>tqlayout7</cstring>
</property>
<grid>
<property name="name">
@@ -193,7 +193,7 @@
<property name="text">
<string>Contrast</string>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -226,7 +226,7 @@
<property name="text">
<string>Brightness</string>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -253,7 +253,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>131</width>
<height>20</height>


+ 6
- 6
chalk/plugins/filters/colorsfilters/wdg_perchannel.ui View File

@@ -24,7 +24,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout4</cstring>
<cstring>tqlayout4</cstring>
</property>
<hbox>
<property name="name">
@@ -47,7 +47,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout8</cstring>
<cstring>tqlayout8</cstring>