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_background.cc2
-rw-r--r--chalk/core/kis_background.h2
-rw-r--r--chalk/core/kis_convolution_painter.h4
-rw-r--r--chalk/core/kis_filter.h2
-rw-r--r--chalk/core/kis_histogram.h2
-rw-r--r--chalk/core/kis_image.cc4
-rw-r--r--chalk/core/kis_image.h2
-rw-r--r--chalk/core/kis_iterator.h6
-rw-r--r--chalk/core/kis_layer.cc4
-rw-r--r--chalk/core/kis_layer.h2
-rw-r--r--chalk/core/kis_merge_visitor.h4
-rw-r--r--chalk/core/kis_paint_device.cc6
-rw-r--r--chalk/core/kis_paint_device.h6
-rw-r--r--chalk/core/kis_paint_layer.h2
-rw-r--r--chalk/core/kis_paintop.h4
-rw-r--r--chalk/core/kis_perspective_grid.h4
-rw-r--r--chalk/core/kis_random_accessor.h2
-rw-r--r--chalk/core/kis_substrate.h4
-rw-r--r--chalk/core/kis_types.h30
-rw-r--r--chalk/core/tiles/kis_memento.cc2
-rw-r--r--chalk/core/tiles/kis_memento.h4
-rw-r--r--chalk/core/tiles/kis_tiled_random_accessor.h2
-rw-r--r--chalk/core/tiles/kis_tileddatamanager.cc2
-rw-r--r--chalk/core/tiles/kis_tileddatamanager.h10
-rw-r--r--chalk/core/tiles/kis_tilediterator.cc2
-rw-r--r--chalk/core/tiles/kis_tilediterator.h2
27 files changed, 59 insertions, 59 deletions
diff --git a/chalk/core/kis_alpha_mask.h b/chalk/core/kis_alpha_mask.h
index c19cae59..08c86e23 100644
--- a/chalk/core/kis_alpha_mask.h
+++ b/chalk/core/kis_alpha_mask.h
@@ -31,7 +31,7 @@
* in brush creation. It is not a generic alpha mask that can be used with
* KisPaintDevices: use a KisSelection for that.
*/
-class KisAlphaMask : public KShared {
+class KisAlphaMask : public TDEShared {
public:
/**
diff --git a/chalk/core/kis_background.cc b/chalk/core/kis_background.cc
index 6f881d33..506d49e8 100644
--- a/chalk/core/kis_background.cc
+++ b/chalk/core/kis_background.cc
@@ -20,7 +20,7 @@
#include "kis_integer_maths.h"
KisBackground::KisBackground()
- : KShared()
+ : TDEShared()
{
m_patternTile = TQImage(PATTERN_WIDTH, PATTERN_HEIGHT, 32);
m_patternTile.setAlphaBuffer(false);
diff --git a/chalk/core/kis_background.h b/chalk/core/kis_background.h
index f5b52903..f11645c2 100644
--- a/chalk/core/kis_background.h
+++ b/chalk/core/kis_background.h
@@ -22,7 +22,7 @@
#include <ksharedptr.h>
-class KisBackground : public KShared {
+class KisBackground : public TDEShared {
public:
KisBackground();
diff --git a/chalk/core/kis_convolution_painter.h b/chalk/core/kis_convolution_painter.h
index 8c0b2bba..624a58f7 100644
--- a/chalk/core/kis_convolution_painter.h
+++ b/chalk/core/kis_convolution_painter.h
@@ -35,9 +35,9 @@ enum KisConvolutionBorderOp {
};
class KisKernel;
-typedef KSharedPtr<KisKernel> KisKernelSP;
+typedef TDESharedPtr<KisKernel> KisKernelSP;
-class KisKernel : public KShared
+class KisKernel : public TDEShared
{
public:
diff --git a/chalk/core/kis_filter.h b/chalk/core/kis_filter.h
index 32350fff..534b4c69 100644
--- a/chalk/core/kis_filter.h
+++ b/chalk/core/kis_filter.h
@@ -43,7 +43,7 @@ class TQWidget;
/**
* Basic interface of a Chalk filter.
*/
-class KRITACORE_EXPORT KisFilter : public KisProgressSubject, public KShared {
+class KRITACORE_EXPORT KisFilter : public KisProgressSubject, public TDEShared {
Q_OBJECT
public:
diff --git a/chalk/core/kis_histogram.h b/chalk/core/kis_histogram.h
index 3d315994..a94ac557 100644
--- a/chalk/core/kis_histogram.h
+++ b/chalk/core/kis_histogram.h
@@ -40,7 +40,7 @@ enum enumHistogramType {
* The calculations are done in the range 0 - 1, instead of the native range that a pixel
* might have, so it's not always as precise as it could be. But you can't have it all...
*/
-class KisHistogram : public KShared {
+class KisHistogram : public TDEShared {
public:
/**
diff --git a/chalk/core/kis_image.cc b/chalk/core/kis_image.cc
index a872b3ee..c6af64b6 100644
--- a/chalk/core/kis_image.cc
+++ b/chalk/core/kis_image.cc
@@ -517,14 +517,14 @@ namespace {
}
KisImage::KisImage(KisUndoAdapter *adapter, TQ_INT32 width, TQ_INT32 height, KisColorSpace * colorSpace, const TQString& name)
- : TQObject(0, name.latin1()), KShared()
+ : TQObject(0, name.latin1()), TDEShared()
{
init(adapter, width, height, colorSpace, name);
setName(name);
m_dcop = 0L;
}
-KisImage::KisImage(const KisImage& rhs) : TQObject(), KShared(rhs)
+KisImage::KisImage(const KisImage& rhs) : TQObject(), TDEShared(rhs)
{
m_dcop = 0L;
if (this != &rhs) {
diff --git a/chalk/core/kis_image.h b/chalk/core/kis_image.h
index b3cc4e5a..553806ae 100644
--- a/chalk/core/kis_image.h
+++ b/chalk/core/kis_image.h
@@ -58,7 +58,7 @@ class KisProgressDisplayInterface;
class KisPaintLayer;
class KisPerspectiveGrid;
-class KRITACORE_EXPORT KisImage : public TQObject, public KShared {
+class KRITACORE_EXPORT KisImage : public TQObject, public TDEShared {
Q_OBJECT
diff --git a/chalk/core/kis_iterator.h b/chalk/core/kis_iterator.h
index 893461a5..e74816dd 100644
--- a/chalk/core/kis_iterator.h
+++ b/chalk/core/kis_iterator.h
@@ -23,13 +23,13 @@
#include <ksharedptr.h>
class KisTiledRectIterator;
-typedef KSharedPtr<KisTiledRectIterator> KisTiledRectIteratorSP;
+typedef TDESharedPtr<KisTiledRectIterator> KisTiledRectIteratorSP;
class KisTiledVLineIterator;
-typedef KSharedPtr<KisTiledVLineIterator> KisTiledVLineIteratorSP;
+typedef TDESharedPtr<KisTiledVLineIterator> KisTiledVLineIteratorSP;
class KisTiledHLineIterator;
-typedef KSharedPtr<KisTiledHLineIterator> KisTiledHLineIteratorSP;
+typedef TDESharedPtr<KisTiledHLineIterator> KisTiledHLineIteratorSP;
class KisDataManager;
diff --git a/chalk/core/kis_layer.cc b/chalk/core/kis_layer.cc
index 2b7307e5..f43570f0 100644
--- a/chalk/core/kis_layer.cc
+++ b/chalk/core/kis_layer.cc
@@ -268,7 +268,7 @@ static int getID()
KisLayer::KisLayer(KisImage *img, const TQString &name, TQ_UINT8 opacity) :
TQObject(0, name.latin1()),
- KShared(),
+ TDEShared(),
m_id(getID()),
m_index(-1),
m_opacity(opacity),
@@ -284,7 +284,7 @@ KisLayer::KisLayer(KisImage *img, const TQString &name, TQ_UINT8 opacity) :
KisLayer::KisLayer(const KisLayer& rhs) :
TQObject(),
- KShared(rhs)
+ TDEShared(rhs)
{
if (this != &rhs) {
m_id = getID();
diff --git a/chalk/core/kis_layer.h b/chalk/core/kis_layer.h
index eee2da12..6f99ae68 100644
--- a/chalk/core/kis_layer.h
+++ b/chalk/core/kis_layer.h
@@ -38,7 +38,7 @@ class KisGroupLayer;
* is at the top of the group in the layerlist, using next will iterate to the bottom to last,
* whereas previous will go up to first again.
**/
-class KRITACORE_EXPORT KisLayer : public TQObject, public KShared
+class KRITACORE_EXPORT KisLayer : public TQObject, public TDEShared
{
Q_OBJECT
diff --git a/chalk/core/kis_merge_visitor.h b/chalk/core/kis_merge_visitor.h
index afd8fb37..c682cedc 100644
--- a/chalk/core/kis_merge_visitor.h
+++ b/chalk/core/kis_merge_visitor.h
@@ -57,8 +57,8 @@ public:
private:
// Helper for the indirect painting (keep above to inhibit gcc-2.95 ICE)
template<class Target>
- KSharedPtr<Target> paintIndirect(KisPaintDeviceSP source,
- KSharedPtr<Target> target,
+ TDESharedPtr<Target> paintIndirect(KisPaintDeviceSP source,
+ TDESharedPtr<Target> target,
KisLayerSupportsIndirectPainting* layer,
TQ_INT32 sx, TQ_INT32 sy, TQ_INT32 dx, TQ_INT32 dy,
TQ_INT32 w, TQ_INT32 h) {
diff --git a/chalk/core/kis_paint_device.cc b/chalk/core/kis_paint_device.cc
index c9734819..654caedd 100644
--- a/chalk/core/kis_paint_device.cc
+++ b/chalk/core/kis_paint_device.cc
@@ -202,7 +202,7 @@ namespace {
}
KisPaintDevice::KisPaintDevice(KisColorSpace * colorSpace, const char * name) :
- TQObject(0, name), KShared(), m_exifInfo(0), m_lock( false )
+ TQObject(0, name), TDEShared(), m_exifInfo(0), m_lock( false )
{
if (colorSpace == 0) {
kdWarning(41001) << "Cannot create paint device without colorstrategy!\n";
@@ -237,7 +237,7 @@ KisPaintDevice::KisPaintDevice(KisColorSpace * colorSpace, const char * name) :
}
KisPaintDevice::KisPaintDevice(KisLayer *parent, KisColorSpace * colorSpace, const char * name) :
- TQObject(0, name), KShared(), m_exifInfo(0), m_lock( false )
+ TQObject(0, name), TDEShared(), m_exifInfo(0), m_lock( false )
{
m_longRunningFilterTimer = 0;
@@ -284,7 +284,7 @@ KisPaintDevice::KisPaintDevice(KisLayer *parent, KisColorSpace * colorSpace, con
}
-KisPaintDevice::KisPaintDevice(const KisPaintDevice& rhs) : TQObject(), KShared(rhs)
+KisPaintDevice::KisPaintDevice(const KisPaintDevice& rhs) : TQObject(), TDEShared(rhs)
{
if (this != &rhs) {
m_longRunningFilterTimer = 0;
diff --git a/chalk/core/kis_paint_device.h b/chalk/core/kis_paint_device.h
index 4fe9c8d5..23ce651f 100644
--- a/chalk/core/kis_paint_device.h
+++ b/chalk/core/kis_paint_device.h
@@ -57,10 +57,10 @@ class KisRandomSubAccessorPixel;
class KisUndoAdapter;
class KisFilter;
class KisDataManager;
-typedef KSharedPtr<KisDataManager> KisDataManagerSP;
+typedef TDESharedPtr<KisDataManager> KisDataManagerSP;
class KisMemento;
-typedef KSharedPtr<KisMemento> KisMementoSP;
+typedef TDESharedPtr<KisMemento> KisMementoSP;
/**
@@ -72,7 +72,7 @@ typedef KSharedPtr<KisMemento> KisMementoSP;
*/
class KRITACORE_EXPORT KisPaintDevice
: public TQObject
- , public KShared
+ , public TDEShared
{
Q_OBJECT
diff --git a/chalk/core/kis_paint_layer.h b/chalk/core/kis_paint_layer.h
index af8b1e4c..5f2ba06d 100644
--- a/chalk/core/kis_paint_layer.h
+++ b/chalk/core/kis_paint_layer.h
@@ -151,7 +151,7 @@ private:
bool m_editMask;
};
-typedef KSharedPtr<KisPaintLayer> KisPaintLayerSP;
+typedef TDESharedPtr<KisPaintLayer> KisPaintLayerSP;
#endif // KIS_PAINT_LAYER_H_
diff --git a/chalk/core/kis_paintop.h b/chalk/core/kis_paintop.h
index 668856f7..7fad40ba 100644
--- a/chalk/core/kis_paintop.h
+++ b/chalk/core/kis_paintop.h
@@ -59,7 +59,7 @@ public:
KisVector2D movement;
};
-class KRITACORE_EXPORT KisPaintOp : public KShared
+class KRITACORE_EXPORT KisPaintOp : public TDEShared
{
public:
@@ -108,7 +108,7 @@ public:
* If there is an optionWidget, the derived paintop itself must support settings,
* and it's up to the factory to do that.
*/
-class KisPaintOpFactory : public KShared
+class KisPaintOpFactory : public TDEShared
{
public:
diff --git a/chalk/core/kis_perspective_grid.h b/chalk/core/kis_perspective_grid.h
index 81ec2966..0b8ca99d 100644
--- a/chalk/core/kis_perspective_grid.h
+++ b/chalk/core/kis_perspective_grid.h
@@ -27,12 +27,12 @@
#include <kis_point.h>
#include <ksharedptr.h>
-class KisPerspectiveGridNode : public KisPoint, public KShared {
+class KisPerspectiveGridNode : public KisPoint, public TDEShared {
public:
inline KisPerspectiveGridNode(double x, double y) : KisPoint(x,y) { }
inline KisPerspectiveGridNode(KisPoint p) : KisPoint(p) { }
};
-typedef KSharedPtr<KisPerspectiveGridNode> KisPerspectiveGridNodeSP;
+typedef TDESharedPtr<KisPerspectiveGridNode> KisPerspectiveGridNodeSP;
class KisSubPerspectiveGrid {
public:
diff --git a/chalk/core/kis_random_accessor.h b/chalk/core/kis_random_accessor.h
index 62d90e04..0ec2626e 100644
--- a/chalk/core/kis_random_accessor.h
+++ b/chalk/core/kis_random_accessor.h
@@ -25,7 +25,7 @@
#include <kis_global.h>
class KisTiledRandomAccessor;
-typedef KSharedPtr<KisTiledRandomAccessor> KisTiledRandomAccessorSP;
+typedef TDESharedPtr<KisTiledRandomAccessor> KisTiledRandomAccessorSP;
class KisTiledDataManager;
diff --git a/chalk/core/kis_substrate.h b/chalk/core/kis_substrate.h
index 274f2680..569ed218 100644
--- a/chalk/core/kis_substrate.h
+++ b/chalk/core/kis_substrate.h
@@ -44,11 +44,11 @@ struct KisSubstratePixel {
* or full-size, with specific and cool ways of generating the surface, or
* maybe based on scans of real substrates.
*/
-class KisSubstrate : public KShared {
+class KisSubstrate : public TDEShared {
public:
- KisSubstrate(KisImage * /*img*/) : KShared() {};
+ KisSubstrate(KisImage * /*img*/) : TDEShared() {};
virtual ~KisSubstrate() {};
diff --git a/chalk/core/kis_types.h b/chalk/core/kis_types.h
index b789fdd4..fbfb757f 100644
--- a/chalk/core/kis_types.h
+++ b/chalk/core/kis_types.h
@@ -35,56 +35,56 @@
*/
class KisImage;
-typedef KSharedPtr<KisImage> KisImageSP;
+typedef TDESharedPtr<KisImage> KisImageSP;
class KisPaintDevice;
-typedef KSharedPtr<KisPaintDevice> KisPaintDeviceSP;
+typedef TDESharedPtr<KisPaintDevice> KisPaintDeviceSP;
typedef KisSharedPtrVector<KisPaintDevice> vKisPaintDeviceSP;
typedef vKisPaintDeviceSP::iterator vKisPaintDeviceSP_it;
typedef vKisPaintDeviceSP::const_iterator vKisPaintDeviceSP_cit;
class KisLayer;
-typedef KSharedPtr<KisLayer> KisLayerSP;
+typedef TDESharedPtr<KisLayer> KisLayerSP;
typedef KisSharedPtrVector<KisLayer> vKisLayerSP;
typedef vKisLayerSP::iterator vKisLayerSP_it;
typedef vKisLayerSP::const_iterator vKisLayerSP_cit;
class KisPartLayer;
-typedef KSharedPtr<KisPartLayer> KisPartLayerSP;
+typedef TDESharedPtr<KisPartLayer> KisPartLayerSP;
class KisPaintLayer;
-typedef KSharedPtr<KisPaintLayer> KisPaintLayerSP;
+typedef TDESharedPtr<KisPaintLayer> KisPaintLayerSP;
class KisAdjustmentLayer;
-typedef KSharedPtr<KisAdjustmentLayer> KisAdjustmentLayerSP;
+typedef TDESharedPtr<KisAdjustmentLayer> KisAdjustmentLayerSP;
class KisGroupLayer;
-typedef KSharedPtr<KisGroupLayer> KisGroupLayerSP;
+typedef TDESharedPtr<KisGroupLayer> KisGroupLayerSP;
class KisSelection;
-typedef KSharedPtr<KisSelection> KisSelectionSP;
+typedef TDESharedPtr<KisSelection> KisSelectionSP;
class KisBackground;
-typedef KSharedPtr<KisBackground> KisBackgroundSP;
+typedef TDESharedPtr<KisBackground> KisBackgroundSP;
class KisSubstrate;
-typedef KSharedPtr<KisSubstrate> KisSubstrateSP;
+typedef TDESharedPtr<KisSubstrate> KisSubstrateSP;
class KisHistogram;
-typedef KSharedPtr<KisHistogram> KisHistogramSP;
+typedef TDESharedPtr<KisHistogram> KisHistogramSP;
class KisPaintOpFactory;
-typedef KSharedPtr<KisPaintOpFactory> KisPaintOpFactorySP;
+typedef TDESharedPtr<KisPaintOpFactory> KisPaintOpFactorySP;
typedef TQValueVector<TQPoint> vKisSegments;
//class KisGuide;
-//typedef KSharedPtr<KisGuide> KisGuideSP;
+//typedef TDESharedPtr<KisGuide> KisGuideSP;
class KisAlphaMask;
-typedef KSharedPtr<KisAlphaMask> KisAlphaMaskSP;
+typedef TDESharedPtr<KisAlphaMask> KisAlphaMaskSP;
class KisFilter;
-typedef KSharedPtr<KisFilter> KisFilterSP;
+typedef TDESharedPtr<KisFilter> KisFilterSP;
#endif // KISTYPES_H_
diff --git a/chalk/core/tiles/kis_memento.cc b/chalk/core/tiles/kis_memento.cc
index c67a0476..1181f70a 100644
--- a/chalk/core/tiles/kis_memento.cc
+++ b/chalk/core/tiles/kis_memento.cc
@@ -20,7 +20,7 @@
#include "kis_tile.h"
#include "kis_tile_global.h"
-KisMemento::KisMemento(TQ_UINT32 pixelSize) : KShared()
+KisMemento::KisMemento(TQ_UINT32 pixelSize) : TDEShared()
{
m_hashTable = new KisTile * [1024];
TQ_CHECK_PTR(m_hashTable);
diff --git a/chalk/core/tiles/kis_memento.h b/chalk/core/tiles/kis_memento.h
index 3213a490..75739853 100644
--- a/chalk/core/tiles/kis_memento.h
+++ b/chalk/core/tiles/kis_memento.h
@@ -28,9 +28,9 @@ class KisTile;
class KisTiledDataManager;
class KisMemento;
-typedef KSharedPtr<KisMemento> KisMementoSP;
+typedef TDESharedPtr<KisMemento> KisMementoSP;
-class KisMemento : public KShared
+class KisMemento : public TDEShared
{
public:
KisMemento(TQ_UINT32 pixelSize);
diff --git a/chalk/core/tiles/kis_tiled_random_accessor.h b/chalk/core/tiles/kis_tiled_random_accessor.h
index 23768ee6..207f4313 100644
--- a/chalk/core/tiles/kis_tiled_random_accessor.h
+++ b/chalk/core/tiles/kis_tiled_random_accessor.h
@@ -27,7 +27,7 @@
class KisTile;
-class KisTiledRandomAccessor : public KShared {
+class KisTiledRandomAccessor : public TDEShared {
struct KisTileInfo {
KisTile* tile;
KisTile* oldtile;
diff --git a/chalk/core/tiles/kis_tileddatamanager.cc b/chalk/core/tiles/kis_tileddatamanager.cc
index 6d99dc93..4586903c 100644
--- a/chalk/core/tiles/kis_tileddatamanager.cc
+++ b/chalk/core/tiles/kis_tileddatamanager.cc
@@ -61,7 +61,7 @@ KisTiledDataManager::KisTiledDataManager(TQ_UINT32 pixelSize, const TQ_UINT8 *de
}
KisTiledDataManager::KisTiledDataManager(const KisTiledDataManager & dm)
- : KShared()
+ : TDEShared()
{
m_pixelSize = dm.m_pixelSize;
diff --git a/chalk/core/tiles/kis_tileddatamanager.h b/chalk/core/tiles/kis_tileddatamanager.h
index 20d78085..539a9ae1 100644
--- a/chalk/core/tiles/kis_tileddatamanager.h
+++ b/chalk/core/tiles/kis_tileddatamanager.h
@@ -28,16 +28,16 @@
#include "kis_memento.h"
class KisTiledDataManager;
-typedef KSharedPtr<KisTiledDataManager> KisTiledDataManagerSP;
+typedef TDESharedPtr<KisTiledDataManager> KisTiledDataManagerSP;
class KisDataManager;
-typedef KSharedPtr<KisDataManager> KisDataManagerSP;
+typedef TDESharedPtr<KisDataManager> KisDataManagerSP;
class KisTiledIterator;
class KisTiledRandomAccessor;
class KoStore;
-class KisTileDataWrapper : public KShared {
+class KisTileDataWrapper : public TDEShared {
KisTile* m_tile;
TQ_INT32 m_offset;
public:
@@ -46,7 +46,7 @@ public:
TQ_UINT8* data() const { return m_tile->data() + m_offset; }
};
-typedef KSharedPtr<KisTileDataWrapper> KisTileDataWrapperSP;
+typedef TDESharedPtr<KisTileDataWrapper> KisTileDataWrapperSP;
/**
* KisTiledDataManager implements the interface that KisDataManager defines
@@ -64,7 +64,7 @@ typedef KSharedPtr<KisTileDataWrapper> KisTileDataWrapperSP;
* how many TQ_UINT8's a single pixel takes.
*/
-class KisTiledDataManager : public KShared {
+class KisTiledDataManager : public TDEShared {
protected:
KisTiledDataManager(TQ_UINT32 pixelSize, const TQ_UINT8 *defPixel);
diff --git a/chalk/core/tiles/kis_tilediterator.cc b/chalk/core/tiles/kis_tilediterator.cc
index d6205f5a..0f3bdf00 100644
--- a/chalk/core/tiles/kis_tilediterator.cc
+++ b/chalk/core/tiles/kis_tilediterator.cc
@@ -44,7 +44,7 @@ KisTiledIterator::~KisTiledIterator( )
}
KisTiledIterator::KisTiledIterator(const KisTiledIterator& rhs)
- : KShared()
+ : TDEShared()
{
if (this != &rhs) {
m_ktm = rhs.m_ktm;
diff --git a/chalk/core/tiles/kis_tilediterator.h b/chalk/core/tiles/kis_tilediterator.h
index 958876cd..6bb63c9b 100644
--- a/chalk/core/tiles/kis_tilediterator.h
+++ b/chalk/core/tiles/kis_tilediterator.h
@@ -28,7 +28,7 @@
/**
* The KisIterator class iterates through the pixels of a KisPaintDevice hiding the tile structure
*/
-class KRITACORE_EXPORT KisTiledIterator : public KShared {
+class KRITACORE_EXPORT KisTiledIterator : public TDEShared {
protected:
KisTiledDataManager *m_ktm;
generated by cgit v1.2.1 (git 2.18.0) at 2024-10-10 22:34:33 +0000