summaryrefslogtreecommitdiffstats
path: root/chalk/core/tiles
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 06:08:18 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 06:08:18 +0000
commitb6edfe41c9395f2e20784cbf0e630af6426950a3 (patch)
tree56ed9b871d4296e6c15949c24e16420be1b28697 /chalk/core/tiles
parentef39e8e4178a8f98cf5f154916ba0f03e4855206 (diff)
downloadkoffice-b6edfe41c9395f2e20784cbf0e630af6426950a3.tar.gz
koffice-b6edfe41c9395f2e20784cbf0e630af6426950a3.zip
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
Diffstat (limited to 'chalk/core/tiles')
-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
3 files changed, 6 insertions, 6 deletions
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];