summaryrefslogtreecommitdiffstats
path: root/chalk/core
diff options
context:
space:
mode:
Diffstat (limited to 'chalk/core')
-rwxr-xr-xchalk/core/createdcop.py20
-rw-r--r--chalk/core/kis_exif_info.h2
-rw-r--r--chalk/core/kis_filter_configuration.cc6
-rw-r--r--chalk/core/kis_group_layer.cc2
-rw-r--r--chalk/core/kis_imagepipe_brush.cc4
-rw-r--r--chalk/core/kis_layer.cc2
-rw-r--r--chalk/core/kis_paint_device.h4
-rw-r--r--chalk/core/kis_palette.cc2
-rw-r--r--chalk/core/kis_pattern.cc2
-rw-r--r--chalk/core/kis_perspective_grid.cpp4
-rw-r--r--chalk/core/kis_perspective_grid.h2
-rw-r--r--chalk/core/kis_selection.cc4
-rw-r--r--chalk/core/kis_thread_pool.cc6
-rw-r--r--chalk/core/tiles/kis_tile.h2
-rw-r--r--chalk/core/tiles/kis_tileddatamanager.cc6
-rw-r--r--chalk/core/tiles/kis_tilemanager.cc4
16 files changed, 36 insertions, 36 deletions
diff --git a/chalk/core/createdcop.py b/chalk/core/createdcop.py
index bac48f33..de773270 100755
--- a/chalk/core/createdcop.py
+++ b/chalk/core/createdcop.py
@@ -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:
diff --git a/chalk/core/kis_exif_info.h b/chalk/core/kis_exif_info.h
index d3fa3428..090d58c6 100644
--- a/chalk/core/kis_exif_info.h
+++ b/chalk/core/kis_exif_info.h
@@ -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 {
diff --git a/chalk/core/kis_filter_configuration.cc b/chalk/core/kis_filter_configuration.cc
index b25dcb24..c1dec978 100644
--- a/chalk/core/kis_filter_configuration.cc
+++ b/chalk/core/kis_filter_configuration.cc
@@ -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 {
diff --git a/chalk/core/kis_group_layer.cc b/chalk/core/kis_group_layer.cc
index a3a35339..ea8d0213 100644
--- a/chalk/core/kis_group_layer.cc
+++ b/chalk/core/kis_group_layer.cc
@@ -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;
diff --git a/chalk/core/kis_imagepipe_brush.cc b/chalk/core/kis_imagepipe_brush.cc
index 5cef04d6..9b71c83d 100644
--- a/chalk/core/kis_imagepipe_brush.cc
+++ b/chalk/core/kis_imagepipe_brush.cc
@@ -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;
diff --git a/chalk/core/kis_layer.cc b/chalk/core/kis_layer.cc
index cac178e5..752159c0 100644
--- a/chalk/core/kis_layer.cc
+++ b/chalk/core/kis_layer.cc
@@ -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();
}
diff --git a/chalk/core/kis_paint_device.h b/chalk/core/kis_paint_device.h
index 6c8d7331..7fe6250b 100644
--- a/chalk/core/kis_paint_device.h
+++ b/chalk/core/kis_paint_device.h
@@ -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,
diff --git a/chalk/core/kis_palette.cc b/chalk/core/kis_palette.cc
index daf8d84d..161a4ff8 100644
--- a/chalk/core/kis_palette.cc
+++ b/chalk/core/kis_palette.cc
@@ -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)
{
diff --git a/chalk/core/kis_pattern.cc b/chalk/core/kis_pattern.cc
index 516d3d8b..72130db6 100644
--- a/chalk/core/kis_pattern.cc
+++ b/chalk/core/kis_pattern.cc
@@ -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);
diff --git a/chalk/core/kis_perspective_grid.cpp b/chalk/core/kis_perspective_grid.cpp
index 6eb5fbe8..597f1d40 100644
--- a/chalk/core/kis_perspective_grid.cpp
+++ b/chalk/core/kis_perspective_grid.cpp
@@ -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;
}
diff --git a/chalk/core/kis_perspective_grid.h b/chalk/core/kis_perspective_grid.h
index 4bd22815..81ec2966 100644
--- a/chalk/core/kis_perspective_grid.h
+++ b/chalk/core/kis_perspective_grid.h
@@ -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)
{
diff --git a/chalk/core/kis_selection.cc b/chalk/core/kis_selection.cc
index 10e96a05..b5cd8e6e 100644
--- a/chalk/core/kis_selection.cc
+++ b/chalk/core/kis_selection.cc
@@ -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;
}
diff --git a/chalk/core/kis_thread_pool.cc b/chalk/core/kis_thread_pool.cc
index e617c8cb..2f80a0ae 100644
--- a/chalk/core/kis_thread_pool.cc
+++ b/chalk/core/kis_thread_pool.cc
@@ -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);
}
diff --git a/chalk/core/tiles/kis_tile.h b/chalk/core/tiles/kis_tile.h
index f2d6f1e9..2a0b3a22 100644
--- a/chalk/core/tiles/kis_tile.h
+++ b/chalk/core/tiles/kis_tile.h
@@ -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.
*/
diff --git a/chalk/core/tiles/kis_tileddatamanager.cc b/chalk/core/tiles/kis_tileddatamanager.cc
index 629b1b38..2dd633fd 100644
--- a/chalk/core/tiles/kis_tileddatamanager.cc
+++ b/chalk/core/tiles/kis_tileddatamanager.cc
@@ -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);
}
diff --git a/chalk/core/tiles/kis_tilemanager.cc b/chalk/core/tiles/kis_tilemanager.cc
index dc9811e9..2c3fed8e 100644
--- a/chalk/core/tiles/kis_tilemanager.cc
+++ b/chalk/core/tiles/kis_tilemanager.cc
@@ -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];
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-18 04:56:33 +0000