diff options
Diffstat (limited to 'chalk')
39 files changed, 109 insertions, 109 deletions
diff --git a/chalk/chalkcolor/kis_channelinfo.h b/chalk/chalkcolor/kis_channelinfo.h index f8ec8301..70cbd37a 100644 --- a/chalk/chalkcolor/kis_channelinfo.h +++ b/chalk/chalkcolor/kis_channelinfo.h @@ -27,7 +27,7 @@ * that is, one of the components that makes up a particular * pixel. */ -class KisChannelInfo : public KShared { +class KisChannelInfo : public TDEShared { public: enum enumChannelType { COLOR, // The channel represents a color diff --git a/chalk/chalkcolor/kis_histogram_producer.h b/chalk/chalkcolor/kis_histogram_producer.h index 2d25b354..0849f4ab 100644 --- a/chalk/chalkcolor/kis_histogram_producer.h +++ b/chalk/chalkcolor/kis_histogram_producer.h @@ -47,7 +47,7 @@ class KisChannelInfo; * in which they are found in the channels() method. This is potentially different from * the order in which they are internally ordered! **/ -class KisHistogramProducer : public KShared { +class KisHistogramProducer : public TDEShared { public: KisHistogramProducer() : m_skipTransparent(true), m_skipUnselected(true) {} virtual ~KisHistogramProducer() {} @@ -93,7 +93,7 @@ protected: bool m_skipUnselected; }; -typedef KSharedPtr<KisHistogramProducer> KisHistogramProducerSP; +typedef TDESharedPtr<KisHistogramProducer> KisHistogramProducerSP; class KisHistogramProducerFactory { public: 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; diff --git a/chalk/doc/colorspaces.xmi b/chalk/doc/colorspaces.xmi index 51523e7a..c103b208 100644 --- a/chalk/doc/colorspaces.xmi +++ b/chalk/doc/colorspaces.xmi @@ -492,7 +492,7 @@ model together." isSpecification="false" isLeaf="false" visibility="protected" x <UML:Class stereotype="16" isSpecification="false" isLeaf="false" visibility="public" xmi.id="237" isRoot="false" isAbstract="false" name="TransformMap" /> </UML:Namespace.ownedElement> </UML:Class> - <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="27" isRoot="false" isAbstract="false" name="KShared" /> + <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="27" isRoot="false" isAbstract="false" name="TDEShared" /> <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="33" isRoot="false" isAbstract="false" name="KisID" /> <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="36" isRoot="false" isAbstract="false" name="DWORD" /> <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="38" isRoot="false" isAbstract="false" name="icColorSpaceSignature" /> @@ -6044,7 +6044,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" <header> <codecomment tag="" /> </header> - <ccfdeclarationcodeblock parent_id="28" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KShared = new KShared ( );" > + <ccfdeclarationcodeblock parent_id="28" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public TDEShared = new TDEShared ( );" > <header> <codecomment tag="" writeOutText="false" indentLevel="1" /> </header> @@ -6061,12 +6061,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" </codeaccessormethod> <codeaccessormethod accessType="2" parent_id="28" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="28" role_id="0" text=".add(value);" > <header> - <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KShared to the List &#010;&#010;@return void" /> + <javacodedocumentation tag="" indentLevel="1" text="Add an object of type TDEShared to the List &#010;&#010;@return void" /> </header> </codeaccessormethod> <codeaccessormethod accessType="3" parent_id="28" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="28" role_id="0" text=".remove(value);" > <header> - <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KShared from the List &#010;" /> + <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type TDEShared from the List &#010;" /> </header> </codeaccessormethod> <codeaccessormethod accessType="4" parent_id="28" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="28" role_id="0" text="return (List) ;" > @@ -6512,7 +6512,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" </codeclassfield> </classfields> </classifiercodedocument> - <classifiercodedocument writeOutCode="true" package="" id="27" parent_class="27" fileExt=".java" fileName="KShared" > + <classifiercodedocument writeOutCode="true" package="" id="27" parent_class="27" fileExt=".java" fileName="TDEShared" > <textblocks> <codeblockwithcomments tag="packages" writeOutText="false" > <header> @@ -6526,7 +6526,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" </codeblockwithcomments> <javaclassdeclarationblock parent_id="27" tag="ClassDeclBlock" canDelete="false" > <header> - <javacodedocumentation tag="" text="Class KShared&#010;" /> + <javacodedocumentation tag="" text="Class TDEShared&#010;" /> </header> <textblocks> <hierarchicalcodeblock tag="fieldsDecl" canDelete="false" indentLevel="1" > @@ -6545,7 +6545,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" <codecomment tag="" indentLevel="1" text="Constructors" /> </header> <textblocks> - <codeblockwithcomments tag="emptyconstructor" writeOutText="false" indentLevel="1" text="public KShared ( ) { }" > + <codeblockwithcomments tag="emptyconstructor" writeOutText="false" indentLevel="1" text="public TDEShared ( ) { }" > <header> <codecomment tag="" indentLevel="1" text="Empty Constructor" /> </header> @@ -26627,7 +26627,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" </codeblockwithcomments> <cppheaderclassdeclarationblock parent_id="27" tag="classDeclarationBlock" canDelete="false" > <header> - <cppcodedocumentation tag="" text="Class KShared&#010;" /> + <cppcodedocumentation tag="" text="Class TDEShared&#010;" /> </header> <textblocks> <hierarchicalcodeblock tag="publicBlock" canDelete="false" > @@ -26651,7 +26651,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" <cppcodedocumentation tag="" indentLevel="1" text="Constructors" /> </header> <textblocks> - <codeblockwithcomments tag="emptyconstructor" indentLevel="1" text="KShared ( ) { }" > + <codeblockwithcomments tag="emptyconstructor" indentLevel="1" text="TDEShared ( ) { }" > <header> <cppcodedocumentation tag="" indentLevel="1" text="Empty Constructor" /> </header> diff --git a/chalk/doc/controller.xmi b/chalk/doc/controller.xmi index c2af5136..7c15e5f8 100644 --- a/chalk/doc/controller.xmi +++ b/chalk/doc/controller.xmi @@ -2055,7 +2055,7 @@ That last bit has not been solved yet. </UML:Operation> </UML:Classifier.feature> </UML:Class> - <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="542" isRoot="false" isAbstract="false" name="KShared" /> + <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="542" isRoot="false" isAbstract="false" name="TDEShared" /> <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="548" isRoot="false" isAbstract="false" name=TQSTRING_OBJECT_NAME_STRING /> <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="558" isRoot="false" isAbstract="false" name="bool" /> <UML:Class stereotype="362" isSpecification="false" isLeaf="false" visibility="public" xmi.id="570" isRoot="false" isAbstract="false" name="KisIDList" /> @@ -7942,7 +7942,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <header> <codecomment tag="" /> </header> - <ccfdeclarationcodeblock parent_id="964" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KShared = new KShared ( );" > + <ccfdeclarationcodeblock parent_id="964" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public TDEShared = new TDEShared ( );" > <header> <codecomment tag="" writeOutText="false" indentLevel="1" /> </header> @@ -7959,12 +7959,12 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f </codeaccessormethod> <codeaccessormethod accessType="2" parent_id="964" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="964" role_id="0" text=".add(value);" > <header> - <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KShared to the List &#010;&#010;@return void" /> + <javacodedocumentation tag="" indentLevel="1" text="Add an object of type TDEShared to the List &#010;&#010;@return void" /> </header> </codeaccessormethod> <codeaccessormethod accessType="3" parent_id="964" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="964" role_id="0" text=".remove(value);" > <header> - <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KShared from the List &#010;" /> + <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type TDEShared from the List &#010;" /> </header> </codeaccessormethod> <codeaccessormethod accessType="4" parent_id="964" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="964" role_id="0" text="return (List) ;" > @@ -9436,7 +9436,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <header> <codecomment tag="" /> </header> - <ccfdeclarationcodeblock parent_id="1436" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KShared = new KShared ( );" > + <ccfdeclarationcodeblock parent_id="1436" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public TDEShared = new TDEShared ( );" > <header> <codecomment tag="" writeOutText="false" indentLevel="1" /> </header> @@ -9453,12 +9453,12 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f </codeaccessormethod> <codeaccessormethod accessType="2" parent_id="1436" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1436" role_id="0" text=".add(value);" > <header> - <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KShared to the List &#010;&#010;@return void" /> + <javacodedocumentation tag="" indentLevel="1" text="Add an object of type TDEShared to the List &#010;&#010;@return void" /> </header> </codeaccessormethod> <codeaccessormethod accessType="3" parent_id="1436" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1436" role_id="0" text=".remove(value);" > <header> - <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KShared from the List &#010;" /> + <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type TDEShared from the List &#010;" /> </header> </codeaccessormethod> <codeaccessormethod accessType="4" parent_id="1436" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1436" role_id="0" text="return (List) ;" > @@ -13261,7 +13261,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <header> <codecomment tag="" /> </header> - <ccfdeclarationcodeblock parent_id="673" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KShared = new KShared ( );" > + <ccfdeclarationcodeblock parent_id="673" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public TDEShared = new TDEShared ( );" > <header> <codecomment tag="" writeOutText="false" indentLevel="1" /> </header> @@ -13278,12 +13278,12 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f </codeaccessormethod> <codeaccessormethod accessType="2" parent_id="673" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="673" role_id="0" text=".add(value);" > <header> - <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KShared to the List &#010;&#010;@return void" /> + <javacodedocumentation tag="" indentLevel="1" text="Add an object of type TDEShared to the List &#010;&#010;@return void" /> </header> </codeaccessormethod> <codeaccessormethod accessType="3" parent_id="673" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="673" role_id="0" text=".remove(value);" > <header> - <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KShared from the List &#010;" /> + <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type TDEShared from the List &#010;" /> </header> </codeaccessormethod> <codeaccessormethod accessType="4" parent_id="673" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="673" role_id="0" text="return (List) ;" > @@ -14235,7 +14235,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <header> <codecomment tag="" /> </header> - <ccfdeclarationcodeblock parent_id="920" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KShared = new KShared ( );" > + <ccfdeclarationcodeblock parent_id="920" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public TDEShared = new TDEShared ( );" > <header> <codecomment tag="" writeOutText="false" indentLevel="1" /> </header> @@ -14252,12 +14252,12 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f </codeaccessormethod> <codeaccessormethod accessType="2" parent_id="920" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="920" role_id="0" text=".add(value);" > <header> - <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KShared to the List &#010;&#010;@return void" /> + <javacodedocumentation tag="" indentLevel="1" text="Add an object of type TDEShared to the List &#010;&#010;@return void" /> </header> </codeaccessormethod> <codeaccessormethod accessType="3" parent_id="920" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="920" role_id="0" text=".remove(value);" > <header> - <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KShared from the List &#010;" /> + <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type TDEShared from the List &#010;" /> </header> </codeaccessormethod> <codeaccessormethod accessType="4" parent_id="920" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="920" role_id="0" text="return (List) ;" > @@ -15099,7 +15099,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <header> <codecomment tag="" /> </header> - <ccfdeclarationcodeblock parent_id="656" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KShared = new KShared ( );" > + <ccfdeclarationcodeblock parent_id="656" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public TDEShared = new TDEShared ( );" > <header> <codecomment tag="" writeOutText="false" indentLevel="1" /> </header> @@ -15116,12 +15116,12 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f </codeaccessormethod> <codeaccessormethod accessType="2" parent_id="656" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="656" role_id="0" text=".add(value);" > <header> - <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KShared to the List &#010;&#010;@return void" /> + <javacodedocumentation tag="" indentLevel="1" text="Add an object of type TDEShared to the List &#010;&#010;@return void" /> </header> </codeaccessormethod> <codeaccessormethod accessType="3" parent_id="656" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="656" role_id="0" text=".remove(value);" > <header> - <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KShared from the List &#010;" /> + <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type TDEShared from the List &#010;" /> </header> </codeaccessormethod> <codeaccessormethod accessType="4" parent_id="656" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="656" role_id="0" text="return (List) ;" > @@ -17605,7 +17605,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <header> <codecomment tag="" /> </header> - <ccfdeclarationcodeblock parent_id="543" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KShared = new KShared ( );" > + <ccfdeclarationcodeblock parent_id="543" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public TDEShared = new TDEShared ( );" > <header> <codecomment tag="" writeOutText="false" indentLevel="1" /> </header> @@ -17622,12 +17622,12 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f </codeaccessormethod> <codeaccessormethod accessType="2" parent_id="543" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="543" role_id="0" text=".add(value);" > <header> - <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KShared to the List &#010;&#010;@return void" /> + <javacodedocumentation tag="" indentLevel="1" text="Add an object of type TDEShared to the List &#010;&#010;@return void" /> </header> </codeaccessormethod> <codeaccessormethod accessType="3" parent_id="543" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="543" role_id="0" text=".remove(value);" > <header> - <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KShared from the List &#010;" /> + <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type TDEShared from the List &#010;" /> </header> </codeaccessormethod> <codeaccessormethod accessType="4" parent_id="543" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="543" role_id="0" text="return (List) ;" > @@ -17678,7 +17678,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f </codeclassfield> </classfields> </classifiercodedocument> - <classifiercodedocument writeOutCode="true" package="" id="542" parent_class="542" fileExt=".java" fileName="KShared" > + <classifiercodedocument writeOutCode="true" package="" id="542" parent_class="542" fileExt=".java" fileName="TDEShared" > <textblocks> <codeblockwithcomments tag="packages" writeOutText="false" > <header> @@ -17692,7 +17692,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f </codeblockwithcomments> <javaclassdeclarationblock parent_id="542" tag="ClassDeclBlock" canDelete="false" > <header> - <javacodedocumentation tag="" text="Class KShared&#010;" /> + <javacodedocumentation tag="" text="Class TDEShared&#010;" /> </header> <textblocks> <hierarchicalcodeblock tag="fieldsDecl" canDelete="false" indentLevel="1" > @@ -17711,7 +17711,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <codecomment tag="" indentLevel="1" text="Constructors" /> </header> <textblocks> - <codeblockwithcomments tag="emptyconstructor" writeOutText="false" indentLevel="1" text="public KShared ( ) { }" > + <codeblockwithcomments tag="emptyconstructor" writeOutText="false" indentLevel="1" text="public TDEShared ( ) { }" > <header> <codecomment tag="" indentLevel="1" text="Empty Constructor" /> </header> diff --git a/chalk/doc/histograms.xmi b/chalk/doc/histograms.xmi index 8b767b23..fb6bc511 100644 --- a/chalk/doc/histograms.xmi +++ b/chalk/doc/histograms.xmi @@ -259,7 +259,7 @@ The producer may only read the iterator, it may safely be constructed with write </UML:Operation> </UML:Classifier.feature> </UML:Class> - <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="15" isRoot="false" isAbstract="false" name="KShared" /> + <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="15" isRoot="false" isAbstract="false" name="TDEShared" /> <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="26" isRoot="false" isAbstract="false" name="KisColorSpace" /> <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="37" isRoot="false" isAbstract="false" name="KisID" /> <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="40" isRoot="false" isAbstract="false" name="QValueVector" /> diff --git a/chalk/plugins/viewplugins/substrate/kis_repeating_substrate.h b/chalk/plugins/viewplugins/substrate/kis_repeating_substrate.h index 1a229dc1..0aac3fc8 100644 --- a/chalk/plugins/viewplugins/substrate/kis_repeating_substrate.h +++ b/chalk/plugins/viewplugins/substrate/kis_repeating_substrate.h @@ -43,11 +43,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/sdk/kis_annotation.h b/chalk/sdk/kis_annotation.h index 0753af8f..2ba814d1 100644 --- a/chalk/sdk/kis_annotation.h +++ b/chalk/sdk/kis_annotation.h @@ -40,7 +40,7 @@ * * Examples of annotations are EXIF data and ICC profiles. */ -class KisAnnotation : public KShared { +class KisAnnotation : public TDEShared { public: @@ -81,7 +81,7 @@ private: }; -typedef KSharedPtr<KisAnnotation> KisAnnotationSP; +typedef TDESharedPtr<KisAnnotation> KisAnnotationSP; typedef KisSharedPtrVector<KisAnnotation> vKisAnnotationSP; typedef vKisAnnotationSP::iterator vKisAnnotationSP_it; typedef vKisAnnotationSP::const_iterator vKisAnnotationSP_cit; diff --git a/chalk/sdk/kis_shared_ptr_vector.h b/chalk/sdk/kis_shared_ptr_vector.h index ee7961ae..0e7c99e8 100644 --- a/chalk/sdk/kis_shared_ptr_vector.h +++ b/chalk/sdk/kis_shared_ptr_vector.h @@ -25,15 +25,15 @@ /** * TQValueVector does not always destroy an element when it is erased. - * If the items it is holding are KSharedPtr, this can result in hidden + * If the items it is holding are TDESharedPtr, this can result in hidden * references to objects that cannot be accounted for. This class - * sets the KSharedPtr to 0 on erase, which dereferences the object as + * sets the TDESharedPtr to 0 on erase, which dereferences the object as * expected. */ template <class T> -class KisSharedPtrVector : public TQValueVector< KSharedPtr<T> > +class KisSharedPtrVector : public TQValueVector< TDESharedPtr<T> > { - typedef TQValueVector< KSharedPtr<T> > super; + typedef TQValueVector< TDESharedPtr<T> > super; public: KisSharedPtrVector() {} @@ -57,7 +57,7 @@ public: return super::erase(first, last); } - bool contains(KSharedPtr<T> ptr) const + bool contains(TDESharedPtr<T> ptr) const { for (int i = 0, n = super::count(); i < n; ++i) if (super::at(i) == ptr) diff --git a/chalk/ui/kis_opengl_image_context.h b/chalk/ui/kis_opengl_image_context.h index 84cbea45..6bdca958 100644 --- a/chalk/ui/kis_opengl_image_context.h +++ b/chalk/ui/kis_opengl_image_context.h @@ -37,10 +37,10 @@ class TQRegion; class KisOpenGLImageContext; -typedef KSharedPtr<KisOpenGLImageContext> KisOpenGLImageContextSP; +typedef TDESharedPtr<KisOpenGLImageContext> KisOpenGLImageContextSP; class KisColorSpace; -class KRITACORE_EXPORT KisOpenGLImageContext : public TQObject , public KShared { +class KRITACORE_EXPORT KisOpenGLImageContext : public TQObject , public TDEShared { Q_OBJECT diff --git a/chalk/ui/kis_tool.h b/chalk/ui/kis_tool.h index fb79325a..cd9cc424 100644 --- a/chalk/ui/kis_tool.h +++ b/chalk/ui/kis_tool.h @@ -58,7 +58,7 @@ enum enumToolType { const TQ_UINT8 NUMBER_OF_TOOLTYPES = 6; -class KisTool : public TQObject, public KisCanvasObserver, public KShared { +class KisTool : public TQObject, public KisCanvasObserver, public TDEShared { Q_OBJECT diff --git a/chalk/ui/kis_tool_factory.h b/chalk/ui/kis_tool_factory.h index da1239e3..90240f0c 100644 --- a/chalk/ui/kis_tool_factory.h +++ b/chalk/ui/kis_tool_factory.h @@ -25,7 +25,7 @@ #include "kis_types.h" #include "kactioncollection.h" -class KisToolFactory : public KShared +class KisToolFactory : public TDEShared { public: diff --git a/chalk/ui/kis_tool_types.h b/chalk/ui/kis_tool_types.h index 4811f75e..9dcb9e9f 100644 --- a/chalk/ui/kis_tool_types.h +++ b/chalk/ui/kis_tool_types.h @@ -23,12 +23,12 @@ class KisTool; -typedef KSharedPtr<KisTool> KisToolSP; +typedef TDESharedPtr<KisTool> KisToolSP; typedef KisSharedPtrVector<KisTool> vKisTool; typedef vKisTool::iterator vKisTool_it; typedef vKisTool::const_iterator vKisTool_cit; class KisToolFactory; -typedef KSharedPtr<KisToolFactory> KisToolFactorySP; +typedef TDESharedPtr<KisToolFactory> KisToolFactorySP; #endif // KIS_TOOL_TYPES_H_ |