Browse Source

rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
tags/v3.5.13
tpearson 9 years ago
parent
commit
b6edfe41c9
100 changed files with 421 additions and 421 deletions
  1. +1
    -1
      chalk/chalkcolor/kis_abstract_colorspace.cc
  2. +3
    -3
      chalk/chalkcolor/kis_colorspace_factory_registry.cc
  3. +1
    -1
      chalk/chalkcolor/kis_colorspace_factory_registry.h
  4. +1
    -1
      chalk/colorspaces/wet/kis_wet_colorspace.cc
  5. +2
    -2
      blic
  6. +10
    -10
      chalk/core/createdcop.py
  7. +1
    -1
      chalk/core/kis_exif_info.h
  8. +3
    -3
      chalk/core/kis_filter_configuration.cc
  9. +1
    -1
      chalk/core/kis_group_layer.cc
  10. +2
    -2
      chalk/core/kis_imagepipe_brush.cc
  11. +1
    -1
      chalk/core/kis_layer.cc
  12. +2
    -2
      chalk/core/kis_paint_device.h
  13. +1
    -1
      chalk/core/kis_palette.cc
  14. +1
    -1
      chalk/core/kis_pattern.cc
  15. +2
    -2
      chalk/core/kis_perspective_grid.cpp
  16. +1
    -1
      chalk/core/kis_perspective_grid.h
  17. +2
    -2
      chalk/core/kis_selection.cc
  18. +3
    -3
      chalk/core/kis_thread_pool.cc
  19. +1
    -1
      chalk/core/tiles/kis_tile.h
  20. +3
    -3
      chalk/core/tiles/kis_tileddatamanager.cc
  21. +2
    -2
      chalk/core/tiles/kis_tilemanager.cc
  22. +1
    -1
      chalk/doc/brush.txt
  23. +12
    -12
      chalk/doc/chalk.xmi
  24. +3
    -3
      chalk/doc/controller.xmi
  25. +3
    -3
      chalk/doc/histograms.xmi
  26. +1
    -1
      chalk/plugins/filters/cimg/CImg.h
  27. +1
    -1
      chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc
  28. +1
    -1
      chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc
  29. +1
    -1
      chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc
  30. +1
    -1
      chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc
  31. +1
    -1
      chalk/plugins/tools/defaulttools/kis_tool_fill.cc
  32. +9
    -9
      chalk/plugins/tools/tool_crop/kis_tool_crop.cc
  33. +10
    -10
      chalk/plugins/tools/tool_curves/kis_curve_framework.cc
  34. +14
    -14
      chalk/plugins/tools/tool_curves/kis_curve_framework.h
  35. +2
    -2
      chalk/plugins/tools/tool_curves/kis_tool_bezier.cc
  36. +6
    -6
      chalk/plugins/tools/tool_curves/kis_tool_curve.cc
  37. +1
    -1
      chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc
  38. +1
    -1
      chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc
  39. +1
    -1
      chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cc
  40. +1
    -1
      chalk/plugins/viewplugins/screenshot/regiongrabber.cpp
  41. +1
    -1
      chalk/sdk/kis_shared_ptr_vector.h
  42. +1
    -1
      chalk/ui/kis_cmb_composite.cc
  43. +1
    -1
      chalk/ui/kis_cmb_idlist.cc
  44. +1
    -1
      chalk/ui/kis_dlg_image_properties.cc
  45. +1
    -1
      chalk/ui/kis_dlg_preferences.cc
  46. +12
    -12
      chalk/ui/kis_filter_manager.cc
  47. +1
    -1
      chalk/ui/kis_filters_listview.cc
  48. +6
    -6
      chalk/ui/kis_gradient_slider_widget.cc
  49. +5
    -5
      chalk/ui/kis_layerbox.cc
  50. +3
    -3
      chalk/ui/kis_paintop_box.cc
  51. +1
    -1
      chalk/ui/kis_part_layer.cc
  52. +1
    -1
      chalk/ui/kis_resource_mediator.cc
  53. +1
    -1
      chalk/ui/kis_resourceserver.cc
  54. +2
    -2
      chalk/ui/kis_tool_freehand.cc
  55. +1
    -1
      chalk/ui/kis_tool_paint.cc
  56. +2
    -2
      chalk/ui/kis_view.cc
  57. +7
    -7
      chalk/ui/kobirdeyepanel.cpp
  58. +5
    -5
      chalk/ui/layerlist.cpp
  59. +1
    -1
      chalk/ui/layerlist.h
  60. +1
    -1
      chalk/ui/squeezedcombobox.cpp
  61. +1
    -1
      chalk/ui/squeezedcombobox.h
  62. +4
    -4
      filters/chalk/gmagick/kis_image_magick_converter.cc
  63. +1
    -1
      filters/chalk/jpeg/iccjpeg.c
  64. +4
    -4
      filters/chalk/magick/kis_image_magick_converter.cc
  65. +1
    -1
      filters/chalk/xcf/xcf/xcf-load.cc
  66. +8
    -8
      filters/karbon/ai/aiparserbase.cc
  67. +2
    -2
      filters/karbon/applixgraphics/applixgraphicimport.cc
  68. +2
    -2
      filters/karbon/eps/pscommentlexer.cc
  69. +4
    -4
      filters/karbon/oodraw/oodrawimport.cc
  70. +21
    -21
      filters/karbon/svg/svgimport.cc
  71. +21
    -21
      filters/karbon/xaml/xamlimport.cc
  72. +11
    -11
      filters/kpresenter/magicpoint/mgp2kpr.py
  73. +1
    -1
      filters/kpresenter/ooimpress/ooimpressexport.cc
  74. +5
    -5
      filters/kpresenter/ooimpress/ooimpressimport.cc
  75. +1
    -1
      filters/kpresenter/powerpoint/libppt/objects.cpp
  76. +1
    -1
      filters/kpresenter/powerpoint/libppt/ustring.cpp
  77. +1
    -1
      filters/kpresenter/powerpoint/libppt/ustring.h
  78. +18
    -18
      filters/kspread/applixspread/applixspreadimport.cc
  79. +1
    -1
      filters/kspread/csv/csvdialog.cpp
  80. +6
    -6
      filters/kspread/csv/csvexport.cc
  81. +2
    -2
      filters/kspread/csv/csvimport.cc
  82. +1
    -1
      filters/kspread/excel/import/excelimport.cc
  83. +10
    -10
      filters/kspread/excel/sidewinder/excel.cpp
  84. +1
    -1
      filters/kspread/excel/sidewinder/excel.h
  85. +1
    -1
      filters/kspread/excel/sidewinder/ustring.cpp
  86. +1
    -1
      filters/kspread/excel/sidewinder/ustring.h
  87. +9
    -9
      filters/kspread/gnumeric/gnumericexport.cc
  88. +20
    -20
      filters/kspread/gnumeric/gnumericimport.cc
  89. +5
    -5
      filters/kspread/html/htmlexport.cc
  90. +2
    -2
      filters/kspread/opencalc/opencalcexport.cc
  91. +49
    -49
      filters/kspread/opencalc/opencalcimport.cc
  92. +2
    -2
      filters/kspread/qpro/libqpro/src/formula.cc
  93. +2
    -2
      filters/kword/abiword/ImportHelpers.cc
  94. +3
    -3
      filters/kword/abiword/ImportStyle.cc
  95. +7
    -7
      filters/kword/abiword/abiwordexport.cc
  96. +4
    -4
      filters/kword/abiword/abiwordimport.cc
  97. +10
    -10
      filters/kword/applixword/applixwordimport.cc
  98. +2
    -2
      filters/kword/ascii/asciiexport.cc
  99. +7
    -7
      filters/kword/ascii/asciiimport.cc
  100. +1
    -1
      filters/kword/hancomword/hancomwordimport.cpp

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

