summaryrefslogtreecommitdiffstats
path: root/chalk/core
diff options
context:
space:
mode:
Diffstat (limited to 'chalk/core')
-rw-r--r--chalk/core/kis_alpha_mask.h2
-rw-r--r--chalk/core/kis_brush.cc24
-rw-r--r--chalk/core/kis_brush.h6
-rw-r--r--chalk/core/kis_merge_visitor.h6
-rw-r--r--chalk/core/kis_paint_device.cc12
-rw-r--r--chalk/core/kis_paint_device.h12
-rw-r--r--chalk/core/kis_paint_layer.cc42
-rw-r--r--chalk/core/kis_paint_layer.h8
-rw-r--r--chalk/core/kis_paintop.cc8
-rw-r--r--chalk/core/kis_selection.cc4
-rw-r--r--chalk/core/kis_selection.h4
-rw-r--r--chalk/core/kis_transaction.cc4
-rw-r--r--chalk/core/kis_transform_worker.cc4
-rw-r--r--chalk/core/tiles/kis_tilemanager.h2
14 files changed, 69 insertions, 69 deletions
diff --git a/chalk/core/kis_alpha_mask.h b/chalk/core/kis_alpha_mask.h
index 4665857e..5573f5e6 100644
--- a/chalk/core/kis_alpha_mask.h
+++ b/chalk/core/kis_alpha_mask.h
@@ -70,7 +70,7 @@ class KisAlphaMask : public KShared {
Returns TQ_UINT8 OPACITY_TRANSPARENT if the value is
outside the bounds of the tqmask.
- XXX: this is, of course, not the best way of tqmasking.
+ XXX: this is, of course, not the best way of masking.
Better would be to let KisAlphaMask fill a chunk of memory
with the alpha values at the right position, something like
void applyMask(TQ_UINT8 *pixeldata, TQ_INT32 pixelWidth,
diff --git a/chalk/core/kis_brush.cc b/chalk/core/kis_brush.cc
index 9720a3e1..60f475f0 100644
--- a/chalk/core/kis_brush.cc
+++ b/chalk/core/kis_brush.cc
@@ -392,7 +392,7 @@ KisAlphaMaskSP KisBrush::tqmask(const KisPaintInformation& info, double subPixel
KisAlphaMaskSP outputMask = 0;
if (belowBrush != 0) {
- // We're in between two tqmasks. Interpolate between them.
+ // We're in between two masks. Interpolate between them.
KisAlphaMaskSP scaledAboveMask = scaleMask(aboveBrush, scale, subPixelX, subPixelY);
KisAlphaMaskSP scaledBelowMask = scaleMask(belowBrush, scale, subPixelX, subPixelY);
@@ -608,13 +608,13 @@ double KisBrush::scaleForPressure(double pressure)
return scale;
}
-TQ_INT32 KisBrush::tqmaskWidth(const KisPaintInformation& info) const
+TQ_INT32 KisBrush::maskWidth(const KisPaintInformation& info) const
{
// Add one for sub-pixel shift
return static_cast<TQ_INT32>(ceil(width() * scaleForPressure(info.pressure)) + 1);
}
-TQ_INT32 KisBrush::tqmaskHeight(const KisPaintInformation& info) const
+TQ_INT32 KisBrush::maskHeight(const KisPaintInformation& info) const
{
// Add one for sub-pixel shift
return static_cast<TQ_INT32>(ceil(height() * scaleForPressure(info.pressure)) + 1);
@@ -971,7 +971,7 @@ void KisBrush::findScaledBrushes(double scale, const ScaledBrush **aboveBrush, c
}
}
-KisAlphaMaskSP KisBrush::scaleSinglePixelMask(double scale, TQ_UINT8 tqmaskValue, double subPixelX, double subPixelY)
+KisAlphaMaskSP KisBrush::scaleSinglePixelMask(double scale, TQ_UINT8 maskValue, double subPixelX, double subPixelY)
{
int srcWidth = 1;
int srcHeight = 1;
@@ -986,10 +986,10 @@ KisAlphaMaskSP KisBrush::scaleSinglePixelMask(double scale, TQ_UINT8 tqmaskValue
for (int y = 0; y < dstHeight; y++) {
for (int x = 0; x < dstWidth; x++) {
- TQ_UINT8 topLeft = (x > 0 && y > 0) ? tqmaskValue : OPACITY_TRANSPARENT;
- TQ_UINT8 bottomLeft = (x > 0 && y < srcHeight) ? tqmaskValue : OPACITY_TRANSPARENT;
- TQ_UINT8 topRight = (x < srcWidth && y > 0) ? tqmaskValue : OPACITY_TRANSPARENT;
- TQ_UINT8 bottomRight = (x < srcWidth && y < srcHeight) ? tqmaskValue : OPACITY_TRANSPARENT;
+ TQ_UINT8 topLeft = (x > 0 && y > 0) ? maskValue : OPACITY_TRANSPARENT;
+ TQ_UINT8 bottomLeft = (x > 0 && y < srcHeight) ? maskValue : OPACITY_TRANSPARENT;
+ TQ_UINT8 topRight = (x < srcWidth && y > 0) ? maskValue : OPACITY_TRANSPARENT;
+ TQ_UINT8 bottomRight = (x < srcWidth && y < srcHeight) ? maskValue : OPACITY_TRANSPARENT;
// Bi-linear interpolation
int d = static_cast<int>(a * b * topLeft
@@ -1244,8 +1244,8 @@ void KisBrush::setHeight(TQ_INT32 h)
KisLayerSP layer = image(KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID("RGBA",""),""),
KisPaintInformation(pressure));
KisBoundary bounds(layer.data());
- int w = tqmaskWidth(pressure);
- int h = tqmaskHeight(pressure);
+ int w = maskWidth(pressure);
+ int h = maskHeight(pressure);
bounds.generateBoundary(w, h);
TQPixmap pix(bounds.pixmap(w, h));
@@ -1256,8 +1256,8 @@ void KisBrush::setHeight(TQ_INT32 h)
void KisBrush::generateBoundary() {
KisPaintDeviceSP dev;
- int w = tqmaskWidth(KisPaintInformation());
- int h = tqmaskHeight(KisPaintInformation());
+ int w = maskWidth(KisPaintInformation());
+ int h = maskHeight(KisPaintInformation());
if (brushType() == IMAGE || brushType() == PIPE_IMAGE) {
dev = image(KisMetaRegistry::instance()->csRegistry() ->getColorSpace(KisID("RGBA",""),""), KisPaintInformation());
diff --git a/chalk/core/kis_brush.h b/chalk/core/kis_brush.h
index 091cebde..57dd9d9e 100644
--- a/chalk/core/kis_brush.h
+++ b/chalk/core/kis_brush.h
@@ -95,8 +95,8 @@ public:
double ySpacing(double pressure = PRESSURE_DEFAULT) const;
// Dimensions in pixels of the tqmask/image at a given pressure.
- TQ_INT32 tqmaskWidth(const KisPaintInformation& info) const;
- TQ_INT32 tqmaskHeight(const KisPaintInformation& info) const;
+ TQ_INT32 maskWidth(const KisPaintInformation& info) const;
+ TQ_INT32 maskHeight(const KisPaintInformation& info) const;
virtual void setUseColorAsMask(bool useColorAsMask) { m_useColorAsMask = useColorAsMask; }
virtual bool useColorAsMask() const { return m_useColorAsMask; }
@@ -157,7 +157,7 @@ private:
static TQImage scaleImage(const TQImage& srcImage, int width, int height);
static TQImage interpolate(const TQImage& image1, const TQImage& image2, double t);
- static KisAlphaMaskSP scaleSinglePixelMask(double scale, TQ_UINT8 tqmaskValue, double subPixelX, double subPixelY);
+ static KisAlphaMaskSP scaleSinglePixelMask(double scale, TQ_UINT8 maskValue, double subPixelX, double subPixelY);
static TQImage scaleSinglePixelImage(double scale, TQRgb pixel, double subPixelX, double subPixelY);
// Find the scaled brush(es) nearest to the given scale.
diff --git a/chalk/core/kis_merge_visitor.h b/chalk/core/kis_merge_visitor.h
index 68053384..721ce827 100644
--- a/chalk/core/kis_merge_visitor.h
+++ b/chalk/core/kis_merge_visitor.h
@@ -153,9 +153,9 @@ public:
KisSelectionSP tqmask = layer->getMaskAsSelection();
// The indirect painting happens on the tqmask
if (tempTarget && layer->editMask()) {
- KisPaintDeviceSP tqmaskSrc = layer->getMask();
- KisPaintDeviceSP temp = new KisPaintDevice(tqmaskSrc->colorSpace());
- temp = paintIndirect(tqmaskSrc, temp, layer, sx, sy, dx, dy, w, h);
+ KisPaintDeviceSP maskSrc = layer->getMask();
+ KisPaintDeviceSP temp = new KisPaintDevice(maskSrc->colorSpace());
+ temp = paintIndirect(maskSrc, temp, layer, sx, sy, dx, dy, w, h);
// Blegh
KisRectIteratorPixel srcIt = temp->createRectIterator(sx, sy, w, h, false);
KisRectIteratorPixel dstIt = tqmask->createRectIterator(sx, sy, w, h, true);
diff --git a/chalk/core/kis_paint_device.cc b/chalk/core/kis_paint_device.cc
index 1ce2e98f..59665829 100644
--- a/chalk/core/kis_paint_device.cc
+++ b/chalk/core/kis_paint_device.cc
@@ -343,14 +343,14 @@ DCOPObject *KisPaintDevice::dcopObject()
return m_dcop;
}
-KisLayer *KisPaintDevice::tqparentLayer() const
+KisLayer *KisPaintDevice::parentLayer() const
{
return m_parentLayer;
}
-void KisPaintDevice::setParentLayer(KisLayer *tqparentLayer)
+void KisPaintDevice::setParentLayer(KisLayer *parentLayer)
{
- m_parentLayer = tqparentLayer;
+ m_parentLayer = parentLayer;
}
void KisPaintDevice::setDirty(const TQRect & rc)
@@ -1115,15 +1115,15 @@ void KisPaintDevice::applySelectionMask(KisSelectionSP tqmask)
for (TQ_INT32 y = r.top(); y <= r.bottom(); ++y) {
KisHLineIterator pixelIt = createHLineIterator(r.x(), y, r.width(), true);
- KisHLineIterator tqmaskIt = tqmask->createHLineIterator(r.x(), y, r.width(), false);
+ KisHLineIterator maskIt = tqmask->createHLineIterator(r.x(), y, r.width(), false);
while (!pixelIt.isDone()) {
// XXX: Optimize by using stretches
- m_colorSpace->applyAlphaU8Mask( pixelIt.rawData(), tqmaskIt.rawData(), 1);
+ m_colorSpace->applyAlphaU8Mask( pixelIt.rawData(), maskIt.rawData(), 1);
++pixelIt;
- ++tqmaskIt;
+ ++maskIt;
}
}
}
diff --git a/chalk/core/kis_paint_device.h b/chalk/core/kis_paint_device.h
index 6e804afe..6c8d7331 100644
--- a/chalk/core/kis_paint_device.h
+++ b/chalk/core/kis_paint_device.h
@@ -90,13 +90,13 @@ public:
/**
* Create a new paint device with the specified colorspace. The
- * tqparentLayer will be notified of changes to this paint device.
+ * parentLayer will be notified of changes to this paint device.
*
- * @param tqparentLayer the layer that contains this paint device.
+ * @param parentLayer the layer that contains this paint device.
* @param colorSpace the colorspace of this paint device
* @param name for debugging purposes
*/
- KisPaintDevice(KisLayer *tqparentLayer, KisColorSpace * colorSpace, const char * name = 0);
+ KisPaintDevice(KisLayer *parentLayer, KisColorSpace * colorSpace, const char * name = 0);
KisPaintDevice(const KisPaintDevice& rhs);
virtual ~KisPaintDevice();
@@ -386,7 +386,7 @@ public:
/**
* Return the image that contains this paint device, or 0 if it is not
- * part of an image. This is the same as calling tqparentLayer()->image().
+ * part of an image. This is the same as calling parentLayer()->image().
*/
KisImage *image() const;
@@ -394,13 +394,13 @@ public:
* Returns the KisLayer that contains this paint device, or 0 if this is not
* part of a layer.
*/
- KisLayer *tqparentLayer() const;
+ KisLayer *parentLayer() const;
/**
* Set the KisLayer that contains this paint device, or 0 if this is not
* part of a layer.
*/
- void setParentLayer(KisLayer *tqparentLayer);
+ void setParentLayer(KisLayer *parentLayer);
/**
* Add the specified rect top the tqparent layer (if present)
diff --git a/chalk/core/kis_paint_layer.cc b/chalk/core/kis_paint_layer.cc
index 63663067..2df12e01 100644
--- a/chalk/core/kis_paint_layer.cc
+++ b/chalk/core/kis_paint_layer.cc
@@ -40,7 +40,7 @@ KisPaintLayer::KisPaintLayer(KisImage *img, const TQString& name, TQ_UINT8 opaci
Q_ASSERT(dev);
m_paintdev = dev;
m_tqmask = 0;
- m_tqmaskAsSelection = 0;
+ m_maskAsSelection = 0;
m_paintdev->setParentLayer(this);
m_renderMask = false;
m_editMask = true;
@@ -53,7 +53,7 @@ KisPaintLayer::KisPaintLayer(KisImage *img, const TQString& name, TQ_UINT8 opaci
Q_ASSERT(img);
m_paintdev = new KisPaintDevice(this, img->colorSpace(), name.latin1());
m_tqmask = 0;
- m_tqmaskAsSelection = 0;
+ m_maskAsSelection = 0;
m_renderMask = false;
m_editMask = true;
}
@@ -65,7 +65,7 @@ KisPaintLayer::KisPaintLayer(KisImage *img, const TQString& name, TQ_UINT8 opaci
Q_ASSERT(colorSpace);
m_paintdev = new KisPaintDevice(this, colorSpace, name.latin1());
m_tqmask = 0;
- m_tqmaskAsSelection = 0;
+ m_maskAsSelection = 0;
m_renderMask = false;
m_editMask = true;
}
@@ -193,7 +193,7 @@ void KisPaintLayer::removeMask() {
m_tqmask->setParentLayer(0);
m_tqmask = 0;
- m_tqmaskAsSelection = 0;
+ m_maskAsSelection = 0;
setDirty();
emit sigMaskInfoChanged();
@@ -210,7 +210,7 @@ void KisPaintLayer::applyMask() {
// A bit slow; but it works
KisPaintDeviceSP temp = new KisPaintDevice(m_paintdev->colorSpace());
KisPainter gc(temp);
- gc.bltSelection(x, y, COMPOSITE_OVER, m_paintdev, m_tqmaskAsSelection, OPACITY_OPAQUE, x, y, w, h);
+ gc.bltSelection(x, y, COMPOSITE_OVER, m_paintdev, m_maskAsSelection, OPACITY_OPAQUE, x, y, w, h);
gc.end();
gc.begin(m_paintdev);
gc.bitBlt(x, y, COMPOSITE_COPY, temp, OPACITY_OPAQUE, x, y, w, h);
@@ -252,7 +252,7 @@ void KisPaintLayer::createMaskFromSelection(KisSelectionSP from) {
->getColorSpace(KisID("GRAYA"), 0));
m_tqmask->setParentLayer(this);
- m_tqmaskAsSelection = new KisSelection(); // Anonymous selection is good enough
+ m_maskAsSelection = new KisSelection(); // Anonymous selection is good enough
// Default pixel is opaque white == don't tqmask?
TQ_UINT8 const defPixel[] = { 255, 255 };
@@ -292,7 +292,7 @@ KisPaintDeviceSP KisPaintLayer::getMask() {
KisSelectionSP KisPaintLayer::getMaskAsSelection() {
createMask();
kdDebug() << k_funcinfo << endl;
- return m_tqmaskAsSelection;
+ return m_maskAsSelection;
}
void KisPaintLayer::setEditMask(bool b) {
@@ -312,7 +312,7 @@ void KisPaintLayer::setRenderMask(bool b) {
void KisPaintLayer::convertMaskToSelection(const TQRect& r) {
KisRectIteratorPixel srcIt = m_tqmask->createRectIterator(r.x(), r.y(),
r.width(), r.height(), false);
- KisRectIteratorPixel dstIt = m_tqmaskAsSelection->createRectIterator(r.x(), r.y(),
+ KisRectIteratorPixel dstIt = m_maskAsSelection->createRectIterator(r.x(), r.y(),
r.width(), r.height(), true);
while(!dstIt.isDone()) {
@@ -328,7 +328,7 @@ void KisPaintLayer::convertMaskToSelection(const TQRect& r) {
void KisPaintLayer::genericMaskCreationHelper() {
m_tqmask->setParentLayer(this);
- m_tqmaskAsSelection = new KisSelection(); // Anonymous selection is good enough
+ m_maskAsSelection = new KisSelection(); // Anonymous selection is good enough
// Default pixel is opaque white == don't tqmask?
TQ_UINT8 const defPixel[] = { 255, 255 };
@@ -374,35 +374,35 @@ namespace {
class KisMaskFromSelectionCommand : public KNamedCommand {
typedef KNamedCommand super;
KisPaintLayerSP m_layer;
- KisPaintDeviceSP m_tqmaskBefore;
- KisPaintDeviceSP m_tqmaskAfter;
+ KisPaintDeviceSP m_maskBefore;
+ KisPaintDeviceSP m_maskAfter;
KisSelectionSP m_selection;
public:
KisMaskFromSelectionCommand(const TQString& name, KisPaintLayer* layer)
: super(name), m_layer(layer) {
if (m_layer->hasMask())
- m_tqmaskBefore = m_layer->getMask();
+ m_maskBefore = m_layer->getMask();
else
- m_tqmaskBefore = 0;
- m_tqmaskAfter = 0;
+ m_maskBefore = 0;
+ m_maskAfter = 0;
if (m_layer->paintDevice()->hasSelection())
m_selection = m_layer->paintDevice()->selection();
else
m_selection = 0;
}
virtual void execute() {
- if (!m_tqmaskAfter) {
+ if (!m_maskAfter) {
m_layer->createMaskFromSelection(m_selection);
- m_tqmaskAfter = m_layer->getMask();
+ m_maskAfter = m_layer->getMask();
} else {
m_layer->paintDevice()->deselect();
- m_layer->createMaskFromPaintDevice(m_tqmaskAfter);
+ m_layer->createMaskFromPaintDevice(m_maskAfter);
}
}
virtual void unexecute() {
m_layer->paintDevice()->setSelection(m_selection);
- if (m_tqmaskBefore)
- m_layer->createMaskFromPaintDevice(m_tqmaskBefore);
+ if (m_maskBefore)
+ m_layer->createMaskFromPaintDevice(m_maskBefore);
else
m_layer->removeMask();
}
@@ -488,11 +488,11 @@ KNamedCommand* KisPaintLayer::createMaskCommand() {
return new KisCreateMaskCommand(i18n("Create Layer Mask"), this);
}
-KNamedCommand* KisPaintLayer::tqmaskFromSelectionCommand() {
+KNamedCommand* KisPaintLayer::maskFromSelectionCommand() {
return new KisMaskFromSelectionCommand(i18n("Mask From Selection"), this);
}
-KNamedCommand* KisPaintLayer::tqmaskToSelectionCommand() {
+KNamedCommand* KisPaintLayer::maskToSelectionCommand() {
return new KisMaskToSelectionCommand(i18n("Mask to Selection"), this);
}
diff --git a/chalk/core/kis_paint_layer.h b/chalk/core/kis_paint_layer.h
index 9e598e7a..6319f981 100644
--- a/chalk/core/kis_paint_layer.h
+++ b/chalk/core/kis_paint_layer.h
@@ -106,15 +106,15 @@ public:
/// Undoable version of createMask
KNamedCommand* createMaskCommand();
/// Undoable version of createMaskFromSelection
- KNamedCommand* tqmaskFromSelectionCommand();
+ KNamedCommand* maskFromSelectionCommand();
/// Undoable, removes the current tqmask, but converts it to the current selection
- KNamedCommand* tqmaskToSelectionCommand();
+ KNamedCommand* maskToSelectionCommand();
/// Undoable version of removeMask
KNamedCommand* removeMaskCommand();
/// Undoable version of applyMask
KNamedCommand* applyMaskCommand();
- /// Returns true if the tqmasked part of the tqmask will be rendered instead of being transparent
+ /// Returns true if the masked part of the tqmask will be rendered instead of being transparent
bool renderMask() const { return m_renderMask; }
/// Set the renderMask property
void setRenderMask(bool b);
@@ -146,7 +146,7 @@ private:
// Layer tqmask related:
// XXX It would be nice to merge the next 2 devices...
KisPaintDeviceSP m_tqmask; // The tqmask that we can edit and display easily
- KisSelectionSP m_tqmaskAsSelection; // The tqmask as selection, to apply and render easily
+ KisSelectionSP m_maskAsSelection; // The tqmask as selection, to apply and render easily
bool m_renderMask;
bool m_editMask;
};
diff --git a/chalk/core/kis_paintop.cc b/chalk/core/kis_paintop.cc
index 71989bd9..bff50cf5 100644
--- a/chalk/core/kis_paintop.cc
+++ b/chalk/core/kis_paintop.cc
@@ -65,14 +65,14 @@ KisPaintDeviceSP KisPaintOp::computeDab(KisAlphaMaskSP tqmask, KisColorSpace *cs
TQ_INT32 pixelSize = colorSpace->pixelSize();
- TQ_INT32 tqmaskWidth = tqmask->width();
- TQ_INT32 tqmaskHeight = tqmask->height();
+ TQ_INT32 maskWidth = tqmask->width();
+ TQ_INT32 maskHeight = tqmask->height();
// Convert the kiscolor to the right colorspace.
kc.convertTo(colorSpace);
- KisHLineIteratorPixel hiter = m_dab->createHLineIterator(0, 0, tqmaskWidth, true);
- for (int y = 0; y < tqmaskHeight; y++)
+ KisHLineIteratorPixel hiter = m_dab->createHLineIterator(0, 0, maskWidth, true);
+ for (int y = 0; y < maskHeight; y++)
{
int x=0;
while(! hiter.isDone())
diff --git a/chalk/core/kis_selection.cc b/chalk/core/kis_selection.cc
index e988eff0..10e96a05 100644
--- a/chalk/core/kis_selection.cc
+++ b/chalk/core/kis_selection.cc
@@ -35,7 +35,7 @@
#include "kis_selection.h"
KisSelection::KisSelection(KisPaintDeviceSP dev)
- : super(dev->tqparentLayer()
+ : super(dev->parentLayer()
, KisMetaRegistry::instance()->csRegistry()->getAlpha8()
, (TQString("selection for ") + dev->name()).latin1())
, m_parentPaintDevice(dev)
@@ -79,7 +79,7 @@ void KisSelection::setSelected(TQ_INT32 x, TQ_INT32 y, TQ_UINT8 s)
*pix = s;
}
-TQImage KisSelection::tqmaskImage()
+TQImage KisSelection::maskImage()
{
// If part of a KisAdjustmentLayer, there may be no tqparent device.
TQImage img;
diff --git a/chalk/core/kis_selection.h b/chalk/core/kis_selection.h
index f41915da..d5323337 100644
--- a/chalk/core/kis_selection.h
+++ b/chalk/core/kis_selection.h
@@ -69,7 +69,7 @@ public:
void setSelected(TQ_INT32 x, TQ_INT32 y, TQ_UINT8 s);
- TQImage tqmaskImage();
+ TQImage maskImage();
void select(TQRect r);
@@ -115,7 +115,7 @@ public:
virtual void setDirty(const TQRect & rc);
virtual void setDirty();
- inline KisPaintDeviceSP tqparentPaintDevice() { return m_parentPaintDevice; }
+ inline KisPaintDeviceSP parentPaintDevice() { return m_parentPaintDevice; }
private:
void paintUniformSelectionRegion(TQImage img, const TQRect& imageRect, const TQRegion& uniformRegion);
diff --git a/chalk/core/kis_transaction.cc b/chalk/core/kis_transaction.cc
index b755c597..d0a10acc 100644
--- a/chalk/core/kis_transaction.cc
+++ b/chalk/core/kis_transaction.cc
@@ -62,7 +62,7 @@ void KisTransaction::execute()
m_private->m_memento->extent(x,y,width,height);
rc.setRect(x + m_private->m_device->getX(), y + m_private->m_device->getY(), width, height);
- KisLayerSP l = m_private->m_device->tqparentLayer();
+ KisLayerSP l = m_private->m_device->parentLayer();
if (l) l->setDirty(rc);
}
@@ -76,7 +76,7 @@ void KisTransaction::unexecute()
m_private->m_memento->extent(x,y,width,height);
rc.setRect(x + m_private->m_device->getX(), y + m_private->m_device->getY(), width, height);
- KisLayerSP l = m_private->m_device->tqparentLayer();
+ KisLayerSP l = m_private->m_device->parentLayer();
if (l) l->setDirty(rc);
}
diff --git a/chalk/core/kis_transform_worker.cc b/chalk/core/kis_transform_worker.cc
index fbc952ea..ae4f4e24 100644
--- a/chalk/core/kis_transform_worker.cc
+++ b/chalk/core/kis_transform_worker.cc
@@ -665,8 +665,8 @@ bool KisTransformWorker::run()
rotateNone(tmpdev3, m_dev);
}
- if (m_dev->tqparentLayer()) {
- m_dev->tqparentLayer()->setDirty();
+ if (m_dev->parentLayer()) {
+ m_dev->parentLayer()->setDirty();
}
//progress info
emit notifyProgressDone();
diff --git a/chalk/core/tiles/kis_tilemanager.h b/chalk/core/tiles/kis_tilemanager.h
index d6886abe..5d388136 100644
--- a/chalk/core/tiles/kis_tilemanager.h
+++ b/chalk/core/tiles/kis_tilemanager.h
@@ -114,7 +114,7 @@ private:
TQMutex * m_swapMutex;
// This is the constant that we will use to see if we want to add a new tempfile
- // We use 1<<30 (one gigabyte) because aptqparently 32bit systems don't really like very
+ // We use 1<<30 (one gigabyte) because apparently 32bit systems don't really like very
// large files.
static const long MaxSwapFileSize = 1<<30; // For debugging purposes: 1<<20 is a megabyte