@@ -232,7 +232,7 @@ bool KisAbstractColorSpace::convertPixelsTo(const TQ_UINT8 * src,

if (!tf && m_profile && dstColorSpace->getProfile()) {

if (!m_transforms.tqcontains(dstColorSpace)) {
if (!m_transforms.contains(dstColorSpace)) {
tf = createTransform(dstColorSpace,
m_profile,
dstColorSpace->getProfile(),


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

@@ -100,7 +100,7 @@ KisColorSpaceFactoryRegistry::~KisColorSpaceFactoryRegistry()

KisProfile * KisColorSpaceFactoryRegistry::getProfileByName(const TQString & name)
{
if (m_profileMap.tqfind(name) == m_profileMap.end()) {
if (m_profileMap.find(name) == m_profileMap.end()) {
return 0;
}

@@ -160,7 +160,7 @@ KisColorSpace * KisColorSpaceFactoryRegistry::getColorSpace(const KisID & csID,

TQString name = csID.id() + "<comb>" + profileName;

if (m_csMap.tqfind(name) == m_csMap.end()) {
if (m_csMap.find(name) == m_csMap.end()) {
KisColorSpaceFactory *csf = get(csID);
if(!csf)
return 0;
@@ -175,7 +175,7 @@ KisColorSpace * KisColorSpaceFactoryRegistry::getColorSpace(const KisID & csID,
m_csMap[name] = cs;
}

if(m_csMap.tqcontains(name))
if(m_csMap.contains(name))
return m_csMap[name];
else
return 0;


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

@@ -27,7 +27,7 @@ class TQStringList;
class KisPaintDeviceAction;

/**
* This class tqcontains:
* This class contains:
* - a registry of colorspace instantiated with specific profiles.
* - a registry of singleton colorspace factories.
* - a registry of icc profiles


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

@@ -190,7 +190,7 @@ void KisWetColorSpace::fromTQColor(const TQColor& c, TQ_UINT8 *dst, KisProfile *
}

// Translate the special TQCOlors from our paintbox to wetpaint paints.
if (m_conversionMap.tqcontains(key)) {
if (m_conversionMap.contains(key)) {
(*p).paint = m_conversionMap[key];
(*p).adsorb = m_conversionMap[key]; // or maybe best add water here?
} else {


chalk/colorspaces/wetsticky/ws/GNU → blic View File

@@ -59,7 +59,7 @@ modification follow.
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

0. This License applies to any program or other work which tqcontains
0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License. The "Program", below,
refers to any such program or work, and a "work based on the Program"
@@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following:

The source code for a work means the preferred form of the work for
making modifications to it. For an executable work, complete source
code means all the source code for all modules it tqcontains, plus any
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable. However, as a
special exception, the source code distributed need not include

+ 10
- 10
chalk/core/createdcop.py View File

@@ -84,10 +84,10 @@ dcopiface_template = """/*
def parseHeader(headerfile, classname):
# parse the source class header to get a list of functions we're going to wrap
functions = []
if (headerfile.tqfind("private:") > -1):
lines = headerfile[headerfile.tqfind(classname):headerfile.tqfind("private")].splitlines()
if (headerfile.find("private:") > -1):
lines = headerfile[headerfile.find(classname):headerfile.find("private")].splitlines()
else:
lines = headerfile[headerfile.tqfind(classname):headerfile.tqfind("#endif")].splitlines()
lines = headerfile[headerfile.find(classname):headerfile.find("#endif")].splitlines()
i = 0
while i < len(lines):
line = lines[i].strip()
@@ -100,7 +100,7 @@ def parseHeader(headerfile, classname):
line.startswith("#") or
line.startswith("}") or
line.startswith("public Q_SLOTS:") or
line.tqfind("~") != -1 or
line.find("~") != -1 or
len(line) == 0
):
i+=1
@@ -112,17 +112,17 @@ def parseHeader(headerfile, classname):
function = line
complete = 0
# strip the inline implementation
if (line.tqfind("{") > -1):
function = line[:line.tqfind("{")]
if function.tqfind("}") > -1:
function += line[line.tqfind("}") + 1:]
if (line.find("{") > -1):
function = line[:line.find("{")]
if function.find("}") > -1:
function += line[line.find("}") + 1:]
complete = 1
else:
i += 1
# search for the missing } on the next lines
while i < len(lines):
if (lines[i].tqfind("}") > -1):
function += lines[i][lines[i].tqfind("}") + 1:]
if (lines[i].find("}") > -1):
function += lines[i][lines[i].find("}") + 1:]
complete = 1
i += 1
else:


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

@@ -36,7 +36,7 @@ class KisExifInfo

bool getValue(TQString name, ExifValue& value)
{
if ( m_values.tqfind( name ) == m_values.end() ) {
if ( m_values.find( name ) == m_values.end() ) {
return false;
}
else {


+ 3
- 3
chalk/core/kis_filter_configuration.cc View File

@@ -109,7 +109,7 @@ TQ_INT32 KisFilterConfiguration::version() const

void KisFilterConfiguration::setProperty(const TQString & name, const TQVariant & value)
{
if ( m_properties.tqfind( name ) == m_properties.end() ) {
if ( m_properties.find( name ) == m_properties.end() ) {
m_properties.insert( name, value );
}
else {
@@ -119,7 +119,7 @@ void KisFilterConfiguration::setProperty(const TQString & name, const TQVariant

bool KisFilterConfiguration::getProperty(const TQString & name, TQVariant & value)
{
if ( m_properties.tqfind( name ) == m_properties.end() ) {
if ( m_properties.find( name ) == m_properties.end() ) {
return false;
}
else {
@@ -130,7 +130,7 @@ bool KisFilterConfiguration::getProperty(const TQString & name, TQVariant & valu

TQVariant KisFilterConfiguration::getProperty(const TQString & name)
{
if ( m_properties.tqfind( name ) == m_properties.end() ) {
if ( m_properties.find( name ) == m_properties.end() ) {
return TQVariant();
}
else {


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

@@ -163,7 +163,7 @@ void KisGroupLayer::setIndex(KisLayerSP layer, int index)
bool KisGroupLayer::addLayer(KisLayerSP newLayer, int x)
{
if (x < 0 || kClamp(uint(x), uint(0), childCount()) != uint(x) ||
newLayer->tqparent() || m_layers.tqcontains(newLayer))
newLayer->tqparent() || m_layers.contains(newLayer))
{
kdWarning() << "invalid input to KisGroupLayer::addLayer(KisLayerSP newLayer, int x)!" << endl;
return false;


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

@@ -228,8 +228,8 @@ bool KisImagePipeBrush::init()
}

TQString paramline = TQString::fromUtf8((&line2[0]), line2.size());
TQ_UINT32 m_numOfBrushes = paramline.left(paramline.tqfind(' ')).toUInt();
m_parasite = paramline.mid(paramline.tqfind(' ') + 1);
TQ_UINT32 m_numOfBrushes = paramline.left(paramline.find(' ')).toUInt();
m_parasite = paramline.mid(paramline.find(' ') + 1);
i++; // Skip past the second newline

TQ_UINT32 numOfBrushes = 0;


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

@@ -311,7 +311,7 @@ void KisLayer::setClean(const TQRect & rect)

// XXX: We should only set the parts clean that were actually cleaned. However, extent and exactBounds conspire
// to make that very hard atm.
//if (rect.tqcontains(m_dirtyRect)) m_dirtyRect = TQRect();
//if (rect.contains(m_dirtyRect)) m_dirtyRect = TQRect();
m_dirtyRect = TQRect();
}



+ 2
- 2
chalk/core/kis_paint_device.h View File

@@ -137,12 +137,12 @@ public:
/**
* Returns true of x,y is within the extent of this paint device
*/
bool tqcontains(TQ_INT32 x, TQ_INT32 y) const;
bool contains(TQ_INT32 x, TQ_INT32 y) const;

/**
* Convenience method for the above
*/
bool tqcontains(const TQPoint& pt) const;
bool contains(const TQPoint& pt) const;

/**
* Retrieve the bounds of the paint device. The size is not exact,


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

@@ -238,7 +238,7 @@ bool KisPalette::init()
}
else if (!lines[i].isEmpty())
{
TQStringList a = TQStringList::split(" ", lines[i].tqreplace(TQChar('\t'), " "));
TQStringList a = TQStringList::split(" ", lines[i].replace(TQChar('\t'), " "));

if (a.count() < 3)
{


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

@@ -277,7 +277,7 @@ bool KisPattern::init()

KisPaintDeviceSP KisPattern::image(KisColorSpace * colorSpace) {
// Check if there's already a pattern prepared for this colorspace
TQMap<TQString, KisPaintDeviceSP>::const_iterator it = m_colorspaces.tqfind(colorSpace->id().id());
TQMap<TQString, KisPaintDeviceSP>::const_iterator it = m_colorspaces.find(colorSpace->id().id());
if (it != m_colorspaces.end())
return (*it);



+ 2
- 2
chalk/core/kis_perspective_grid.cpp View File

@@ -27,7 +27,7 @@ KisSubPerspectiveGrid::KisSubPerspectiveGrid(KisPerspectiveGridNodeSP topLeft, K
}

bool KisSubPerspectiveGrid::tqcontains(const KisPoint p) const
bool KisSubPerspectiveGrid::contains(const KisPoint p) const
{
return true;
KisPerspectiveMath::LineEquation d1 = KisPerspectiveMath::computeLineEquation( topLeft(), topRight() );
@@ -90,7 +90,7 @@ KisSubPerspectiveGrid* KisPerspectiveGrid::gridAt(KisPoint p)
{
for( TQValueList<KisSubPerspectiveGrid*>::const_iterator it = begin(); it != end(); ++it)
{
if( (*it)->tqcontains(p) )
if( (*it)->contains(p) )
{
return *it;
}


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

@@ -67,7 +67,7 @@ class KisSubPerspectiveGrid {
/**
* @return true if the point p is contain by the grid
*/
bool tqcontains(const KisPoint p) const;
bool contains(const KisPoint p) const;
private:
inline KisPoint computeVanishingPoint(KisPerspectiveGridNodeSP p11, KisPerspectiveGridNodeSP p12, KisPerspectiveGridNodeSP p21, KisPerspectiveGridNodeSP p22)
{


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

@@ -204,9 +204,9 @@ void KisSelection::startCachingExactRect()
void KisSelection::paintUniformSelectionRegion(TQImage img, const TQRect& imageRect, const TQRegion& uniformRegion)
{
Q_ASSERT(img.size() == imageRect.size());
Q_ASSERT(imageRect.tqcontains(uniformRegion.boundingRect()));
Q_ASSERT(imageRect.contains(uniformRegion.boundingRect()));

if (img.isNull() || img.size() != imageRect.size() || !imageRect.tqcontains(uniformRegion.boundingRect())) {
if (img.isNull() || img.size() != imageRect.size() || !imageRect.contains(uniformRegion.boundingRect())) {
return;
}



+ 3
- 3
chalk/core/kis_thread_pool.cc View File

@@ -115,18 +115,18 @@ void KisThreadPool::dequeue(KisThread * thread)

m_poolMutex.lock();

int i = m_threads.tqfindRef(thread);
int i = m_threads.findRef(thread);
if (i >= 0) {
t = m_threads.take(i);
m_numberOfQueuedThreads--;
} else {
i = m_runningThreads.tqfindRef(thread);
i = m_runningThreads.findRef(thread);
if (i >= 0) {
t = m_runningThreads.take(i);
m_numberOfRunningThreads--;
}
else {
i = m_oldThreads.tqfindRef(thread);
i = m_oldThreads.findRef(thread);
if (i >= 0) {
t = m_oldThreads.take(i);
}


+ 1
- 1
chalk/core/tiles/kis_tile.h View File

@@ -25,7 +25,7 @@ class KisTiledDataManager;
class KisTiledIterator;

/**
* Provides abstraction to a tile. A tile tqcontains
* Provides abstraction to a tile. A tile contains
* a part of a PaintDevice, but only the individual pixels
* are accesable and that only via iterators.
*/


+ 3
- 3
chalk/core/tiles/kis_tileddatamanager.cc View File

@@ -245,7 +245,7 @@ void KisTiledDataManager::setExtent(TQ_INT32 x, TQ_INT32 y, TQ_INT32 w, TQ_INT32
//printRect("oldRect", oldRect);

// Do nothing if the desired size is bigger than we currently are: that is handled by the autoextending automatically
if (newRect.tqcontains(oldRect)) return;
if (newRect.contains(oldRect)) return;

// Loop through all tiles, if a tile is wholly outside the extent, add to the memento, then delete it,
// if the tile is partially outside the extent, clear the outside pixels to the default pixel.
@@ -259,7 +259,7 @@ void KisTiledDataManager::setExtent(TQ_INT32 x, TQ_INT32 y, TQ_INT32 w, TQ_INT32
TQRect tileRect = TQRect(tile->getCol() * KisTile::WIDTH, tile->getRow() * KisTile::HEIGHT, KisTile::WIDTH, KisTile::HEIGHT);
//printRect("tileRect", tileRect);

if (newRect.tqcontains(tileRect)) {
if (newRect.contains(tileRect)) {
// Completely inside, do nothing
previousTile = tile;
tile = tile->getNext();
@@ -279,7 +279,7 @@ void KisTiledDataManager::setExtent(TQ_INT32 x, TQ_INT32 y, TQ_INT32 w, TQ_INT32
tile->addReader();
for (int y = 0; y < KisTile::HEIGHT; ++y) {
for (int x = 0; x < KisTile::WIDTH; ++x) {
if (!intersection.tqcontains(x,y)) {
if (!intersection.contains(x,y)) {
TQ_UINT8 * ptr = tile->data(x, y);
memcpy(ptr, m_defPixel, m_pixelSize);
}


+ 2
- 2
chalk/core/tiles/kis_tilemanager.cc View File

@@ -157,11 +157,11 @@ void KisTileManager::deregisterTile(KisTile* tile) {

m_swapMutex->lock();

if (!m_tileMap.tqcontains(tile)) {
if (!m_tileMap.contains(tile)) {
m_swapMutex->unlock();
return;
}
// Q_ASSERT(m_tileMap.tqcontains(tile));
// Q_ASSERT(m_tileMap.contains(tile));

TileInfo* info = m_tileMap[tile];



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

@@ -6,7 +6,7 @@ sources:

* The old Chalk brush code (http://webcvs.kde.org/cgi-bin/cvsweb.cgi/koffice/chalk/tools/kis_tool_brush.cc?rev=1.58&content-type=text/x-cvsweb-markup)
* Peter Jodda's Perico (http://software.jodda.de/perico.html)
* The source of the Gimp (both current and 0.99.11 -- the oldest version I could tqfind) (http://www.gimp.org)
* The source of the Gimp (both current and 0.99.11 -- the oldest version I could find) (http://www.gimp.org)
* David Hodson's article on Gimp brushes (http://members.ozemail.com.au/~hodsond/gimpbrush.html)
* Raph Levien's article on Gimp brushes (http://www.levien.com/gimp/brush-arch.html)



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

@@ -342,7 +342,7 @@ data to rbg for screen rendering." visibility="public" xmi.id="259" name="CMYK"
<UML:Operation visibility="public" xmi.id="271" type="virtual KisStrategyColorSpaceSP" name="create" >
<UML:Parameter visibility="private" xmi.id="272" value="" type="enumImgType" name="imgType" />
</UML:Operation>
<UML:Operation visibility="protected" xmi.id="273" type="KisStrategyColorSpaceSP" name="tqfind" >
<UML:Operation visibility="protected" xmi.id="273" type="KisStrategyColorSpaceSP" name="find" >
<UML:Parameter visibility="private" xmi.id="274" value="" type="enumImgType" name="imgType" />
</UML:Operation>
<UML:Operation visibility="public" xmi.id="275" type="virtual " name="~KisColorSpaceFactoryFlyweight" />
@@ -650,7 +650,7 @@ of tile in x and y." visibility="public" xmi.id="408" type="void" name="tileCoor
</UML:Operation>
<UML:Operation visibility="public" xmi.id="480" type="virtual " name="~KisTileCacheInterface" />
</UML:Class>
<UML:Class stereotype="class" comment="Provides abstraction to a tile. A tile tqcontains
<UML:Class stereotype="class" comment="Provides abstraction to a tile. A tile contains
a part of a layer. Layers form an image." visibility="public" xmi.id="481" name="KisTile" >
<UML:Operation visibility="protected" xmi.id="496" type="KisTile &amp;" name="=" >
<UML:Parameter visibility="private" xmi.id="497" value="" type="const KisTile &amp;" />
@@ -1059,7 +1059,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
<UML:Parameter visibility="private" xmi.id="810" value="" type="Q_INT32" name="yOffset" />
<UML:Parameter visibility="private" xmi.id="811" value="" type="double" name="zoom" />
</UML:Operation>
<UML:Operation visibility="public" xmi.id="812" type="KisGuideSP" name="tqfind" >
<UML:Operation visibility="public" xmi.id="812" type="KisGuideSP" name="find" >
<UML:Parameter visibility="private" xmi.id="813" value="" type="double" name="x" />
<UML:Parameter visibility="private" xmi.id="814" value="" type="double" name="y" />
<UML:Parameter visibility="private" xmi.id="815" value="" type="double" name="d" />
@@ -1208,7 +1208,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
<UML:Operation visibility="public" xmi.id="929" type="virtual bool" name="completeSaving" >
<UML:Parameter visibility="private" xmi.id="930" value="" type="KoStore *" />
</UML:Operation>
<UML:Operation visibility="public" xmi.id="931" type="bool" name="tqcontains" >
<UML:Operation visibility="public" xmi.id="931" type="bool" name="contains" >
<UML:Parameter visibility="private" xmi.id="932" value="" type="KisImageSP" name="img" />
</UML:Operation>
<UML:Operation visibility="protected" xmi.id="933" type="virtual KoView *" name="createViewInstance" >
@@ -1906,11 +1906,11 @@ cannot be abstract, because otherwise this class would be abstract." visibility=
<UML:Parameter visibility="private" xmi.id="1511" value="" type="const QString &amp;" name="name" />
<UML:Parameter visibility="private" xmi.id="1512" value="" type="CompositeOp" name="compositeOp" />
</UML:Operation>
<UML:Operation visibility="public" xmi.id="1513" type="bool" name="tqcontains" >
<UML:Operation visibility="public" xmi.id="1513" type="bool" name="contains" >
<UML:Parameter visibility="private" xmi.id="1514" value="" type="Q_INT32" name="x" />
<UML:Parameter visibility="private" xmi.id="1515" value="" type="Q_INT32" name="y" />
</UML:Operation>
<UML:Operation visibility="public" xmi.id="1516" type="bool" name="tqcontains" >
<UML:Operation visibility="public" xmi.id="1516" type="bool" name="contains" >
<UML:Parameter visibility="private" xmi.id="1517" value="" type="const QPoint &amp;" name="pt" />
</UML:Operation>
<UML:Operation visibility="public" xmi.id="1518" type="virtual const KisTileMgrSP" name="data" />
@@ -3629,7 +3629,7 @@ in the constructor, you have to call loadAsync.
<listitem open="0" type="815" id="268" label="KisColorSpaceFactoryFlyweight" />
<listitem open="0" type="815" id="269" label="create" />
<listitem open="0" type="815" id="271" label="create" />
<listitem open="0" type="815" id="273" label="tqfind" />
<listitem open="0" type="815" id="273" label="find" />
<listitem open="0" type="815" id="275" label="~KisColorSpaceFactoryFlyweight" />
</listitem>
<listitem open="0" type="813" id="193" label="KisColorSpaceFactoryInterface" >
@@ -3714,7 +3714,7 @@ in the constructor, you have to call loadAsync.
<listitem open="0" type="815" id="926" label="clipboardSelection" />
<listitem open="0" type="815" id="927" label="completeLoading" />
<listitem open="0" type="815" id="929" label="completeSaving" />
<listitem open="0" type="815" id="931" label="tqcontains" />
<listitem open="0" type="815" id="931" label="contains" />
<listitem open="0" type="815" id="933" label="createViewInstance" />
<listitem open="0" type="815" id="936" label="dcopObject" />
<listitem open="0" type="815" id="937" label="empty" />
@@ -3838,7 +3838,7 @@ in the constructor, you have to call loadAsync.
<listitem open="0" type="815" id="802" label="KisGuideMgr" />
<listitem open="0" type="815" id="803" label="add" />
<listitem open="0" type="815" id="806" label="erase" />
<listitem open="0" type="815" id="812" label="tqfind" />
<listitem open="0" type="815" id="812" label="find" />
<listitem open="0" type="815" id="816" label="findHorizontal" />
<listitem open="0" type="815" id="819" label="findVertical" />
<listitem open="0" type="815" id="822" label="hasSelected" />
@@ -4116,8 +4116,8 @@ in the constructor, you have to call loadAsync.
<listitem open="0" type="815" id="1504" label="colorAt" />
<listitem open="0" type="815" id="1505" label="compositeOp" />
<listitem open="0" type="815" id="1506" label="configure" />
<listitem open="0" type="815" id="1513" label="tqcontains" />
<listitem open="0" type="815" id="1516" label="tqcontains" />
<listitem open="0" type="815" id="1513" label="contains" />
<listitem open="0" type="815" id="1516" label="contains" />
<listitem open="0" type="815" id="1519" label="data" />
<listitem open="0" type="815" id="1518" label="data" />
<listitem open="0" type="815" id="1524" label="expand" />
@@ -29680,7 +29680,7 @@ in the constructor, you have to call loadAsync.
</codeblockwithcomments>
<cppheaderclassdeclarationblock parent_id="481" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
<header>
<cppcodecomment tag="" text="Class KisTile&amp;#010;Provides abstraction to a tile. A tile tqcontains&amp;#010;a part of a layer. Layers form an image." />
<cppcodecomment tag="" text="Class KisTile&amp;#010;Provides abstraction to a tile. A tile contains&amp;#010;a part of a layer. Layers form an image." />
</header>
<textblocks>
<hierarchicalcodeblock tag="publicBlock" canDelete="false" >


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

@@ -933,14 +933,14 @@ below this layer, remove the specified layer." isSpecification="false" isLeaf="f
<UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1469" isRoot="false" value="" type="558" isAbstract="false" name="v" />
</UML:BehavioralFeature.parameter>
</UML:Operation>
<UML:Operation isSpecification="false" isLeaf="false" visibility="public" xmi.id="1470" isRoot="false" isAbstract="false" name="tqcontains" >
<UML:Operation isSpecification="false" isLeaf="false" visibility="public" xmi.id="1470" isRoot="false" isAbstract="false" name="contains" >
<UML:BehavioralFeature.parameter>
<UML:Parameter kind="return" xmi.id="5372" type="558" />
<UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1471" isRoot="false" value="" type="463" isAbstract="false" name="x" />
<UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1472" isRoot="false" value="" type="463" isAbstract="false" name="y" />
</UML:BehavioralFeature.parameter>
</UML:Operation>
<UML:Operation isSpecification="false" isLeaf="false" visibility="public" xmi.id="1473" isRoot="false" isAbstract="false" name="tqcontains" >
<UML:Operation isSpecification="false" isLeaf="false" visibility="public" xmi.id="1473" isRoot="false" isAbstract="false" name="contains" >
<UML:BehavioralFeature.parameter>
<UML:Parameter kind="return" xmi.id="5373" type="558" />
<UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1474" isRoot="false" value="" type="498" isAbstract="false" name="pt" />
@@ -2243,7 +2243,7 @@ and the clipboard." isSpecification="false" isLeaf="false" visibility="public" x
<UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="700" isRoot="false" value="" type="430" isAbstract="false" name="gd" />
</UML:BehavioralFeature.parameter>
</UML:Operation>
<UML:Operation isSpecification="false" isLeaf="false" visibility="public" xmi.id="701" isRoot="false" isAbstract="false" name="tqfind" >
<UML:Operation isSpecification="false" isLeaf="false" visibility="public" xmi.id="701" isRoot="false" isAbstract="false" name="find" >
<UML:BehavioralFeature.parameter>
<UML:Parameter kind="return" xmi.id="5458" type="430" />
<UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="702" isRoot="false" value="" type="7" isAbstract="false" name="x" />


+ 3
- 3
chalk/doc/histograms.xmi View File

@@ -1208,14 +1208,14 @@ there is no guarantee that the iterator will work scanline by scanline." isSpeci
<UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1187" isRoot="false" value="" type="5" isAbstract="false" name="visible" />
</UML:BehavioralFeature.parameter>
</UML:Operation>
<UML:Operation isSpecification="false" isLeaf="false" visibility="public" xmi.id="1188" isRoot="false" isAbstract="false" name="tqcontains" >
<UML:Operation isSpecification="false" isLeaf="false" visibility="public" xmi.id="1188" isRoot="false" isAbstract="false" name="contains" >
<UML:BehavioralFeature.parameter>
<UML:Parameter kind="return" xmi.id="17100" type="5" />
<UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1189" isRoot="false" value="" type="43" isAbstract="false" name="x" />
<UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1190" isRoot="false" value="" type="43" isAbstract="false" name="y" />
</UML:BehavioralFeature.parameter>
</UML:Operation>
<UML:Operation isSpecification="false" isLeaf="false" visibility="public" xmi.id="1191" isRoot="false" isAbstract="false" name="tqcontains" >
<UML:Operation isSpecification="false" isLeaf="false" visibility="public" xmi.id="1191" isRoot="false" isAbstract="false" name="contains" >
<UML:BehavioralFeature.parameter>
<UML:Parameter kind="return" xmi.id="17101" type="5" />
<UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1192" isRoot="false" value="" type="1176" isAbstract="false" name="pt" />
@@ -2699,7 +2699,7 @@ Doubles are in the 0-1 range, use the producer's positionToString function to di
<UML:EnumerationLiteral isSpecification="false" isLeaf="false" visibility="public" xmi.id="486" isRoot="false" isAbstract="false" name="LOGARITHMIC" />
</UML:Enumeration>
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="497" isRoot="false" isAbstract="false" name="Q_UINT32" />
<UML:Class comment="Provides abstraction to a tile. A tile tqcontains
<UML:Class comment="Provides abstraction to a tile. A tile contains
a part of a PaintDevice, but only the individual pixels
are accesable and that only via iterators." isSpecification="false" isLeaf="false" visibility="public" xmi.id="558" isRoot="false" isAbstract="false" name="KisTile" >
<UML:Classifier.feature>


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

@@ -5144,7 +5144,7 @@ namespace cimg_library {
\par Image structure

The \ref CImg<\c T> structure tqcontains \a five fields :
The \ref CImg<\c T> structure contains \a five fields :
- \ref width defines the number of \a columns of the image (size along the X-axis).
- \ref height defines the number of \a rows of the image (size along the Y-axis).
- \ref depth defines the number of \a slices of the image (size along the Z-axis).


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

@@ -87,7 +87,7 @@ void KisBrightnessContrastFilterConfiguration::fromXML( const TQString& s )
curve.clear(); // XXX TQPtrList, sure I won't leak stuff here?
for (TQStringList::Iterator it = pairStart; it != pairEnd; ++it) {
TQString pair = * it;
if (pair.tqfind(",") > -1) {
if (pair.find(",") > -1) {
TQPair<double,double> *p = new TQPair<double,double>;
p->first = pair.section(",", 0, 0).toDouble();
p->second = pair.section(",", 1, 1).toDouble();


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

@@ -86,7 +86,7 @@ curvesElement.text() );
TQStringList::Iterator pairEnd = data.end();
for (TQStringList::Iterator it = pairStart; it != pairEnd; ++it) {
TQString pair = * it;
if (pair.tqfind(",") > -1) {
if (pair.find(",") > -1) {
TQPair<double,double> *p = new TQPair<double,double>;
p->first = pair.section(",", 0, 0).toDouble();
p->second = pair.section(",", 1, 1).toDouble();


+ 1
- 1
chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc View File

@@ -159,7 +159,7 @@ uint KisOilPaintFilter::MostFrequentColor (KisPaintDeviceSP src, const TQRect& b

while (!it.isDone()) {

if (bounds.tqcontains(it.x(), it.y())) {
if (bounds.contains(it.x(), it.y())) {

// XXX: COLORSPACE_INDEPENDENCE



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

@@ -104,7 +104,7 @@ void KisToolColorPicker::buttonPress(KisButtonPressEvent *e)

TQPoint pos = TQPoint(e->pos().floorX(), e->pos().floorY());

if (!img->bounds().tqcontains(pos)) {
if (!img->bounds().contains(pos)) {
return;
}



+ 1
- 1
chalk/plugins/tools/defaulttools/kis_tool_fill.cc View File

@@ -151,7 +151,7 @@ void KisToolFill::buttonRelease(KisButtonReleaseEvent *e)
int x, y;
x = m_startPos.floorX();
y = m_startPos.floorY();
if (!m_currentImage->bounds().tqcontains(x, y)) {
if (!m_currentImage->bounds().contains(x, y)) {
return;
}
flood(x, y);


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

@@ -818,7 +818,7 @@ TQ_INT32 KisToolCrop::mouseOnHandle(TQPoint currentViewPoint)
endy=start.y();
}

if ( toTQRect ( startx - m_handleSize / 2.0, starty - m_handleSize / 2.0, m_handleSize, m_handleSize ).tqcontains( currentViewPoint ) )
if ( toTQRect ( startx - m_handleSize / 2.0, starty - m_handleSize / 2.0, m_handleSize, m_handleSize ).contains( currentViewPoint ) )
{
if( !m_selecting )
{
@@ -827,7 +827,7 @@ TQ_INT32 KisToolCrop::mouseOnHandle(TQPoint currentViewPoint)
}
return UpperLeft;
}
else if ( toTQRect ( startx - m_handleSize / 2.0, endy - m_handleSize / 2.0, m_handleSize, m_handleSize ).tqcontains( currentViewPoint ) )
else if ( toTQRect ( startx - m_handleSize / 2.0, endy - m_handleSize / 2.0, m_handleSize, m_handleSize ).contains( currentViewPoint ) )
{
if( !m_selecting )
{
@@ -836,7 +836,7 @@ TQ_INT32 KisToolCrop::mouseOnHandle(TQPoint currentViewPoint)
}
return LowerLeft;
}
else if ( toTQRect ( endx - m_handleSize / 2.0, starty - m_handleSize / 2.0, m_handleSize, m_handleSize ).tqcontains( currentViewPoint ) )
else if ( toTQRect ( endx - m_handleSize / 2.0, starty - m_handleSize / 2.0, m_handleSize, m_handleSize ).contains( currentViewPoint ) )
{
if( !m_selecting )
{
@@ -845,7 +845,7 @@ TQ_INT32 KisToolCrop::mouseOnHandle(TQPoint currentViewPoint)
}
return UpperRight;
}
else if ( toTQRect ( endx - m_handleSize / 2.0, endy - m_handleSize / 2.0, m_handleSize, m_handleSize ).tqcontains( currentViewPoint ) )
else if ( toTQRect ( endx - m_handleSize / 2.0, endy - m_handleSize / 2.0, m_handleSize, m_handleSize ).contains( currentViewPoint ) )
{
if( !m_selecting )
{
@@ -854,7 +854,7 @@ TQ_INT32 KisToolCrop::mouseOnHandle(TQPoint currentViewPoint)
}
return LowerRight;
}
else if ( toTQRect ( startx + ( endx - startx - m_handleSize ) / 2.0, starty - m_handleSize / 2.0, m_handleSize, m_handleSize ).tqcontains( currentViewPoint ) )
else if ( toTQRect ( startx + ( endx - startx - m_handleSize ) / 2.0, starty - m_handleSize / 2.0, m_handleSize, m_handleSize ).contains( currentViewPoint ) )
{
if( !m_selecting )
{
@@ -862,7 +862,7 @@ TQ_INT32 KisToolCrop::mouseOnHandle(TQPoint currentViewPoint)
}
return Upper;
}
else if ( toTQRect ( startx + ( endx - startx - m_handleSize ) / 2.0, endy - m_handleSize / 2, m_handleSize, m_handleSize ).tqcontains( currentViewPoint ) )
else if ( toTQRect ( startx + ( endx - startx - m_handleSize ) / 2.0, endy - m_handleSize / 2, m_handleSize, m_handleSize ).contains( currentViewPoint ) )
{
if( !m_selecting )
{
@@ -870,7 +870,7 @@ TQ_INT32 KisToolCrop::mouseOnHandle(TQPoint currentViewPoint)
}
return Lower;
}
else if ( toTQRect ( startx - m_handleSize / 2.0, starty + ( endy - starty - m_handleSize ) / 2.0, m_handleSize, m_handleSize ).tqcontains( currentViewPoint ) )
else if ( toTQRect ( startx - m_handleSize / 2.0, starty + ( endy - starty - m_handleSize ) / 2.0, m_handleSize, m_handleSize ).contains( currentViewPoint ) )
{
if( !m_selecting )
{
@@ -878,7 +878,7 @@ TQ_INT32 KisToolCrop::mouseOnHandle(TQPoint currentViewPoint)
}
return Left;
}
else if ( toTQRect ( endx - m_handleSize / 2.0 , starty + ( endy - starty - m_handleSize ) / 2.0, m_handleSize, m_handleSize ).tqcontains( currentViewPoint ) )
else if ( toTQRect ( endx - m_handleSize / 2.0 , starty + ( endy - starty - m_handleSize ) / 2.0, m_handleSize, m_handleSize ).contains( currentViewPoint ) )
{
if( !m_selecting )
{
@@ -886,7 +886,7 @@ TQ_INT32 KisToolCrop::mouseOnHandle(TQPoint currentViewPoint)
}
return Right;
}
else if ( toTQRect ( startx , starty, endx - startx , endy - starty ).tqcontains( currentViewPoint ) )
else if ( toTQRect ( startx , starty, endx - startx , endy - starty ).contains( currentViewPoint ) )
{
return Inside;
}


+ 10
- 10
chalk/plugins/tools/tool_curves/kis_curve_framework.cc View File

@@ -79,12 +79,12 @@ KisCurve KisCurve::selectedPivots(bool selected)

KisCurve KisCurve::subCurve(const KisPoint& tend)
{
return subCurve(tqfind(tend).previousPivot(),tqfind(tend));
return subCurve(find(tend).previousPivot(),find(tend));
}

KisCurve KisCurve::subCurve(const CurvePoint& tend)
{
return subCurve(tqfind(tend).previousPivot(),tqfind(tend));
return subCurve(find(tend).previousPivot(),find(tend));
}

KisCurve KisCurve::subCurve(iterator tend)
@@ -94,12 +94,12 @@ KisCurve KisCurve::subCurve(iterator tend)

KisCurve KisCurve::subCurve(const KisPoint& tstart, const KisPoint& tend)
{
return subCurve(tqfind(tstart),tqfind(tend));
return subCurve(find(tstart),find(tend));
}

KisCurve KisCurve::subCurve(const CurvePoint& tstart, const CurvePoint& tend)
{
return subCurve(tqfind(tstart),tqfind(tend));
return subCurve(find(tstart),find(tend));
}

KisCurve KisCurve::subCurve(iterator tstart, iterator tend)
@@ -137,7 +137,7 @@ KisCurve::iterator KisCurve::deleteCurve (const KisPoint& pos1, const KisPoint&

KisCurve::iterator KisCurve::deleteCurve (const CurvePoint& pos1, const CurvePoint& pos2)
{
return deleteCurve (tqfind(pos1),tqfind(pos2));
return deleteCurve (find(pos1),find(pos2));
}

KisCurve::iterator KisCurve::deleteCurve (KisCurve::iterator pos1, KisCurve::iterator pos2)
@@ -154,12 +154,12 @@ KisCurve::iterator KisCurve::deleteCurve (KisCurve::iterator pos1, KisCurve::ite

KisCurve::iterator KisCurve::selectPivot(const KisPoint& pt, bool isSelected)
{
return selectPivot(tqfind(CurvePoint(pt,true)),isSelected);
return selectPivot(find(CurvePoint(pt,true)),isSelected);
}

KisCurve::iterator KisCurve::selectPivot(const CurvePoint& pt, bool isSelected)
{
return selectPivot(tqfind(pt),isSelected);
return selectPivot(find(pt),isSelected);
}

KisCurve::iterator KisCurve::selectPivot(KisCurve::iterator it, bool isSelected)
@@ -171,7 +171,7 @@ KisCurve::iterator KisCurve::selectPivot(KisCurve::iterator it, bool isSelected)
}
KisCurve selected = pivots();
for (iterator i = selected.begin(); i != selected.end(); i++)
(*tqfind((*i))).setSelected(sel);
(*find((*i))).setSelected(sel);
(*it).setSelected(isSelected);

return it;
@@ -184,7 +184,7 @@ KisCurve::iterator KisCurve::movePivot(const KisPoint& oldPt, const KisPoint& ne

KisCurve::iterator KisCurve::movePivot(const CurvePoint& oldPt, const KisPoint& newPt)
{
return movePivot(tqfind(oldPt), newPt);
return movePivot(find(oldPt), newPt);
}

KisCurve::iterator KisCurve::movePivot(KisCurve::iterator it, const KisPoint& newPt)
@@ -213,7 +213,7 @@ void KisCurve::deletePivot (const KisPoint& pt)

void KisCurve::deletePivot (const CurvePoint& pt)
{
deletePivot(tqfind(pt));
deletePivot(find(pt));
}

void KisCurve::deletePivot (KisCurve::iterator it)


+ 14
- 14
chalk/plugins/tools/tool_curves/kis_curve_framework.h View File

@@ -130,10 +130,10 @@ public:
iterator begin() const;
iterator lastIterator() const;
iterator end() const;
iterator tqfind(const CurvePoint& pt);
iterator tqfind(const KisPoint& pt);
iterator tqfind(iterator it, const CurvePoint& pt);
iterator tqfind(iterator it, const KisPoint& pt);
iterator find(const CurvePoint& pt);
iterator find(const KisPoint& pt);
iterator find(iterator it, const CurvePoint& pt);
iterator find(iterator it, const KisPoint& pt);
KisCurve pivots();
KisCurve selectedPivots(bool = true);
@@ -312,34 +312,34 @@ inline KisCurve::iterator KisCurve::end() const
return iterator(*this,m_curve.end());
}

inline KisCurve::iterator KisCurve::tqfind (const CurvePoint& pt)
inline KisCurve::iterator KisCurve::find (const CurvePoint& pt)
{
return iterator(*this,m_curve.tqfind(pt));
return iterator(*this,m_curve.find(pt));
}

inline KisCurve::iterator KisCurve::tqfind (const KisPoint& pt)
inline KisCurve::iterator KisCurve::find (const KisPoint& pt)
{
return iterator(*this,m_curve.tqfind(CurvePoint(pt)));
return iterator(*this,m_curve.find(CurvePoint(pt)));
}

inline KisCurve::iterator KisCurve::tqfind (KisCurve::iterator it, const CurvePoint& pt)
inline KisCurve::iterator KisCurve::find (KisCurve::iterator it, const CurvePoint& pt)
{
return iterator(*this,m_curve.tqfind(it.position(),pt));
return iterator(*this,m_curve.find(it.position(),pt));
}

inline KisCurve::iterator KisCurve::tqfind (iterator it, const KisPoint& pt)
inline KisCurve::iterator KisCurve::find (iterator it, const KisPoint& pt)
{
return iterator(*this,m_curve.tqfind(it.position(),CurvePoint(pt)));
return iterator(*this,m_curve.find(it.position(),CurvePoint(pt)));
}

inline void KisCurve::calculateCurve(const KisPoint& start, const KisPoint& end, KisCurve::iterator it)
{
calculateCurve(tqfind(CurvePoint(start)),tqfind(CurvePoint(end)),it);
calculateCurve(find(CurvePoint(start)),find(CurvePoint(end)),it);
}

inline void KisCurve::calculateCurve(const CurvePoint& start, const CurvePoint& end, KisCurve::iterator it)
{
calculateCurve(tqfind(start),tqfind(end),it);
calculateCurve(find(start),find(end),it);
}

inline void KisCurve::calculateCurve(KisCurve::iterator, KisCurve::iterator, KisCurve::iterator)


+ 2
- 2
chalk/plugins/tools/tool_curves/kis_tool_bezier.cc View File

@@ -289,7 +289,7 @@ KisCurve::iterator KisToolBezier::handleUnderMouse(const TQPoint& pos)
continue;
if (hint == BEZIERENDHINT && (m_actionOptions & SHIFTOPTION))
continue;
if (pivotRect(qpos).tqcontains(pos)) {
if (pivotRect(qpos).contains(pos)) {
inHandle.pushPoint((*it));
if (hint == BEZIERENDHINT && !(m_actionOptions & SHIFTOPTION))
break;
@@ -300,7 +300,7 @@ KisCurve::iterator KisToolBezier::handleUnderMouse(const TQPoint& pos)
if (inHandle.isEmpty())
return m_curve->end();

return m_curve->tqfind(inHandle.last());
return m_curve->find(inHandle.last());
}

KisCurve::iterator KisToolBezier::drawPoint (KisCanvasPainter& gc, KisCurve::iterator point)


+ 6
- 6
chalk/plugins/tools/tool_curves/kis_tool_curve.cc View File

@@ -124,7 +124,7 @@ void KisToolCurve::buttonPress(KisButtonPressEvent *event)
m_curve->selectAll(false);
draw(true, true);
draw(m_curve->end());
m_previous = m_curve->tqfind(m_curve->last());
m_previous = m_curve->find(m_curve->last());
m_current = m_curve->pushPivot(event->pos());
if (m_curve->pivots().count() > 1)
m_curve->calculateCurve(m_previous,m_current,m_current);
@@ -158,7 +158,7 @@ void KisToolCurve::keyPress(TQKeyEvent *event)
draw(false);
m_dragging = false;
m_curve->deleteSelected();
m_current = m_curve->tqfind(m_curve->last());
m_current = m_curve->find(m_curve->last());
m_previous = m_curve->selectPivot(m_current);
draw(false);
}
@@ -250,12 +250,12 @@ KisCurve::iterator KisToolCurve::handleUnderMouse(const TQPoint& pos)
KisCurve pivs = m_curve->pivots(), inHandle;
KisCurve::iterator it;
for (it = pivs.begin(); it != pivs.end(); it++) {
if (pivotRect(m_subject->canvasController()->windowToView((*it).point().toTQPoint())).tqcontains(pos))
if (pivotRect(m_subject->canvasController()->windowToView((*it).point().toTQPoint())).contains(pos))
inHandle.pushPoint((*it));
}
if (inHandle.isEmpty())
return m_curve->end();
return m_curve->tqfind(inHandle.last());
return m_curve->find(inHandle.last());
}

KisCurve::iterator KisToolCurve::selectByMouse(KisCurve::iterator it)
@@ -344,8 +344,8 @@ void KisToolCurve::draw(KisCurve::iterator inf, bool pivotonly, bool minimal)
return;
}
for (KisCurve::iterator i = sel.begin(); i != sel.end(); i++) {
it = m_curve->tqfind(*i).previousPivot();
finish = m_curve->tqfind(*i).nextPivot();
it = m_curve->find(*i).previousPivot();
finish = m_curve->find(*i).nextPivot();
if ((*finish).isSelected())
finish = finish.previousPivot();
while (it != finish) {


+ 1
- 1
chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc View File

@@ -97,7 +97,7 @@ void KisToolPerspectiveGrid::update (KisCanvasSubject *subject)

bool KisToolPerspectiveGrid::mouseNear(const TQPoint& mousep, const TQPoint point)
{
return (TQRect( (point.x() - m_handleHalfSize), (point.y() - m_handleHalfSize), m_handleSize, m_handleSize).tqcontains(mousep) );
return (TQRect( (point.x() - m_handleHalfSize), (point.y() - m_handleHalfSize), m_handleSize, m_handleSize).contains(mousep) );
}

void KisToolPerspectiveGrid::buttonPress(KisButtonPressEvent *event)


+ 1
- 1
chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc View File

@@ -240,7 +240,7 @@ void KisToolPerspectiveTransform::paint(KisCanvasPainter& gc, const TQRect& rc)

bool KisToolPerspectiveTransform::mouseNear(const TQPoint& mousep, const TQPoint point)
{
return (TQRect( (point.x() - m_handleHalfSize), (point.y() - m_handleHalfSize), m_handleSize, m_handleSize).tqcontains(mousep) );
return (TQRect( (point.x() - m_handleHalfSize), (point.y() - m_handleHalfSize), m_handleSize, m_handleSize).contains(mousep) );
}

void KisToolPerspectiveTransform::buttonPress(KisButtonPressEvent *event)


+ 1
- 1
chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cc View File

@@ -133,7 +133,7 @@ void KisDropshadow::dropshadow(KisProgressDisplayInterface * progress, TQ_INT32
{
TQRect shadowBounds = shadowDev->exactBounds();

if (!image->bounds().tqcontains(shadowBounds)) {
if (!image->bounds().contains(shadowBounds)) {

TQRect newImageSize = image->bounds() | shadowBounds;
image->resize(newImageSize.width(), newImageSize.height());


+ 1
- 1
chalk/plugins/viewplugins/screenshot/regiongrabber.cpp View File

@@ -60,7 +60,7 @@ void SizeTip::positionTip( const TQRect &rect )
TQRect deskR = KGlobalSettings::desktopGeometry( TQPoint( 0, 0 ) );

tipRect.moveCenter( TQPoint( deskR.width()/2, deskR.height()/2 ) );
if ( !rect.tqcontains( tipRect, true ) && rect.intersects( tipRect ) )
if ( !rect.contains( tipRect, true ) && rect.intersects( tipRect ) )
tipRect.moveBottomRight( tqgeometry().bottomRight() );
}



+ 1
- 1
chalk/sdk/kis_shared_ptr_vector.h View File

@@ -57,7 +57,7 @@ public:
return super::erase(first, last);
}

bool tqcontains(KSharedPtr<T> ptr) const
bool contains(KSharedPtr<T> ptr) const
{
for (int i = 0, n = super::count(); i < n; ++i)
if (super::at(i) == ptr)


+ 1
- 1
chalk/ui/kis_cmb_composite.cc View File

@@ -55,7 +55,7 @@ KisCompositeOp KisCmbComposite::currentItem() const

void KisCmbComposite::setCurrentItem(const KisCompositeOp& op)
{
if (m_list.tqfind(op) != m_list.end()) {
if (m_list.find(op) != m_list.end()) {
super::setCurrentText(op.id().name());
}
}


+ 1
- 1
chalk/ui/kis_cmb_idlist.cc View File

@@ -57,7 +57,7 @@ KisID KisCmbIDList::currentItem() const

void KisCmbIDList::setCurrent(const KisID id)
{
if (m_list.tqfind(id) != m_list.end())
if (m_list.find(id) != m_list.end())
super::setCurrentText(id.name());
else {
m_list.push_back(id);


+ 1
- 1
chalk/ui/kis_dlg_image_properties.cc View File

@@ -72,7 +72,7 @@ KisDlgImageProperties::KisDlgImageProperties(KisImageSP image, TQWidget *tqparen
//m_page->cmbColorSpaces->hide();
//m_page->lblColorSpaces->setText(image->colorSpace()->id().name());
KisIDList colorSpaces = KisMetaRegistry::instance()->csRegistry()->listKeys();
KisIDList::iterator i = colorSpaces.tqfind(KisID("WET",""));
KisIDList::iterator i = colorSpaces.find(KisID("WET",""));
if (i != colorSpaces.end()) {
colorSpaces.remove(i);
}


+ 1
- 1
chalk/ui/kis_dlg_preferences.cc View File

@@ -130,7 +130,7 @@ ColorSettingsTab::ColorSettingsTab(TQWidget *tqparent, const char *name )
refillMonitorProfiles(KisID("RGBA", ""));
refillPrintProfiles(KisID(cfg.printerColorSpace(), ""));

if(m_page->cmbMonitorProfile->tqcontains(cfg.monitorProfile()))
if(m_page->cmbMonitorProfile->contains(cfg.monitorProfile()))
m_page->cmbMonitorProfile->setCurrentText(cfg.monitorProfile());
if(m_page->cmbPrintProfile->contains(cfg.printerProfile()))
m_page->cmbPrintProfile->setCurrentText(cfg.printerProfile());


+ 12
- 12
chalk/ui/kis_filter_manager.cc View File

@@ -95,57 +95,57 @@ void KisFilterManager::setup(KActionCollection * ac)
if (!f) break;

TQString s = f->menuCategory();
if (s == "adjust" && !m_filterActionMenus.tqfind("adjust")) {
if (s == "adjust" && !m_filterActionMenus.find("adjust")) {
am = new KActionMenu(i18n("Adjust"), ac, "adjust_filters");
m_filterActionMenus.insert("adjust", am);
}

else if (s == "artistic" && !m_filterActionMenus.tqfind("artistic")) {
else if (s == "artistic" && !m_filterActionMenus.find("artistic")) {
am = new KActionMenu(i18n("Artistic"), ac, "artistic_filters");
m_filterActionMenus.insert("artistic", am);
}

else if (s == "blur" && !m_filterActionMenus.tqfind("blur")) {
else if (s == "blur" && !m_filterActionMenus.find("blur")) {
am = new KActionMenu(i18n("Blur"), ac, "blur_filters");
m_filterActionMenus.insert("blur", am);
}

else if (s == "colors" && !m_filterActionMenus.tqfind("colors")) {
else if (s == "colors" && !m_filterActionMenus.find("colors")) {
am = new KActionMenu(i18n("Colors"), ac, "color_filters");
m_filterActionMenus.insert("colors", am);
}

else if (s == "decor" && !m_filterActionMenus.tqfind("decor")) {
else if (s == "decor" && !m_filterActionMenus.find("decor")) {
am = new KActionMenu(i18n("Decor"), ac, "decor_filters");
m_filterActionMenus.insert("decor", am);
}

else if (s == "edge" && !m_filterActionMenus.tqfind("edge")) {
else if (s == "edge" && !m_filterActionMenus.find("edge")) {
am = new KActionMenu(i18n("Edge Detection"), ac, "edge_filters");
m_filterActionMenus.insert("edge", am);
}

else if (s == "emboss" && !m_filterActionMenus.tqfind("emboss")) {
else if (s == "emboss" && !m_filterActionMenus.find("emboss")) {
am = new KActionMenu(i18n("Emboss"), ac, "emboss_filters");
m_filterActionMenus.insert("emboss", am);
}

else if (s == "enhance" && !m_filterActionMenus.tqfind("enhance")) {
else if (s == "enhance" && !m_filterActionMenus.find("enhance")) {
am = new KActionMenu(i18n("Enhance"), ac, "enhance_filters");
m_filterActionMenus.insert("enhance", am);
}

else if (s == "map" && !m_filterActionMenus.tqfind("map")) {
else if (s == "map" && !m_filterActionMenus.find("map")) {
am = new KActionMenu(i18n("Map"), ac, "map_filters");
m_filterActionMenus.insert("map", am);
}

else if (s == "nonphotorealistic" && !m_filterActionMenus.tqfind("nonphotorealistic")) {
else if (s == "nonphotorealistic" && !m_filterActionMenus.find("nonphotorealistic")) {
am = new KActionMenu(i18n("Non-photorealistic"), ac, "nonphotorealistic_filters");
m_filterActionMenus.insert("nonphotorealistic", am);
}

else if (s == "other" && !m_filterActionMenus.tqfind("other")) {
else if (s == "other" && !m_filterActionMenus.find("other")) {
other = new KActionMenu(i18n("Other"), ac, "misc_filters");
m_filterActionMenus.insert("other", other);
}
@@ -171,7 +171,7 @@ void KisFilterManager::setup(KActionCollection * ac)
TQString("chalk_filter_%1").tqarg((*it) . id()).ascii());

// Add action to the right submenu
KActionMenu * m = m_filterActionMenus.tqfind( f->menuCategory() );
KActionMenu * m = m_filterActionMenus.find( f->menuCategory() );
if (m) {
m->insert(a);
}


+ 1
- 1
chalk/ui/kis_filters_listview.cc View File

@@ -173,7 +173,7 @@ void KisFiltersListView::setLayer(KisLayerSP layer) {

void KisFiltersListView::setCurrentFilter(KisID filter)
{
setCurrentItem(tqfindItem(filter.name()));
setCurrentItem(findItem(filter.name()));
}

void KisFiltersListView::buildPreview()


+ 6
- 6
chalk/ui/kis_gradient_slider_widget.cc View File

@@ -132,20 +132,20 @@ void KisGradientSliderWidget::mousePressEvent( TQMouseEvent * e )
// Change the activation order of the handles to avoid deadlocks
if( t > 0.5 )
{
if( leftHandle.tqcontains( e->pos() ) )
if( leftHandle.contains( e->pos() ) )
m_drag = LEFT_DRAG;
else if( middleHandle.tqcontains( e->pos() ) )
else if( middleHandle.contains( e->pos() ) )
m_drag = MIDDLE_DRAG;
else if( rightHandle.tqcontains( e->pos() ) )
else if( rightHandle.contains( e->pos() ) )
m_drag = RIGHT_DRAG;
}
else
{
if( rightHandle.tqcontains( e->pos() ) )
if( rightHandle.contains( e->pos() ) )
m_drag = RIGHT_DRAG;
else if( middleHandle.tqcontains( e->pos() ) )
else if( middleHandle.contains( e->pos() ) )
m_drag = MIDDLE_DRAG;
else if( leftHandle.tqcontains( e->pos() ) )
else if( leftHandle.contains( e->pos() ) )
m_drag = LEFT_DRAG;
}



+ 5
- 5
chalk/ui/kis_layerbox.cc View File

@@ -499,7 +499,7 @@ void KisLayerBox::slotAddMenuActivated(int type)
void KisLayerBox::slotRmClicked()
{
TQValueList<int> l = list()->selectedLayerIDs();
if (l.count() < 2 && list()->activeLayer() && !l.tqcontains(list()->activeLayer()->id()))
if (l.count() < 2 && list()->activeLayer() && !l.contains(list()->activeLayer()->id()))
{
l.clear();
l.append(list()->activeLayer()->id());
@@ -515,7 +515,7 @@ void KisLayerBox::slotRmClicked()
void KisLayerBox::slotRaiseClicked()
{
TQValueList<int> l = list()->selectedLayerIDs();
if (l.count() < 2 && list()->activeLayer() && !l.tqcontains(list()->activeLayer()->id()))
if (l.count() < 2 && list()->activeLayer() && !l.contains(list()->activeLayer()->id()))
{
l.clear();
l.append(list()->activeLayer()->id());
@@ -542,7 +542,7 @@ void KisLayerBox::slotRaiseClicked()
void KisLayerBox::slotLowerClicked()
{
TQValueList<LayerItem*> l = list()->selectedLayers();
if (l.count() < 2 && list()->activeLayer() && !l.tqcontains(list()->activeLayer()))
if (l.count() < 2 && list()->activeLayer() && !l.contains(list()->activeLayer()))
{
l.clear();
l.append(list()->activeLayer());
@@ -594,7 +594,7 @@ TQPixmap KisLayerBox::loadPixmap(const TQString& filename, const KIconLoader&
TQPixmap pixmap = il.loadIcon(filename, KIcon::NoGroup, size);

if (pixmap.isNull())
KMessageBox::error(0, i18n("Cannot tqfind %1").tqarg(filename),
KMessageBox::error(0, i18n("Cannot find %1").tqarg(filename),
i18n("Canvas"));

return pixmap;
@@ -612,7 +612,7 @@ void KisLayerBox::markModified(KisLayer* layer)
layer = layer->tqparent();
}
for (int i = v.count() - 1; i >= 0; --i)
if (!m_modified.tqcontains(v[i]))
if (!m_modified.contains(v[i]))
m_modified.append(v[i]);
}



+ 3
- 3
chalk/ui/kis_paintop_box.cc View File

@@ -126,7 +126,7 @@ void KisPaintopBox::colorSpaceChanged(KisColorSpace *cs)
}
}

int index = m_displayedOps->tqfindIndex(currentPaintop());
int index = m_displayedOps->findIndex(currentPaintop());

if (index == -1) {
// Must change the paintop as the current one is not supported
@@ -162,7 +162,7 @@ void KisPaintopBox::slotInputDeviceChanged(const KisInputDevice & inputDevice)
paintop = (*it).second;
}

int index = m_displayedOps->tqfindIndex(paintop);
int index = m_displayedOps->findIndex(paintop);

if (index == -1) {
// Must change the paintop as the current one is not supported
@@ -238,7 +238,7 @@ const KisPaintOpSettings *KisPaintopBox::paintopSettings(const KisID & paintop,
settingsArray = (*it).second;
}

const int index = m_paintops->tqfindIndex(paintop);
const int index = m_paintops->findIndex(paintop);
if (index >= 0 && index < (int)settingsArray.count())
return settingsArray[index];
else


+ 1
- 1
chalk/ui/kis_part_layer.cc View File

@@ -129,7 +129,7 @@ void KisPartLayerImpl::paintSelection(TQImage &img, TQ_INT32 x, TQ_INT32 y, TQ_I

for (int y2 = y; y2 < h + y; ++y2) {
for (int x2 = x; x2 < w + x; ++x2) {
if (!rect.tqcontains(x2, y2)) {
if (!rect.contains(x2, y2)) {
TQ_UINT8 g = (*(j + 0) + *(j + 1 ) + *(j + 2 )) / 9;
*(j+0) = 165+g;
*(j+1) = 128+g;


+ 1
- 1
chalk/ui/kis_resource_mediator.cc View File

@@ -64,7 +64,7 @@ KisResource *KisResourceMediator::currentResource() const

KisIconItem *KisResourceMediator::itemFor(KisResource *r) const
{
if(m_items.tqcontains(r))
if(m_items.contains(r))
{
return m_items[r];
}


+ 1
- 1
chalk/ui/kis_resourceserver.cc View File

@@ -64,7 +64,7 @@ void KisResourceServerBase::loadResources(TQStringList filenames)
// XXX: Don't load resources with the same filename. Actually, we should look inside
// the resource to find out whether they are really the same, but for now this
// will prevent the same brush etc. showing up twice.
if (uniqueFiles.empty() || uniqueFiles.tqfind(fname) == uniqueFiles.end()) {
if (uniqueFiles.empty() || uniqueFiles.find(fname) == uniqueFiles.end()) {
uniqueFiles.append(fname);
KisResource *resource;
resource = createResource(front);


+ 2
- 2
chalk/ui/kis_tool_freehand.cc View File

@@ -87,7 +87,7 @@ void KisToolFreehand::buttonPress(KisButtonPressEvent *e)
// People complain that they can't start brush strokes outside of the image boundaries.
// This makes sense, especially when combined with BUG:132759, so commenting out the
// next line makes sense.
//if (!m_currentImage->bounds().tqcontains(e->pos().floorTQPoint())) return;
//if (!m_currentImage->bounds().contains(e->pos().floorTQPoint())) return;

initPaint(e);
paintAt(e->pos(), e->pressure(), e->xTilt(), e->yTilt());
@@ -309,7 +309,7 @@ void KisToolFreehand::paintOutline(const KisPoint& point) {

KisCanvasController *controller = m_subject->canvasController();

if (currentImage() && !currentImage()->bounds().tqcontains(point.floorTQPoint())) {
if (currentImage() && !currentImage()->bounds().contains(point.floorTQPoint())) {
if (m_paintedOutline) {
controller->kiscanvas()->update();
m_paintedOutline = false;


+ 1
- 1
chalk/ui/kis_tool_paint.cc View File

@@ -244,7 +244,7 @@ void KisToolPaint::updateCompositeOpComboBox()
KisCompositeOpList compositeOps = device->colorSpace()->userVisiblecompositeOps();
m_cmbComposite->setCompositeOpList(compositeOps);

if (compositeOps.tqfind(m_compositeOp) == compositeOps.end()) {
if (compositeOps.find(m_compositeOp) == compositeOps.end()) {
m_compositeOp = COMPOSITE_OVER;
}
m_cmbComposite->setCurrentItem(m_compositeOp);


+ 2
- 2
chalk/ui/kis_view.cc View File

@@ -2281,7 +2281,7 @@ void KisView::canvasGotButtonPressEvent(KisButtonPressEvent *e)
// m_currentGuide = 0;
//
// if ((e->state() & ~TQt::ShiftButton) == Qt::NoButton) {
// KisGuideSP gd = mgr->tqfind(static_cast<TQ_INT32>(pt.x() / zoom()), static_cast<TQ_INT32>(pt.y() / zoom()), TQMAX(2.0, 2.0 / zoom()));
// KisGuideSP gd = mgr->find(static_cast<TQ_INT32>(pt.x() / zoom()), static_cast<TQ_INT32>(pt.y() / zoom()), TQMAX(2.0, 2.0 / zoom()));
//
// if (gd) {
// m_currentGuide = gd;
@@ -3544,7 +3544,7 @@ bool KisView::eventFilter(TQObject *o, TQEvent *e)
mgr = img->guides();

if (e->type() == TQEvent::MouseMove && (me->state() & Qt::LeftButton)) {
bool flag = tqgeometry().tqcontains(pt);
bool flag = tqgeometry().contains(pt);
KisGuideSP gd;

if (m_currentGuide == 0 && flag) {


+ 7
- 7
chalk/ui/kobirdeyepanel.cpp View File

@@ -362,23 +362,23 @@ KoBirdEyePanel::enumDragHandle KoBirdEyePanel::dragHandleAt(TQPoint p)
TQRect top = TQRect(m_visibleAreaInThumbnail.left()-1, m_visibleAreaInThumbnail.top()-1, m_visibleAreaInThumbnail.width()+2, 3);
TQRect bottom = TQRect(m_visibleAreaInThumbnail.left()-1, m_visibleAreaInThumbnail.bottom()-1, m_visibleAreaInThumbnail.width()+2, 3);

if (left.tqcontains(p)) {
if (left.contains(p)) {
return DragHandleLeft;
}

if (right.tqcontains(p)) {
if (right.contains(p)) {
return DragHandleRight;
}

if (top.tqcontains(p)) {
if (top.contains(p)) {
return DragHandleTop;
}

if (bottom.tqcontains(p)) {
if (bottom.contains(p)) {
return DragHandleBottom;
}

if (m_visibleAreaInThumbnail.tqcontains(p)) {
if (m_visibleAreaInThumbnail.contains(p)) {
return DragHandleCentre;
}

@@ -403,7 +403,7 @@ void KoBirdEyePanel::handleMouseMove(TQPoint p)
break;
default:
case DragHandleNone:
if (TQT_TQRECT_OBJECT(m_thumbnail.rect()).tqcontains(p)) {
if (TQT_TQRECT_OBJECT(m_thumbnail.rect()).contains(p)) {
cursor = TQt::PointingHandCursor;
} else {
cursor = TQt::arrowCursor;
@@ -462,7 +462,7 @@ void KoBirdEyePanel::handleMousePress(TQPoint p)
enumDragHandle dragHandle = dragHandleAt(p);

if (dragHandle == DragHandleNone) {
if (TQT_TQRECT_OBJECT(m_thumbnail.rect()).tqcontains(p)) {
if (TQT_TQRECT_OBJECT(m_thumbnail.rect()).contains(p)) {
// Snap visible area centre to p and begin a centre drag.


+ 5
- 5
chalk/ui/layerlist.cpp View File

@@ -681,7 +681,7 @@ void LayerList::contentsMouseDoubleClickEvent( TQMouseEvent *e )
super::contentsMouseDoubleClickEvent( e );
if( LayerItem *layer = static_cast<LayerItem*>( itemAt( contentsToViewport( e->pos() ) ) ) )
{
if( !layer->iconsRect().tqcontains( layer->mapFromListView( e->pos() ) ) )
if( !layer->iconsRect().contains( layer->mapFromListView( e->pos() ) ) )
{
emit requestLayerProperties( layer );
emit requestLayerProperties( layer->id() );
@@ -867,7 +867,7 @@ void LayerItem::init()

LayerItem::~LayerItem()
{
if (listView() && (listView()->activeLayer() == this || tqcontains(listView()->activeLayer())))
if (listView() && (listView()->activeLayer() == this || contains(listView()->activeLayer())))
listView()->setActiveLayer( static_cast<LayerItem*>( 0 ) );
delete d;
}
@@ -885,7 +885,7 @@ bool LayerItem::isFolder() const
return d->isFolder;
}

bool LayerItem::tqcontains(const LayerItem *item)
bool LayerItem::contains(const LayerItem *item)
{
TQListViewItemIterator it(this);

@@ -1180,7 +1180,7 @@ bool LayerItem::mousePressEvent( TQMouseEvent *e )

const TQRect ir = iconsRect(), tr = textRect();

if( ir.tqcontains( e->pos() ) )
if( ir.contains( e->pos() ) )
{
const int iconWidth = iconSize().width();
int x = e->pos().x() - ir.left();
@@ -1201,7 +1201,7 @@ bool LayerItem::mousePressEvent( TQMouseEvent *e )
return true;
}

else if( tr.tqcontains( e->pos() ) && isSelected() && !listView()->renameLineEdit()->isVisible() )
else if( tr.contains( e->pos() ) && isSelected() && !listView()->renameLineEdit()->isVisible() )
{
listView()->rename( this, 0 );
TQRect r( listView()->contentsToViewport( mapToListView( tr.topLeft() ) ), tr.size() );


+ 1
- 1
chalk/ui/layerlist.h View File

@@ -178,7 +178,7 @@ public:

// Returns true if this item is the given item or the tree rooted at
// this item contains the given item.
bool tqcontains(const LayerItem *item);
bool contains(const LayerItem *item);

int id() const;



+ 1
- 1
chalk/ui/squeezedcombobox.cpp View File

@@ -76,7 +76,7 @@ SqueezedComboBox::~SqueezedComboBox()
delete m_timer;
}

bool SqueezedComboBox::tqcontains( const TQString& _text ) const
bool SqueezedComboBox::contains( const TQString& _text ) const
{
if ( _text.isEmpty() )
return false;


+ 1
- 1
chalk/ui/squeezedcombobox.h View File

@@ -97,7 +97,7 @@ public:
*/
virtual ~SqueezedComboBox();

bool tqcontains(const TQString & text) const;
bool contains(const TQString & text) const;

/**
* This inserts a item to the list. See TQComboBox::insertItem()


+ 4
- 4
filters/chalk/gmagick/kis_image_magick_converter.cc View File

@@ -1025,7 +1025,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
description = info -> description;
kdDebug(41008) << "Found import filter for: " << name << "\n";

if (!description.isEmpty() && !description.tqcontains('/')) {
if (!description.isEmpty() && !description.contains('/')) {
all += "*." + name.lower() + " *." + name + " ";
s += "*." + name.lower() + " *." + name + "|";
s += i18n(description.utf8());
@@ -1042,7 +1042,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
description = mi -> description;
kdDebug(41008) << "Found import filter for: " << name << "\n";

if (!description.isEmpty() && !description.tqcontains('/')) {
if (!description.isEmpty() && !description.contains('/')) {
all += "*." + name.lower() + " *." + name + " ";
s += "*." + name.lower() + " *." + name + "|";
s += i18n(description.utf8());
@@ -1102,7 +1102,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB

description = info -> description;

if (!description.isEmpty() && !description.tqcontains('/')) {
if (!description.isEmpty() && !description.contains('/')) {
all += "*." + name.lower() + " *." + name + " ";
s += "*." + name.lower() + " *." + name + "|";
s += i18n(description.utf8());
@@ -1121,7 +1121,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB

description = mi -> description;

if (!description.isEmpty() && !description.tqcontains('/')) {
if (!description.isEmpty() && !description.contains('/')) {
all += "*." + name.lower() + " *." + name + " ";
s += "*." + name.lower() + " *." + name + "|";
s += i18n(description.utf8());


+ 1
- 1
filters/chalk/jpeg/iccjpeg.c View File

@@ -133,7 +133,7 @@ write_icc_profile (j_compress_ptr cinfo,
void
setup_read_icc_profile (j_decompress_ptr cinfo)
{
/* Tell the library to keep any APP2 data it may tqfind */
/* Tell the library to keep any APP2 data it may find */
jpeg_save_markers(cinfo, ICC_MARKER, 0xFFFF);
}



+ 4
- 4
filters/chalk/magick/kis_image_magick_converter.cc View File

@@ -970,7 +970,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
description = info -> description;
kdDebug(41008) << "Found import filter for: " << name << "\n";

if (!description.isEmpty() && !description.tqcontains('/')) {
if (!description.isEmpty() && !description.contains('/')) {
all += "*." + name.lower() + " *." + name + " ";
s += "*." + name.lower() + " *." + name + "|";
s += i18n(description.utf8());
@@ -987,7 +987,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
description = mi -> description;
kdDebug(41008) << "Found import filter for: " << name << "\n";

if (!description.isEmpty() && !description.tqcontains('/')) {
if (!description.isEmpty() && !description.contains('/')) {
all += "*." + name.lower() + " *." + name + " ";
s += "*." + name.lower() + " *." + name + "|";
s += i18n(description.utf8());
@@ -1047,7 +1047,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB

description = info -> description;

if (!description.isEmpty() && !description.tqcontains('/')) {
if (!description.isEmpty() && !description.contains('/')) {
all += "*." + name.lower() + " *." + name + " ";
s += "*." + name.lower() + " *." + name + "|";
s += i18n(description.utf8());
@@ -1066,7 +1066,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB

description = mi -> description;

if (!description.isEmpty() && !description.tqcontains('/')) {
if (!description.isEmpty() && !description.contains('/')) {
all += "*." + name.lower() + " *." + name + " ";
s += "*." + name.lower() + " *." + name + "|";
s += i18n(description.utf8());


+ 1
- 1
filters/chalk/xcf/xcf/xcf-load.cc View File

@@ -128,7 +128,7 @@ xcf_load_image (XcfInfo * info)
goto hard_error;

/* check for a GimpGrid parasite */
parasite = gimp_image_parasite_tqfind (GIMP_IMAGE (gimage),
parasite = gimp_image_parasite_find (GIMP_IMAGE (gimage),
gimp_grid_parasite_name ());
if (parasite)
{


+ 8
- 8
filters/karbon/ai/aiparserbase.cc View File

@@ -791,16 +791,16 @@ void AIParserBase::_handleDocumentProcessColors(const char *data) {

signed int index;

index = tmp.tqfind ("Cyan");
index = tmp.find ("Cyan");
if (index > 0) colorSet |= PC_Cyan;

index = tmp.tqfind ("Magenta");
index = tmp.find ("Magenta");
if (index > 0) colorSet |= PC_Magenta;

index = tmp.tqfind ("Yellow");
index = tmp.find ("Yellow");
if (index > 0) colorSet |= PC_Yellow;

index = tmp.tqfind ("Black");
index = tmp.find ("Black");
if (index > 0) colorSet |= PC_Black;

if (m_documentHandler) m_documentHandler->gotProcessColors (colorSet);
@@ -945,7 +945,7 @@ void AIParserBase::gotToken (const char *value) {

TQString string(value);

if (m_modules.tqfindIndex(string) != -1)
if (m_modules.findIndex(string) != -1)
{
AIElement element (string, AIElement::Reference);
handleElement (element);
@@ -1067,7 +1067,7 @@ CommentOperation AIParserBase::getCommentOperation (const char *command) {
for(;;) {
CommentOperationMapping map = commentMappings[i];
if (map.op == NULL) return CO_Other;
index = data.tqfind (map.op);
index = data.find (map.op);
if (index >= 0) return map.action;
i++;
}
@@ -1088,7 +1088,7 @@ void GStateHandlerBase::gotStrokePattern (const char *pname, double px, double p
const char *AIParserBase::getValue (const char *input) {
TQString data(input);

signed int index = data.tqfind (':');
signed int index = data.find (':');
if (index < 0) return "";
index++;
while (data.at(index) == ' ') index++;
@@ -1099,7 +1099,7 @@ bool AIParserBase::getRectangle (const char* input, int &llx, int &lly, int &urx
if (input == NULL) return false;

TQString s(input);
if (s.tqcontains ("(atend)")) return false;
if (s.contains ("(atend)")) return false;
TQStringList values = TQStringList::split (" ", input);
if (values.size() < 5) return false;
llx = values[1].toInt();


+ 2
- 2
filters/karbon/applixgraphics/applixgraphicimport.cc View File

@@ -231,11 +231,11 @@ KoFilter::ConversiontqStatus APPLIXGRAPHICImport::convert( const TQCString& from
//mystr.remove (0, 7);


//remove_pos = mystr.tqfind ('(');
//remove_pos = mystr.find ('(');
//mystr.remove (0, remove_pos);
//agLine.offX= mystr.toInt();

//remove_pos = mystr.tqfind (',');
//remove_pos = mystr.find (',');
//mystr.remove (0, remove_pos);
//agLine.offY= mystr.toInt();
rueck = sscanf ((const char *) mystr.latin1(), "(%d,%d)",


+ 2
- 2
filters/karbon/eps/pscommentlexer.cc View File

@@ -298,7 +298,7 @@ BoundingBoxExtractor::~BoundingBoxExtractor() {}
void BoundingBoxExtractor::gotComment (const char *value)
{
TQString data (value);
if (data.tqfind("%BoundingBox:")==-1) return;
if (data.find("%BoundingBox:")==-1) return;

getRectangle (value, m_llx, m_lly, m_urx, m_ury);
}
@@ -308,7 +308,7 @@ bool BoundingBoxExtractor::getRectangle (const char* input, int &llx, int &lly,
if (input == NULL) return false;

TQString s(input);
if (s.tqcontains ("(atend)")) return false;
if (s.contains ("(atend)")) return false;

TQString s2 = s.remove("%BoundingBox:");
TQStringList values = TQStringList::split (" ", s2.latin1());


+ 4
- 4
filters/karbon/oodraw/oodrawimport.cc View File

@@ -659,7 +659,7 @@ OoDrawImport::parseViewBox( const TQDomElement& object )
{
// allow for viewbox def with ',' or whitespace
TQString viewbox( object.attributeNS( ooNS::svg, "viewBox", TQString() ) );
TQStringList points = TQStringList::split( ' ', viewbox.tqreplace( ',', ' ').simplifyWhiteSpace() );
TQStringList points = TQStringList::split( ' ', viewbox.replace( ',', ' ').simplifyWhiteSpace() );

rect.setX( points[0].toFloat() );
rect.setY( points[1].toFloat() );
@@ -715,19 +715,19 @@ OoDrawImport::parseColor( VColor &color, const TQString &s )
TQString g = colors[1];
TQString b = colors[2].left( ( colors[2].length() - 1 ) );

if( r.tqcontains( "%" ) )
if( r.contains( "%" ) )
{
r = r.left( r.length() - 1 );
r = TQString::number( int( ( double( 255 * r.toDouble() ) / 100.0 ) ) );
}

if( g.tqcontains( "%" ) )
if( g.contains( "%" ) )
{
g = g.left( g.length() - 1 );
g = TQString::number( int( ( double( 255 * g.toDouble() ) / 100.0 ) ) );
}

if( b.tqcontains( "%" ) )
if( b.contains( "%" ) )
{
b = b.left( b.length() - 1 );
b = TQString::number( int( ( double( 255 * b.toDouble() ) / 100.0 ) ) );


+ 21
- 21
filters/karbon/svg/svgimport.cc View File

@@ -63,7 +63,7 @@ KoFilter::ConversiontqStatus SvgImport::convert(const TQCString& from, const TQC
//Find the last extension
TQString strExt;
TQString fileIn ( m_chain->inputFile() );
const int result=fileIn.tqfindRev('.');
const int result=fileIn.findRev('.');
if (result>=0)
strExt=fileIn.mid(result).lower();

@@ -143,7 +143,7 @@ void SvgImport::convert()
{
// allow for viewbox def with ',' or whitespace
TQString viewbox( docElem.attribute( "viewBox" ) );
TQStringList points = TQStringList::split( ' ', viewbox.tqreplace( ',', ' ').simplifyWhiteSpace() );
TQStringList points = TQStringList::split( ' ', viewbox.replace( ',', ' ').simplifyWhiteSpace() );

gc->matrix.scale( width / points[2].toFloat() , height / points[3].toFloat() );
m_outerRect.setWidth( m_outerRect.width() * ( points[2].toFloat() / width ) );
@@ -310,11 +310,11 @@ VObject* SvgImport::findObject( const TQString &name )