TDE
/
koffice
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/koffice
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KShared

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent af2ab9c988
commit f705567476
126 changed files with 600 additions and 600 deletions
Show Stats Download Patch File Download Diff File

2
chalk/chalkcolor/kis_channelinfo.h
Unescape View File

@ -27,7 +27,7 @@
* that is, one of the components that makes up a particular * that is, one of the components that makes up a particular
* pixel. * pixel.
*/ */
class KisChannelInfo : public KShared { class KisChannelInfo : public TDEShared {
public: public:
enum enumChannelType { enum enumChannelType {
COLOR, // The channel represents a color COLOR, // The channel represents a color

4
chalk/chalkcolor/kis_histogram_producer.h
Unescape View File

@ -47,7 +47,7 @@ class KisChannelInfo;
* in which they are found in the channels() method. This is potentially different from * in which they are found in the channels() method. This is potentially different from
* the order in which they are internally ordered! * the order in which they are internally ordered!
**/ **/
class KisHistogramProducer : public KShared { class KisHistogramProducer : public TDEShared {
public: public:
KisHistogramProducer() : m_skipTransparent(true), m_skipUnselected(true) {} KisHistogramProducer() : m_skipTransparent(true), m_skipUnselected(true) {}
virtual ~KisHistogramProducer() {} virtual ~KisHistogramProducer() {}
@ -93,7 +93,7 @@ protected:
bool m_skipUnselected; bool m_skipUnselected;
}; };
typedef KSharedPtr<KisHistogramProducer> KisHistogramProducerSP; typedef TDESharedPtr<KisHistogramProducer> KisHistogramProducerSP;
class KisHistogramProducerFactory { class KisHistogramProducerFactory {
public: public:

2
chalk/core/kis_alpha_mask.h
Unescape View File

@ -31,7 +31,7 @@
* in brush creation. It is not a generic alpha mask that can be used with * in brush creation. It is not a generic alpha mask that can be used with
* KisPaintDevices: use a KisSelection for that. * KisPaintDevices: use a KisSelection for that.
*/ */
class KisAlphaMask : public KShared { class KisAlphaMask : public TDEShared {
public: public:
/** /**

2
chalk/core/kis_background.cc
Unescape View File

@ -20,7 +20,7 @@
#include "kis_integer_maths.h" #include "kis_integer_maths.h"
KisBackground::KisBackground() KisBackground::KisBackground()
: KShared() : TDEShared()
{ {
m_patternTile = TQImage(PATTERN_WIDTH, PATTERN_HEIGHT, 32); m_patternTile = TQImage(PATTERN_WIDTH, PATTERN_HEIGHT, 32);
m_patternTile.setAlphaBuffer(false); m_patternTile.setAlphaBuffer(false);

2
chalk/core/kis_background.h
Unescape View File

@ -22,7 +22,7 @@
#include <ksharedptr.h> #include <ksharedptr.h>
class KisBackground : public KShared { class KisBackground : public TDEShared {
public: public:
KisBackground(); KisBackground();

4
chalk/core/kis_convolution_painter.h
Unescape View File

@ -35,9 +35,9 @@ enum KisConvolutionBorderOp {
}; };
class KisKernel; class KisKernel;
typedef KSharedPtr<KisKernel> KisKernelSP; typedef TDESharedPtr<KisKernel> KisKernelSP;
class KisKernel : public KShared class KisKernel : public TDEShared
{ {
public: public:

2
chalk/core/kis_filter.h
Unescape View File

@ -43,7 +43,7 @@ class TQWidget;
/** /**
* Basic interface of a Chalk filter. * Basic interface of a Chalk filter.
*/ */
class KRITACORE_EXPORT KisFilter : public KisProgressSubject, public KShared { class KRITACORE_EXPORT KisFilter : public KisProgressSubject, public TDEShared {
Q_OBJECT Q_OBJECT
public: public:

2
chalk/core/kis_histogram.h
Unescape View File

@ -40,7 +40,7 @@ enum enumHistogramType {
* The calculations are done in the range 0 - 1, instead of the native range that a pixel * 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... * 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: public:
/** /**

4
chalk/core/kis_image.cc
Unescape View File

@ -517,14 +517,14 @@ namespace {
} }
KisImage::KisImage(KisUndoAdapter *adapter, TQ_INT32 width, TQ_INT32 height, KisColorSpace * colorSpace, const TQString& name) 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); init(adapter, width, height, colorSpace, name);
setName(name); setName(name);
m_dcop = 0L; m_dcop = 0L;
} }
KisImage::KisImage(const KisImage& rhs) : TQObject(), KShared(rhs) KisImage::KisImage(const KisImage& rhs) : TQObject(), TDEShared(rhs)
{ {
m_dcop = 0L; m_dcop = 0L;
if (this != &rhs) { if (this != &rhs) {

2
chalk/core/kis_image.h
Unescape View File

@ -58,7 +58,7 @@ class KisProgressDisplayInterface;
class KisPaintLayer; class KisPaintLayer;
class KisPerspectiveGrid; class KisPerspectiveGrid;
class KRITACORE_EXPORT KisImage : public TQObject, public KShared { class KRITACORE_EXPORT KisImage : public TQObject, public TDEShared {
Q_OBJECT Q_OBJECT

6
chalk/core/kis_iterator.h
Unescape View File

@ -23,13 +23,13 @@
#include <ksharedptr.h> #include <ksharedptr.h>
class KisTiledRectIterator; class KisTiledRectIterator;
typedef KSharedPtr<KisTiledRectIterator> KisTiledRectIteratorSP; typedef TDESharedPtr<KisTiledRectIterator> KisTiledRectIteratorSP;
class KisTiledVLineIterator; class KisTiledVLineIterator;
typedef KSharedPtr<KisTiledVLineIterator> KisTiledVLineIteratorSP; typedef TDESharedPtr<KisTiledVLineIterator> KisTiledVLineIteratorSP;
class KisTiledHLineIterator; class KisTiledHLineIterator;
typedef KSharedPtr<KisTiledHLineIterator> KisTiledHLineIteratorSP; typedef TDESharedPtr<KisTiledHLineIterator> KisTiledHLineIteratorSP;
class KisDataManager; class KisDataManager;

4
chalk/core/kis_layer.cc
Unescape View File

@ -268,7 +268,7 @@ static int getID()
KisLayer::KisLayer(KisImage *img, const TQString &name, TQ_UINT8 opacity) : KisLayer::KisLayer(KisImage *img, const TQString &name, TQ_UINT8 opacity) :
TQObject(0, name.latin1()), TQObject(0, name.latin1()),
KShared(), TDEShared(),
m_id(getID()), m_id(getID()),
m_index(-1), m_index(-1),
m_opacity(opacity), m_opacity(opacity),
@ -284,7 +284,7 @@ KisLayer::KisLayer(KisImage *img, const TQString &name, TQ_UINT8 opacity) :
KisLayer::KisLayer(const KisLayer& rhs) : KisLayer::KisLayer(const KisLayer& rhs) :
TQObject(), TQObject(),
KShared(rhs) TDEShared(rhs)
{ {
if (this != &rhs) { if (this != &rhs) {
m_id = getID(); m_id = getID();

2
chalk/core/kis_layer.h
Unescape View File

@ -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, * 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. * 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 Q_OBJECT

4
chalk/core/kis_merge_visitor.h
Unescape View File

@ -57,8 +57,8 @@ public:
private: private:
// Helper for the indirect painting (keep above to inhibit gcc-2.95 ICE) // Helper for the indirect painting (keep above to inhibit gcc-2.95 ICE)
template<class Target> template<class Target>
KSharedPtr<Target> paintIndirect(KisPaintDeviceSP source, TDESharedPtr<Target> paintIndirect(KisPaintDeviceSP source,
KSharedPtr<Target> target, TDESharedPtr<Target> target,
KisLayerSupportsIndirectPainting* layer, KisLayerSupportsIndirectPainting* layer,
TQ_INT32 sx, TQ_INT32 sy, TQ_INT32 dx, TQ_INT32 dy, TQ_INT32 sx, TQ_INT32 sy, TQ_INT32 dx, TQ_INT32 dy,
TQ_INT32 w, TQ_INT32 h) { TQ_INT32 w, TQ_INT32 h) {

6
chalk/core/kis_paint_device.cc
Unescape View File

@ -202,7 +202,7 @@ namespace {
} }
KisPaintDevice::KisPaintDevice(KisColorSpace * colorSpace, const char * name) : 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) { if (colorSpace == 0) {
kdWarning(41001) << "Cannot create paint device without colorstrategy!\n"; 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) : 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; 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) { if (this != &rhs) {
m_longRunningFilterTimer = 0; m_longRunningFilterTimer = 0;

6
chalk/core/kis_paint_device.h
Unescape View File

@ -57,10 +57,10 @@ class KisRandomSubAccessorPixel;
class KisUndoAdapter; class KisUndoAdapter;
class KisFilter; class KisFilter;
class KisDataManager; class KisDataManager;
typedef KSharedPtr<KisDataManager> KisDataManagerSP; typedef TDESharedPtr<KisDataManager> KisDataManagerSP;
class KisMemento; class KisMemento;
typedef KSharedPtr<KisMemento> KisMementoSP; typedef TDESharedPtr<KisMemento> KisMementoSP;
/** /**
@ -72,7 +72,7 @@ typedef KSharedPtr<KisMemento> KisMementoSP;
*/ */
class KRITACORE_EXPORT KisPaintDevice class KRITACORE_EXPORT KisPaintDevice
: public TQObject : public TQObject
, public KShared , public TDEShared
{ {
Q_OBJECT Q_OBJECT

2
chalk/core/kis_paint_layer.h
Unescape View File

@ -151,7 +151,7 @@ private:
bool m_editMask; bool m_editMask;
}; };
typedef KSharedPtr<KisPaintLayer> KisPaintLayerSP; typedef TDESharedPtr<KisPaintLayer> KisPaintLayerSP;
#endif // KIS_PAINT_LAYER_H_ #endif // KIS_PAINT_LAYER_H_

4
chalk/core/kis_paintop.h
Unescape View File

@ -59,7 +59,7 @@ public:
KisVector2D movement; KisVector2D movement;
}; };
class KRITACORE_EXPORT KisPaintOp : public KShared class KRITACORE_EXPORT KisPaintOp : public TDEShared
{ {
public: public:
@ -108,7 +108,7 @@ public:
* If there is an optionWidget, the derived paintop itself must support settings, * If there is an optionWidget, the derived paintop itself must support settings,
* and it's up to the factory to do that. * and it's up to the factory to do that.
*/ */
class KisPaintOpFactory : public KShared class KisPaintOpFactory : public TDEShared
{ {
public: public:

4
chalk/core/kis_perspective_grid.h
Unescape View File

@ -27,12 +27,12 @@
#include <kis_point.h> #include <kis_point.h>
#include <ksharedptr.h> #include <ksharedptr.h>
class KisPerspectiveGridNode : public KisPoint, public KShared { class KisPerspectiveGridNode : public KisPoint, public TDEShared {
public: public:
inline KisPerspectiveGridNode(double x, double y) : KisPoint(x,y) { } inline KisPerspectiveGridNode(double x, double y) : KisPoint(x,y) { }
inline KisPerspectiveGridNode(KisPoint p) : KisPoint(p) { } inline KisPerspectiveGridNode(KisPoint p) : KisPoint(p) { }
}; };
typedef KSharedPtr<KisPerspectiveGridNode> KisPerspectiveGridNodeSP; typedef TDESharedPtr<KisPerspectiveGridNode> KisPerspectiveGridNodeSP;
class KisSubPerspectiveGrid { class KisSubPerspectiveGrid {
public: public:

2
chalk/core/kis_random_accessor.h
Unescape View File

@ -25,7 +25,7 @@
#include <kis_global.h> #include <kis_global.h>
class KisTiledRandomAccessor; class KisTiledRandomAccessor;
typedef KSharedPtr<KisTiledRandomAccessor> KisTiledRandomAccessorSP; typedef TDESharedPtr<KisTiledRandomAccessor> KisTiledRandomAccessorSP;
class KisTiledDataManager; class KisTiledDataManager;

4
chalk/core/kis_substrate.h
Unescape View File

@ -44,11 +44,11 @@ struct KisSubstratePixel {
* or full-size, with specific and cool ways of generating the surface, or * or full-size, with specific and cool ways of generating the surface, or
* maybe based on scans of real substrates. * maybe based on scans of real substrates.
*/ */
class KisSubstrate : public KShared { class KisSubstrate : public TDEShared {
public: public:
KisSubstrate(KisImage * /*img*/) : KShared() {}; KisSubstrate(KisImage * /*img*/) : TDEShared() {};
virtual ~KisSubstrate() {}; virtual ~KisSubstrate() {};

30
chalk/core/kis_types.h
Unescape View File

@ -35,56 +35,56 @@
*/ */
class KisImage; class KisImage;
typedef KSharedPtr<KisImage> KisImageSP; typedef TDESharedPtr<KisImage> KisImageSP;
class KisPaintDevice; class KisPaintDevice;
typedef KSharedPtr<KisPaintDevice> KisPaintDeviceSP; typedef TDESharedPtr<KisPaintDevice> KisPaintDeviceSP;
typedef KisSharedPtrVector<KisPaintDevice> vKisPaintDeviceSP; typedef KisSharedPtrVector<KisPaintDevice> vKisPaintDeviceSP;
typedef vKisPaintDeviceSP::iterator vKisPaintDeviceSP_it; typedef vKisPaintDeviceSP::iterator vKisPaintDeviceSP_it;
typedef vKisPaintDeviceSP::const_iterator vKisPaintDeviceSP_cit; typedef vKisPaintDeviceSP::const_iterator vKisPaintDeviceSP_cit;
class KisLayer; class KisLayer;
typedef KSharedPtr<KisLayer> KisLayerSP; typedef TDESharedPtr<KisLayer> KisLayerSP;
typedef KisSharedPtrVector<KisLayer> vKisLayerSP; typedef KisSharedPtrVector<KisLayer> vKisLayerSP;
typedef vKisLayerSP::iterator vKisLayerSP_it; typedef vKisLayerSP::iterator vKisLayerSP_it;
typedef vKisLayerSP::const_iterator vKisLayerSP_cit; typedef vKisLayerSP::const_iterator vKisLayerSP_cit;
class KisPartLayer; class KisPartLayer;
typedef KSharedPtr<KisPartLayer> KisPartLayerSP; typedef TDESharedPtr<KisPartLayer> KisPartLayerSP;
class KisPaintLayer; class KisPaintLayer;
typedef KSharedPtr<KisPaintLayer> KisPaintLayerSP; typedef TDESharedPtr<KisPaintLayer> KisPaintLayerSP;
class KisAdjustmentLayer; class KisAdjustmentLayer;
typedef KSharedPtr<KisAdjustmentLayer> KisAdjustmentLayerSP; typedef TDESharedPtr<KisAdjustmentLayer> KisAdjustmentLayerSP;
class KisGroupLayer; class KisGroupLayer;
typedef KSharedPtr<KisGroupLayer> KisGroupLayerSP; typedef TDESharedPtr<KisGroupLayer> KisGroupLayerSP;
class KisSelection; class KisSelection;
typedef KSharedPtr<KisSelection> KisSelectionSP; typedef TDESharedPtr<KisSelection> KisSelectionSP;
class KisBackground; class KisBackground;
typedef KSharedPtr<KisBackground> KisBackgroundSP; typedef TDESharedPtr<KisBackground> KisBackgroundSP;
class KisSubstrate; class KisSubstrate;
typedef KSharedPtr<KisSubstrate> KisSubstrateSP; typedef TDESharedPtr<KisSubstrate> KisSubstrateSP;
class KisHistogram; class KisHistogram;
typedef KSharedPtr<KisHistogram> KisHistogramSP; typedef TDESharedPtr<KisHistogram> KisHistogramSP;
class KisPaintOpFactory; class KisPaintOpFactory;
typedef KSharedPtr<KisPaintOpFactory> KisPaintOpFactorySP; typedef TDESharedPtr<KisPaintOpFactory> KisPaintOpFactorySP;
typedef TQValueVector<TQPoint> vKisSegments; typedef TQValueVector<TQPoint> vKisSegments;
//class KisGuide; //class KisGuide;
//typedef KSharedPtr<KisGuide> KisGuideSP; //typedef TDESharedPtr<KisGuide> KisGuideSP;
class KisAlphaMask; class KisAlphaMask;
typedef KSharedPtr<KisAlphaMask> KisAlphaMaskSP; typedef TDESharedPtr<KisAlphaMask> KisAlphaMaskSP;
class KisFilter; class KisFilter;
typedef KSharedPtr<KisFilter> KisFilterSP; typedef TDESharedPtr<KisFilter> KisFilterSP;
#endif // KISTYPES_H_ #endif // KISTYPES_H_

2
chalk/core/tiles/kis_memento.cc
Unescape View File

@ -20,7 +20,7 @@
#include "kis_tile.h" #include "kis_tile.h"
#include "kis_tile_global.h" #include "kis_tile_global.h"
KisMemento::KisMemento(TQ_UINT32 pixelSize) : KShared() KisMemento::KisMemento(TQ_UINT32 pixelSize) : TDEShared()
{ {
m_hashTable = new KisTile * [1024]; m_hashTable = new KisTile * [1024];
TQ_CHECK_PTR(m_hashTable); TQ_CHECK_PTR(m_hashTable);

4
chalk/core/tiles/kis_memento.h
Unescape View File

@ -28,9 +28,9 @@ class KisTile;
class KisTiledDataManager; class KisTiledDataManager;
class KisMemento; class KisMemento;
typedef KSharedPtr<KisMemento> KisMementoSP; typedef TDESharedPtr<KisMemento> KisMementoSP;
class KisMemento : public KShared class KisMemento : public TDEShared
{ {
public: public:
KisMemento(TQ_UINT32 pixelSize); KisMemento(TQ_UINT32 pixelSize);

2
chalk/core/tiles/kis_tiled_random_accessor.h
Unescape View File

@ -27,7 +27,7 @@
class KisTile; class KisTile;
class KisTiledRandomAccessor : public KShared { class KisTiledRandomAccessor : public TDEShared {
struct KisTileInfo { struct KisTileInfo {
KisTile* tile; KisTile* tile;
KisTile* oldtile; KisTile* oldtile;

2
chalk/core/tiles/kis_tileddatamanager.cc
Unescape View File

@ -61,7 +61,7 @@ KisTiledDataManager::KisTiledDataManager(TQ_UINT32 pixelSize, const TQ_UINT8 *de
} }
KisTiledDataManager::KisTiledDataManager(const KisTiledDataManager & dm) KisTiledDataManager::KisTiledDataManager(const KisTiledDataManager & dm)
: KShared() : TDEShared()
{ {
m_pixelSize = dm.m_pixelSize; m_pixelSize = dm.m_pixelSize;

10
chalk/core/tiles/kis_tileddatamanager.h
Unescape View File

@ -28,16 +28,16 @@
#include "kis_memento.h" #include "kis_memento.h"
class KisTiledDataManager; class KisTiledDataManager;
typedef KSharedPtr<KisTiledDataManager> KisTiledDataManagerSP; typedef TDESharedPtr<KisTiledDataManager> KisTiledDataManagerSP;
class KisDataManager; class KisDataManager;
typedef KSharedPtr<KisDataManager> KisDataManagerSP; typedef TDESharedPtr<KisDataManager> KisDataManagerSP;
class KisTiledIterator; class KisTiledIterator;
class KisTiledRandomAccessor; class KisTiledRandomAccessor;
class KoStore; class KoStore;
class KisTileDataWrapper : public KShared { class KisTileDataWrapper : public TDEShared {
KisTile* m_tile; KisTile* m_tile;
TQ_INT32 m_offset; TQ_INT32 m_offset;
public: public:
@ -46,7 +46,7 @@ public:
TQ_UINT8* data() const { return m_tile->data() + m_offset; } 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 * KisTiledDataManager implements the interface that KisDataManager defines
@ -64,7 +64,7 @@ typedef KSharedPtr<KisTileDataWrapper> KisTileDataWrapperSP;
* how many TQ_UINT8's a single pixel takes. * how many TQ_UINT8's a single pixel takes.
*/ */
class KisTiledDataManager : public KShared { class KisTiledDataManager : public TDEShared {
protected: protected:
KisTiledDataManager(TQ_UINT32 pixelSize, const TQ_UINT8 *defPixel); KisTiledDataManager(TQ_UINT32 pixelSize, const TQ_UINT8 *defPixel);

2
chalk/core/tiles/kis_tilediterator.cc
Unescape View File

@ -44,7 +44,7 @@ KisTiledIterator::~KisTiledIterator( )
} }
KisTiledIterator::KisTiledIterator(const KisTiledIterator& rhs) KisTiledIterator::KisTiledIterator(const KisTiledIterator& rhs)
: KShared() : TDEShared()
{ {
if (this != &rhs) { if (this != &rhs) {
m_ktm = rhs.m_ktm; m_ktm = rhs.m_ktm;

2
chalk/core/tiles/kis_tilediterator.h
Unescape View File

@ -28,7 +28,7 @@
/** /**
* The KisIterator class iterates through the pixels of a KisPaintDevice hiding the tile structure * 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: protected:
KisTiledDataManager *m_ktm; KisTiledDataManager *m_ktm;

18
chalk/doc/colorspaces.xmi
Unescape View File

@ -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:Class stereotype="16" isSpecification="false" isLeaf="false" visibility="public" xmi.id="237" isRoot="false" isAbstract="false" name="TransformMap" />
</UML:Namespace.ownedElement> </UML:Namespace.ownedElement>
</UML:Class> </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="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="36" isRoot="false" isAbstract="false" name="DWORD" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="38" isRoot="false" isAbstract="false" name="icColorSpaceSignature" /> <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> <header>
<codecomment tag="" /> <codecomment tag="" />
</header> </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> <header>
<codecomment tag="" writeOutText="false" indentLevel="1" /> <codecomment tag="" writeOutText="false" indentLevel="1" />
</header> </header>
@ -6061,12 +6061,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
</codeaccessormethod> </codeaccessormethod>
<codeaccessormethod accessType="2" parent_id="28" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="28" role_id="0" text=".add(value);" > <codeaccessormethod accessType="2" parent_id="28" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="28" role_id="0" text=".add(value);" >
<header> <header>
<javacodedocumentation tag="" indentLevel="1" text="Add an object of type KShared to the List &amp;#010;&amp;#010;@return void" /> <javacodedocumentation tag="" indentLevel="1" text="Add an object of type TDEShared to the List &amp;#010;&amp;#010;@return void" />
</header> </header>
</codeaccessormethod> </codeaccessormethod>
<codeaccessormethod accessType="3" parent_id="28" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="28" role_id="0" text=".remove(value);" > <codeaccessormethod accessType="3" parent_id="28" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="28" role_id="0" text=".remove(value);" >
<header> <header>
<javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KShared from the List &amp;#010;" /> <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type TDEShared from the List &amp;#010;" />
</header> </header>
</codeaccessormethod> </codeaccessormethod>
<codeaccessormethod accessType="4" parent_id="28" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="28" role_id="0" text="return (List) ;" > <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> </codeclassfield>
</classfields> </classfields>
</classifiercodedocument> </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> <textblocks>
<codeblockwithcomments tag="packages" writeOutText="false" > <codeblockwithcomments tag="packages" writeOutText="false" >
<header> <header>
@ -6526,7 +6526,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
</codeblockwithcomments> </codeblockwithcomments>
<javaclassdeclarationblock parent_id="27" tag="ClassDeclBlock" canDelete="false" > <javaclassdeclarationblock parent_id="27" tag="ClassDeclBlock" canDelete="false" >
<header> <header>
<javacodedocumentation tag="" text="Class KShared&amp;#010;" /> <javacodedocumentation tag="" text="Class TDEShared&amp;#010;" />
</header> </header>
<textblocks> <textblocks>
<hierarchicalcodeblock tag="fieldsDecl" canDelete="false" indentLevel="1" > <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" /> <codecomment tag="" indentLevel="1" text="Constructors" />
</header> </header>
<textblocks> <textblocks>
<codeblockwithcomments tag="emptyconstructor" writeOutText="false" indentLevel="1" text="public KShared ( ) { }" > <codeblockwithcomments tag="emptyconstructor" writeOutText="false" indentLevel="1" text="public TDEShared ( ) { }" >
<header> <header>
<codecomment tag="" indentLevel="1" text="Empty Constructor" /> <codecomment tag="" indentLevel="1" text="Empty Constructor" />
</header> </header>
@ -26627,7 +26627,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
</codeblockwithcomments> </codeblockwithcomments>
<cppheaderclassdeclarationblock parent_id="27" tag="classDeclarationBlock" canDelete="false" > <cppheaderclassdeclarationblock parent_id="27" tag="classDeclarationBlock" canDelete="false" >
<header> <header>
<cppcodedocumentation tag="" text="Class KShared&amp;#010;" /> <cppcodedocumentation tag="" text="Class TDEShared&amp;#010;" />
</header> </header>
<textblocks> <textblocks>
<hierarchicalcodeblock tag="publicBlock" canDelete="false" > <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" /> <cppcodedocumentation tag="" indentLevel="1" text="Constructors" />
</header> </header>
<textblocks> <textblocks>
<codeblockwithcomments tag="emptyconstructor" indentLevel="1" text="KShared ( ) { }" > <codeblockwithcomments tag="emptyconstructor" indentLevel="1" text="TDEShared ( ) { }" >
<header> <header>
<cppcodedocumentation tag="" indentLevel="1" text="Empty Constructor" /> <cppcodedocumentation tag="" indentLevel="1" text="Empty Constructor" />
</header> </header>

44
chalk/doc/controller.xmi
Unescape View File

@ -2055,7 +2055,7 @@ That last bit has not been solved yet.
</UML:Operation> </UML:Operation>
</UML:Classifier.feature> </UML:Classifier.feature>
</UML:Class> </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="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 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" /> <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 &amp; drop widgets." isSpecification="f
<header> <header>
<codecomment tag="" /> <codecomment tag="" />
</header> </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> <header>
<codecomment tag="" writeOutText="false" indentLevel="1" /> <codecomment tag="" writeOutText="false" indentLevel="1" />
</header> </header>
@ -7959,12 +7959,12 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
</codeaccessormethod> </codeaccessormethod>
<codeaccessormethod accessType="2" parent_id="964" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="964" role_id="0" text=".add(value);" > <codeaccessormethod accessType="2" parent_id="964" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="964" role_id="0" text=".add(value);" >
<header> <header>
<javacodedocumentation tag="" indentLevel="1" text="Add an object of type KShared to the List &amp;#010;&amp;#010;@return void" /> <javacodedocumentation tag="" indentLevel="1" text="Add an object of type TDEShared to the List &amp;#010;&amp;#010;@return void" />
</header> </header>
</codeaccessormethod> </codeaccessormethod>
<codeaccessormethod accessType="3" parent_id="964" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="964" role_id="0" text=".remove(value);" > <codeaccessormethod accessType="3" parent_id="964" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="964" role_id="0" text=".remove(value);" >
<header> <header>
<javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KShared from the List &amp;#010;" /> <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type TDEShared from the List &amp;#010;" />
</header> </header>
</codeaccessormethod> </codeaccessormethod>
<codeaccessormethod accessType="4" parent_id="964" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="964" role_id="0" text="return (List) ;" > <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 &amp; drop widgets." isSpecification="f
<header> <header>
<codecomment tag="" /> <codecomment tag="" />
</header> </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> <header>
<codecomment tag="" writeOutText="false" indentLevel="1" /> <codecomment tag="" writeOutText="false" indentLevel="1" />
</header> </header>
@ -9453,12 +9453,12 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
</codeaccessormethod> </codeaccessormethod>
<codeaccessormethod accessType="2" parent_id="1436" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1436" role_id="0" text=".add(value);" > <codeaccessormethod accessType="2" parent_id="1436" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1436" role_id="0" text=".add(value);" >
<header> <header>
<javacodedocumentation tag="" indentLevel="1" text="Add an object of type KShared to the List &amp;#010;&amp;#010;@return void" /> <javacodedocumentation tag="" indentLevel="1" text="Add an object of type TDEShared to the List &amp;#010;&amp;#010;@return void" />
</header> </header>
</codeaccessormethod> </codeaccessormethod>
<codeaccessormethod accessType="3" parent_id="1436" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1436" role_id="0" text=".remove(value);" > <codeaccessormethod accessType="3" parent_id="1436" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1436" role_id="0" text=".remove(value);" >
<header> <header>
<javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KShared from the List &amp;#010;" /> <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type TDEShared from the List &amp;#010;" />
</header> </header>
</codeaccessormethod> </codeaccessormethod>
<codeaccessormethod accessType="4" parent_id="1436" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1436" role_id="0" text="return (List) ;" > <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 &amp; drop widgets." isSpecification="f
<header> <header>
<codecomment tag="" /> <codecomment tag="" />
</header> </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> <header>
<codecomment tag="" writeOutText="false" indentLevel="1" /> <codecomment tag="" writeOutText="false" indentLevel="1" />
</header> </header>
@ -13278,12 +13278,12 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
</codeaccessormethod> </codeaccessormethod>
<codeaccessormethod accessType="2" parent_id="673" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="673" role_id="0" text=".add(value);" > <codeaccessormethod accessType="2" parent_id="673" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="673" role_id="0" text=".add(value);" >
<header> <header>
<javacodedocumentation tag="" indentLevel="1" text="Add an object of type KShared to the List &amp;#010;&amp;#010;@return void" /> <javacodedocumentation tag="" indentLevel="1" text="Add an object of type TDEShared to the List &amp;#010;&amp;#010;@return void" />
</header> </header>
</codeaccessormethod> </codeaccessormethod>
<codeaccessormethod accessType="3" parent_id="673" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="673" role_id="0" text=".remove(value);" > <codeaccessormethod accessType="3" parent_id="673" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="673" role_id="0" text=".remove(value);" >
<header> <header>
<javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KShared from the List &amp;#010;" /> <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type TDEShared from the List &amp;#010;" />
</header> </header>
</codeaccessormethod> </codeaccessormethod>
<codeaccessormethod accessType="4" parent_id="673" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="673" role_id="0" text="return (List) ;" > <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 &amp; drop widgets." isSpecification="f
<header> <header>
<codecomment tag="" /> <codecomment tag="" />
</header> </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> <header>
<codecomment tag="" writeOutText="false" indentLevel="1" /> <codecomment tag="" writeOutText="false" indentLevel="1" />
</header> </header>
@ -14252,12 +14252,12 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
</codeaccessormethod> </codeaccessormethod>
<codeaccessormethod accessType="2" parent_id="920" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="920" role_id="0" text=".add(value);" > <codeaccessormethod accessType="2" parent_id="920" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="920" role_id="0" text=".add(value);" >
<header> <header>
<javacodedocumentation tag="" indentLevel="1" text="Add an object of type KShared to the List &amp;#010;&amp;#010;@return void" /> <javacodedocumentation tag="" indentLevel="1" text="Add an object of type TDEShared to the List &amp;#010;&amp;#010;@return void" />
</header> </header>
</codeaccessormethod> </codeaccessormethod>
<codeaccessormethod accessType="3" parent_id="920" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="920" role_id="0" text=".remove(value);" > <codeaccessormethod accessType="3" parent_id="920" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="920" role_id="0" text=".remove(value);" >
<header> <header>
<javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KShared from the List &amp;#010;" /> <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type TDEShared from the List &amp;#010;" />
</header> </header>
</codeaccessormethod> </codeaccessormethod>
<codeaccessormethod accessType="4" parent_id="920" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="920" role_id="0" text="return (List) ;" > <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 &amp; drop widgets." isSpecification="f
<header> <header>
<codecomment tag="" /> <codecomment tag="" />
</header> </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> <header>
<codecomment tag="" writeOutText="false" indentLevel="1" /> <codecomment tag="" writeOutText="false" indentLevel="1" />
</header> </header>
@ -15116,12 +15116,12 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
</codeaccessormethod> </codeaccessormethod>
<codeaccessormethod accessType="2" parent_id="656" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="656" role_id="0" text=".add(value);" > <codeaccessormethod accessType="2" parent_id="656" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="656" role_id="0" text=".add(value);" >
<header> <header>
<javacodedocumentation tag="" indentLevel="1" text="Add an object of type KShared to the List &amp;#010;&amp;#010;@return void" /> <javacodedocumentation tag="" indentLevel="1" text="Add an object of type TDEShared to the List &amp;#010;&amp;#010;@return void" />
</header> </header>
</codeaccessormethod> </codeaccessormethod>
<codeaccessormethod accessType="3" parent_id="656" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="656" role_id="0" text=".remove(value);" > <codeaccessormethod accessType="3" parent_id="656" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="656" role_id="0" text=".remove(value);" >
<header> <header>
<javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KShared from the List &amp;#010;" /> <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type TDEShared from the List &amp;#010;" />
</header> </header>
</codeaccessormethod> </codeaccessormethod>
<codeaccessormethod accessType="4" parent_id="656" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="656" role_id="0" text="return (List) ;" > <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 &amp; drop widgets." isSpecification="f
<header> <header>
<codecomment tag="" /> <codecomment tag="" />
</header> </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> <header>
<codecomment tag="" writeOutText="false" indentLevel="1" /> <codecomment tag="" writeOutText="false" indentLevel="1" />
</header> </header>
@ -17622,12 +17622,12 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
</codeaccessormethod> </codeaccessormethod>
<codeaccessormethod accessType="2" parent_id="543" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="543" role_id="0" text=".add(value);" > <codeaccessormethod accessType="2" parent_id="543" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="543" role_id="0" text=".add(value);" >
<header> <header>
<javacodedocumentation tag="" indentLevel="1" text="Add an object of type KShared to the List &amp;#010;&amp;#010;@return void" /> <javacodedocumentation tag="" indentLevel="1" text="Add an object of type TDEShared to the List &amp;#010;&amp;#010;@return void" />
</header> </header>
</codeaccessormethod> </codeaccessormethod>
<codeaccessormethod accessType="3" parent_id="543" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="543" role_id="0" text=".remove(value);" > <codeaccessormethod accessType="3" parent_id="543" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="543" role_id="0" text=".remove(value);" >
<header> <header>
<javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KShared from the List &amp;#010;" /> <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type TDEShared from the List &amp;#010;" />
</header> </header>
</codeaccessormethod> </codeaccessormethod>
<codeaccessormethod accessType="4" parent_id="543" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="543" role_id="0" text="return (List) ;" > <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 &amp; drop widgets." isSpecification="f
</codeclassfield> </codeclassfield>
</classfields> </classfields>
</classifiercodedocument> </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> <textblocks>
<codeblockwithcomments tag="packages" writeOutText="false" > <codeblockwithcomments tag="packages" writeOutText="false" >
<header> <header>
@ -17692,7 +17692,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
</codeblockwithcomments> </codeblockwithcomments>
<javaclassdeclarationblock parent_id="542" tag="ClassDeclBlock" canDelete="false" > <javaclassdeclarationblock parent_id="542" tag="ClassDeclBlock" canDelete="false" >
<header> <header>
<javacodedocumentation tag="" text="Class KShared&amp;#010;" /> <javacodedocumentation tag="" text="Class TDEShared&amp;#010;" />
</header> </header>
<textblocks> <textblocks>
<hierarchicalcodeblock tag="fieldsDecl" canDelete="false" indentLevel="1" > <hierarchicalcodeblock tag="fieldsDecl" canDelete="false" indentLevel="1" >
@ -17711,7 +17711,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
<codecomment tag="" indentLevel="1" text="Constructors" /> <codecomment tag="" indentLevel="1" text="Constructors" />
</header> </header>
<textblocks> <textblocks>
<codeblockwithcomments tag="emptyconstructor" writeOutText="false" indentLevel="1" text="public KShared ( ) { }" > <codeblockwithcomments tag="emptyconstructor" writeOutText="false" indentLevel="1" text="public TDEShared ( ) { }" >
<header> <header>
<codecomment tag="" indentLevel="1" text="Empty Constructor" /> <codecomment tag="" indentLevel="1" text="Empty Constructor" />
</header> </header>

2
chalk/doc/histograms.xmi
Unescape View File

@ -259,7 +259,7 @@ The producer may only read the iterator, it may safely be constructed with write
</UML:Operation> </UML:Operation>
</UML:Classifier.feature> </UML:Classifier.feature>
</UML:Class> </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="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="37" isRoot="false" isAbstract="false" name="KisID" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="40" isRoot="false" isAbstract="false" name="QValueVector" /> <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="40" isRoot="false" isAbstract="false" name="QValueVector" />

4
chalk/plugins/viewplugins/substrate/kis_repeating_substrate.h
Unescape View File

@ -43,11 +43,11 @@ struct KisSubstratePixel {
* or full-size, with specific and cool ways of generating the surface, or * or full-size, with specific and cool ways of generating the surface, or
* maybe based on scans of real substrates. * maybe based on scans of real substrates.
*/ */
class KisSubstrate : public KShared { class KisSubstrate : public TDEShared {
public: public:
KisSubstrate(KisImage * /*img*/) : KShared() {}; KisSubstrate(KisImage * /*img*/) : TDEShared() {};
virtual ~KisSubstrate() {}; virtual ~KisSubstrate() {};

4
chalk/sdk/kis_annotation.h
Unescape View File

@ -40,7 +40,7 @@
* *
* Examples of annotations are EXIF data and ICC profiles. * Examples of annotations are EXIF data and ICC profiles.
*/ */
class KisAnnotation : public KShared { class KisAnnotation : public TDEShared {
public: public:
@ -81,7 +81,7 @@ private:
}; };
typedef KSharedPtr<KisAnnotation> KisAnnotationSP; typedef TDESharedPtr<KisAnnotation> KisAnnotationSP;
typedef KisSharedPtrVector<KisAnnotation> vKisAnnotationSP; typedef KisSharedPtrVector<KisAnnotation> vKisAnnotationSP;
typedef vKisAnnotationSP::iterator vKisAnnotationSP_it; typedef vKisAnnotationSP::iterator vKisAnnotationSP_it;
typedef vKisAnnotationSP::const_iterator vKisAnnotationSP_cit; typedef vKisAnnotationSP::const_iterator vKisAnnotationSP_cit;

10
chalk/sdk/kis_shared_ptr_vector.h
Unescape View File

@ -25,15 +25,15 @@
/** /**
* TQValueVector does not always destroy an element when it is erased. * 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 * 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. * expected.
*/ */
template <class T> 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: public:
KisSharedPtrVector() {} KisSharedPtrVector() {}
@ -57,7 +57,7 @@ public:
return super::erase(first, last); 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) for (int i = 0, n = super::count(); i < n; ++i)
if (super::at(i) == ptr) if (super::at(i) == ptr)

4
chalk/ui/kis_opengl_image_context.h
Unescape View File

@ -37,10 +37,10 @@
class TQRegion; class TQRegion;
class KisOpenGLImageContext; class KisOpenGLImageContext;
typedef KSharedPtr<KisOpenGLImageContext> KisOpenGLImageContextSP; typedef TDESharedPtr<KisOpenGLImageContext> KisOpenGLImageContextSP;
class KisColorSpace; class KisColorSpace;
class KRITACORE_EXPORT KisOpenGLImageContext : public TQObject , public KShared { class KRITACORE_EXPORT KisOpenGLImageContext : public TQObject , public TDEShared {
Q_OBJECT Q_OBJECT

2
chalk/ui/kis_tool.h
Unescape View File

@ -58,7 +58,7 @@ enum enumToolType {
const TQ_UINT8 NUMBER_OF_TOOLTYPES = 6; 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 Q_OBJECT

2
chalk/ui/kis_tool_factory.h
Unescape View File

@ -25,7 +25,7 @@
#include "kis_types.h" #include "kis_types.h"
#include "kactioncollection.h" #include "kactioncollection.h"
class KisToolFactory : public KShared class KisToolFactory : public TDEShared
{ {
public: public:

4
chalk/ui/kis_tool_types.h
Unescape View File

@ -23,12 +23,12 @@
class KisTool; class KisTool;
typedef KSharedPtr<KisTool> KisToolSP; typedef TDESharedPtr<KisTool> KisToolSP;
typedef KisSharedPtrVector<KisTool> vKisTool; typedef KisSharedPtrVector<KisTool> vKisTool;
typedef vKisTool::iterator vKisTool_it; typedef vKisTool::iterator vKisTool_it;
typedef vKisTool::const_iterator vKisTool_cit; typedef vKisTool::const_iterator vKisTool_cit;
class KisToolFactory; class KisToolFactory;
typedef KSharedPtr<KisToolFactory> KisToolFactorySP; typedef TDESharedPtr<KisToolFactory> KisToolFactorySP;
#endif // KIS_TOOL_TYPES_H_ #endif // KIS_TOOL_TYPES_H_

4
kexi/core/kexi.cpp
Unescape View File

@ -45,10 +45,10 @@ using namespace Kexi;
//! used for speedup //! used for speedup
//! @internal //! @internal
class KexiInternal : public KShared class KexiInternal : public TDEShared
{ {
public: public:
KexiInternal() : KShared() KexiInternal() : TDEShared()
, connset(0) , connset(0)
, smallFont(0) , smallFont(0)
{ {

2
kexi/core/kexiactioncategories.h
Unescape View File

@ -40,7 +40,7 @@ enum ActionCategory
/*! Note: we do not declare actions used in design/text view modes, /*! Note: we do not declare actions used in design/text view modes,
because the categories are used in the data view, because the categories are used in the data view,
for now in the 'assign action to a push button' function. */ for now in the 'assign action to a push button' function. */
class KEXICORE_EXPORT ActionCategories : public KShared class KEXICORE_EXPORT ActionCategories : public TDEShared
{ {
public: public:
ActionCategories(); ActionCategories();

2
kexi/formeditor/scripting/formscript.h
Unescape View File

@ -72,7 +72,7 @@ class FormScript : public TQObject
private: private:
ScriptManager *m_manager; ScriptManager *m_manager;
Form *m_form; Form *m_form;
KSharedPtr<Kross::Api::ScriptContainer> m_script; TDESharedPtr<Kross::Api::ScriptContainer> m_script;
EventList m_list; EventList m_list;
}; };

2
kexi/kexidb/preparedstatement.cpp
Unescape View File

@ -27,7 +27,7 @@ using namespace KexiDB;
PreparedStatement::PreparedStatement(StatementType type, ConnectionInternal& conn, PreparedStatement::PreparedStatement(StatementType type, ConnectionInternal& conn,
FieldList& fields, const TQStringList& where) FieldList& fields, const TQStringList& where)
: KShared() : TDEShared()
, m_type(type) , m_type(type)
, m_fields(&fields) , m_fields(&fields)
, m_where(where.isEmpty() ? new TQStringList(where) : 0) , m_where(where.isEmpty() ? new TQStringList(where) : 0)

4
kexi/kexidb/preparedstatement.h
Unescape View File

@ -70,10 +70,10 @@ class FieldList;
Depending on database backend, you can avoid escaping BLOBs. Depending on database backend, you can avoid escaping BLOBs.
See KexiFormView::storeData() for example use. See KexiFormView::storeData() for example use.
*/ */
class KEXI_DB_EXPORT PreparedStatement : public KShared class KEXI_DB_EXPORT PreparedStatement : public TDEShared
{ {
public: public:
typedef KSharedPtr<PreparedStatement> Ptr; typedef TDESharedPtr<PreparedStatement> Ptr;
//! Defines type of the prepared statement. //! Defines type of the prepared statement.
enum StatementType { enum StatementType {

24
kexi/plugins/macros/kexiactions/datatableaction.cpp
Unescape View File

@ -46,7 +46,7 @@ namespace KexiMacro {
{ {
TQStringList list; TQStringList list;
list << "import" << "export"; list << "import" << "export";
this->appendChild( KSharedPtr<KoMacro::Variable>( new KoMacro::Variable(list, "@list") ) ); this->appendChild( TDESharedPtr<KoMacro::Variable>( new KoMacro::Variable(list, "@list") ) );
this->setVariant( list[0] ); this->setVariant( list[0] );
} }
@ -61,7 +61,7 @@ namespace KexiMacro {
{ {
TQStringList list; TQStringList list;
list << "file" << "clipboard"; list << "file" << "clipboard";
this->appendChild( KSharedPtr<KoMacro::Variable>( new KoMacro::Variable(list, "@list") ) ); this->appendChild( TDESharedPtr<KoMacro::Variable>( new KoMacro::Variable(list, "@list") ) );
this->setVariant( list[0] ); this->setVariant( list[0] );
} }
@ -87,10 +87,10 @@ namespace KexiMacro {
namelist << info->objectName() + "." + item_it.current()->name(); namelist << info->objectName() + "." + item_it.current()->name();
} }
for(TQStringList::Iterator it = namelist.begin(); it != namelist.end(); ++it) for(TQStringList::Iterator it = namelist.begin(); it != namelist.end(); ++it)
this->appendChild( KSharedPtr<KoMacro::Variable>(new KoMacro::Variable(*it)) ); this->appendChild( TDESharedPtr<KoMacro::Variable>(new KoMacro::Variable(*it)) );
//const TQString name = info->objectName(); //info->groupName(); //const TQString name = info->objectName(); //info->groupName();
//this->appendChild( KSharedPtr<KoMacro::Variable>(new KoMacro::Variable(name)) ); //this->appendChild( TDESharedPtr<KoMacro::Variable>(new KoMacro::Variable(name)) );
} }
const TQString n = const TQString n =
namelist.contains(partitem) namelist.contains(partitem)
@ -106,20 +106,20 @@ namespace KexiMacro {
DataTableAction::DataTableAction() DataTableAction::DataTableAction()
: KexiAction("datatable", i18n("Data Table")) : KexiAction("datatable", i18n("Data Table"))
{ {
setVariable(KSharedPtr<KoMacro::Variable>( new MethodVariable<DataTableAction>(this) )); setVariable(TDESharedPtr<KoMacro::Variable>( new MethodVariable<DataTableAction>(this) ));
setVariable(KSharedPtr<KoMacro::Variable>( new TypeVariable<DataTableAction>(this) )); setVariable(TDESharedPtr<KoMacro::Variable>( new TypeVariable<DataTableAction>(this) ));
setVariable(KSharedPtr<KoMacro::Variable>( new PartItemVariable<DataTableAction>(this) )); setVariable(TDESharedPtr<KoMacro::Variable>( new PartItemVariable<DataTableAction>(this) ));
} }
DataTableAction::~DataTableAction() DataTableAction::~DataTableAction()
{ {
} }
bool DataTableAction::notifyUpdated(KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name) bool DataTableAction::notifyUpdated(TDESharedPtr<KoMacro::MacroItem> macroitem, const TQString& name)
{ {
kdDebug()<<"DataTableAction::notifyUpdated() name="<<name<<" macroitem.action="<<(macroitem->action() ? macroitem->action()->name() : "NOACTION")<<endl; kdDebug()<<"DataTableAction::notifyUpdated() name="<<name<<" macroitem.action="<<(macroitem->action() ? macroitem->action()->name() : "NOACTION")<<endl;
/* /*
KSharedPtr<KoMacro::Variable> variable = macroitem->variable(name, false); TDESharedPtr<KoMacro::Variable> variable = macroitem->variable(name, false);
if(! variable) { if(! variable) {
kdWarning()<<"DataTableAction::notifyUpdated() No such variable="<<name<<" in macroitem."<<endl; kdWarning()<<"DataTableAction::notifyUpdated() No such variable="<<name<<" in macroitem."<<endl;
return false; return false;
@ -128,16 +128,16 @@ bool DataTableAction::notifyUpdated(KSharedPtr<KoMacro::MacroItem> macroitem, co
if(name == "method") { if(name == "method") {
const int partitem = macroitem->variant(OBJECT, true).toString(); const int partitem = macroitem->variant(OBJECT, true).toString();
macroitem->variable(OBJECT, true)->setChildren( macroitem->variable(OBJECT, true)->setChildren(
KoMacro::Variable::List() << KSharedPtr<KoMacro::Variable>(new ObjectVariable<ExecuteAction>(this, partitem)) ); KoMacro::Variable::List() << TDESharedPtr<KoMacro::Variable>(new ObjectVariable<ExecuteAction>(this, partitem)) );
} }
*/ */
return true; return true;
} }
void DataTableAction::activate(KSharedPtr<KoMacro::Context> context) void DataTableAction::activate(TDESharedPtr<KoMacro::Context> context)
{ {
if(! mainWin()->project()) { if(! mainWin()->project()) {
kdWarning() << "ExecuteAction::activate(KSharedPtr<KoMacro::Context>) Invalid project" << endl; kdWarning() << "ExecuteAction::activate(TDESharedPtr<KoMacro::Context>) Invalid project" << endl;
return; return;
} }

4
kexi/plugins/macros/kexiactions/datatableaction.h
Unescape View File

@ -61,7 +61,7 @@ namespace KexiMacro {
* @return true if the update was successfully else false * @return true if the update was successfully else false
* is returned. * is returned.
*/ */
virtual bool notifyUpdated(KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name); virtual bool notifyUpdated(TDESharedPtr<KoMacro::MacroItem> macroitem, const TQString& name);
public slots: public slots:
@ -69,7 +69,7 @@ namespace KexiMacro {
* Called if the @a Action should be executed within the * Called if the @a Action should be executed within the
* defined @p context . * defined @p context .
*/ */
virtual void activate(KSharedPtr<KoMacro::Context> context); virtual void activate(TDESharedPtr<KoMacro::Context> context);
}; };
} }

14
kexi/plugins/macros/kexiactions/executeaction.cpp
Unescape View File

@ -40,20 +40,20 @@ ExecuteAction::ExecuteAction()
: KexiAction("execute", i18n("Execute")) : KexiAction("execute", i18n("Execute"))
{ {
int conditions = ObjectVariable<ExecuteAction>::VisibleInNav | ObjectVariable<ExecuteAction>::Executable; int conditions = ObjectVariable<ExecuteAction>::VisibleInNav | ObjectVariable<ExecuteAction>::Executable;
KSharedPtr<KoMacro::Variable> objvar = new ObjectVariable<ExecuteAction>(this, conditions); TDESharedPtr<KoMacro::Variable> objvar = new ObjectVariable<ExecuteAction>(this, conditions);
setVariable(objvar); setVariable(objvar);
setVariable(KSharedPtr<KoMacro::Variable>( new ObjectNameVariable<ExecuteAction>(this, objvar->variant().toString()) )); setVariable(TDESharedPtr<KoMacro::Variable>( new ObjectNameVariable<ExecuteAction>(this, objvar->variant().toString()) ));
} }
ExecuteAction::~ExecuteAction() ExecuteAction::~ExecuteAction()
{ {
} }
bool ExecuteAction::notifyUpdated(KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name) bool ExecuteAction::notifyUpdated(TDESharedPtr<KoMacro::MacroItem> macroitem, const TQString& name)
{ {
kdDebug()<<"ExecuteAction::notifyUpdated() name="<<name<<" macroitem.action="<<(macroitem->action() ? macroitem->action()->name() : "NOACTION")<<endl; kdDebug()<<"ExecuteAction::notifyUpdated() name="<<name<<" macroitem.action="<<(macroitem->action() ? macroitem->action()->name() : "NOACTION")<<endl;
KSharedPtr<KoMacro::Variable> variable = macroitem->variable(name, false); TDESharedPtr<KoMacro::Variable> variable = macroitem->variable(name, false);
if(! variable) { if(! variable) {
kdWarning()<<"ExecuteAction::notifyUpdated() No such variable="<<name<<" in macroitem."<<endl; kdWarning()<<"ExecuteAction::notifyUpdated() No such variable="<<name<<" in macroitem."<<endl;
return false; return false;
@ -64,16 +64,16 @@ bool ExecuteAction::notifyUpdated(KSharedPtr<KoMacro::MacroItem> macroitem, cons
const TQString objectvalue = macroitem->variant(OBJECT, true).toString(); // e.g. "macro" or "script" const TQString objectvalue = macroitem->variant(OBJECT, true).toString(); // e.g. "macro" or "script"
const TQString objectname = macroitem->variant(NAME, true).toString(); // e.g. "macro1" or "macro2" if objectvalue above is "macro" const TQString objectname = macroitem->variant(NAME, true).toString(); // e.g. "macro1" or "macro2" if objectvalue above is "macro"
macroitem->variable(NAME, true)->setChildren( macroitem->variable(NAME, true)->setChildren(
KoMacro::Variable::List() << KSharedPtr<KoMacro::Variable>(new ObjectNameVariable<ExecuteAction>(this, objectvalue, objectname)) ); KoMacro::Variable::List() << TDESharedPtr<KoMacro::Variable>(new ObjectNameVariable<ExecuteAction>(this, objectvalue, objectname)) );
} }
return true; return true;
} }
void ExecuteAction::activate(KSharedPtr<KoMacro::Context> context) void ExecuteAction::activate(TDESharedPtr<KoMacro::Context> context)
{ {
if(! mainWin()->project()) { if(! mainWin()->project()) {
kdWarning() << "ExecuteAction::activate(KSharedPtr<KoMacro::Context>) Invalid project" << endl; kdWarning() << "ExecuteAction::activate(TDESharedPtr<KoMacro::Context>) Invalid project" << endl;
return; return;
} }

4
kexi/plugins/macros/kexiactions/executeaction.h
Unescape View File

@ -63,7 +63,7 @@ namespace KexiMacro {
* @return true if the update was successfully else false * @return true if the update was successfully else false
* is returned. * is returned.
*/ */
virtual bool notifyUpdated(KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name); virtual bool notifyUpdated(TDESharedPtr<KoMacro::MacroItem> macroitem, const TQString& name);
public slots: public slots:
@ -71,7 +71,7 @@ namespace KexiMacro {
* Called if the @a Action should be executed within the * Called if the @a Action should be executed within the
* defined @p context . * defined @p context .
*/ */
virtual void activate(KSharedPtr<KoMacro::Context> context); virtual void activate(TDESharedPtr<KoMacro::Context> context);
}; };
} }

4
kexi/plugins/macros/kexiactions/messageaction.cpp
Unescape View File

@ -39,9 +39,9 @@ MessageAction::~MessageAction()
{ {
} }
void MessageAction::activate(KSharedPtr<KoMacro::Context> context) void MessageAction::activate(TDESharedPtr<KoMacro::Context> context)
{ {
kdDebug() << "MessageAction::activate(KSharedPtr<Context>)" << endl; kdDebug() << "MessageAction::activate(TDESharedPtr<Context>)" << endl;
const TQString caption = context->variable("caption")->variant().toString(); const TQString caption = context->variable("caption")->variant().toString();
const TQString message = context->variable("message")->variant().toString(); const TQString message = context->variable("message")->variant().toString();
KMessageBox::information(mainWin(), message, caption); KMessageBox::information(mainWin(), message, caption);

2
kexi/plugins/macros/kexiactions/messageaction.h
Unescape View File

@ -59,7 +59,7 @@ namespace KexiMacro {
* Called if the @a Action should be executed within the * Called if the @a Action should be executed within the
* defined @param context . * defined @param context .
*/ */
virtual void activate(KSharedPtr<KoMacro::Context> context); virtual void activate(TDESharedPtr<KoMacro::Context> context);
}; };
} }

18
kexi/plugins/macros/kexiactions/navigateaction.cpp
Unescape View File

@ -47,7 +47,7 @@ namespace KexiMacro {
{ {
TQStringList list; TQStringList list;
list << "first" << "previous" << "next" << "last" << "goto"; list << "first" << "previous" << "next" << "last" << "goto";
this->appendChild( KSharedPtr<KoMacro::Variable>( new KoMacro::Variable(list, "@list") ) ); this->appendChild( TDESharedPtr<KoMacro::Variable>( new KoMacro::Variable(list, "@list") ) );
/*TODO should this actions belong to navigate? maybe it would be more wise to have /*TODO should this actions belong to navigate? maybe it would be more wise to have
such kind of functionality in an own e.g. "Modify" action to outline, that such kind of functionality in an own e.g. "Modify" action to outline, that
@ -64,25 +64,25 @@ NavigateAction::NavigateAction()
: KexiAction("navigate", i18n("Navigate")) : KexiAction("navigate", i18n("Navigate"))
{ {
KoMacro::Variable* navvar = new NavigateVariable<NavigateAction>(this); KoMacro::Variable* navvar = new NavigateVariable<NavigateAction>(this);
setVariable(KSharedPtr<KoMacro::Variable>( navvar )); setVariable(TDESharedPtr<KoMacro::Variable>( navvar ));
KoMacro::Variable* rowvar = new KexiVariable<NavigateAction>(this, "rownr", i18n("Row")); KoMacro::Variable* rowvar = new KexiVariable<NavigateAction>(this, "rownr", i18n("Row"));
rowvar->setVariant(0); rowvar->setVariant(0);
setVariable(KSharedPtr<KoMacro::Variable>(rowvar)); setVariable(TDESharedPtr<KoMacro::Variable>(rowvar));
KoMacro::Variable* colvar = new KexiVariable<NavigateAction>(this, "colnr", i18n("Column")); KoMacro::Variable* colvar = new KexiVariable<NavigateAction>(this, "colnr", i18n("Column"));
colvar->setVariant(0); colvar->setVariant(0);
setVariable(KSharedPtr<KoMacro::Variable>(colvar)); setVariable(TDESharedPtr<KoMacro::Variable>(colvar));
} }
NavigateAction::~NavigateAction() NavigateAction::~NavigateAction()
{ {
} }
bool NavigateAction::notifyUpdated(KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name) bool NavigateAction::notifyUpdated(TDESharedPtr<KoMacro::MacroItem> macroitem, const TQString& name)
{ {
kdDebug()<<"NavigateAction::notifyUpdated() name="<<name<<" macroitem.action="<<(macroitem->action() ? macroitem->action()->name() : "NOACTION")<<endl; kdDebug()<<"NavigateAction::notifyUpdated() name="<<name<<" macroitem.action="<<(macroitem->action() ? macroitem->action()->name() : "NOACTION")<<endl;
KSharedPtr<KoMacro::Variable> variable = macroitem->variable(name, false); TDESharedPtr<KoMacro::Variable> variable = macroitem->variable(name, false);
if(! variable) { if(! variable) {
kdWarning()<<"NavigateAction::notifyUpdated() No such variable="<<name<<" in macroitem."<<endl; kdWarning()<<"NavigateAction::notifyUpdated() No such variable="<<name<<" in macroitem."<<endl;
return false; return false;
@ -94,15 +94,15 @@ bool NavigateAction::notifyUpdated(KSharedPtr<KoMacro::MacroItem> macroitem, con
const int colnr = macroitem->variant("colnr", true).toInt(); // e.g. "macro1" or "macro2" if objectvalue above is "macro" const int colnr = macroitem->variant("colnr", true).toInt(); // e.g. "macro1" or "macro2" if objectvalue above is "macro"
macroitem->variable("rownr", true)->setChildren( macroitem->variable("rownr", true)->setChildren(
KoMacro::Variable::List() << KSharedPtr<KoMacro::Variable>(new KoMacro::Variable(rownr)) ); KoMacro::Variable::List() << TDESharedPtr<KoMacro::Variable>(new KoMacro::Variable(rownr)) );
macroitem->variable("colnr", true)->setChildren( macroitem->variable("colnr", true)->setChildren(
KoMacro::Variable::List() << KSharedPtr<KoMacro::Variable>(new KoMacro::Variable(colnr)) ); KoMacro::Variable::List() << TDESharedPtr<KoMacro::Variable>(new KoMacro::Variable(colnr)) );
} }
return true; return true;
} }
void NavigateAction::activate(KSharedPtr<KoMacro::Context> context) void NavigateAction::activate(TDESharedPtr<KoMacro::Context> context)
{ {
KexiDialogBase* dialog = dynamic_cast<KexiDialogBase*>( mainWin()->activeWindow() ); KexiDialogBase* dialog = dynamic_cast<KexiDialogBase*>( mainWin()->activeWindow() );
if(! dialog) { if(! dialog) {

4
kexi/plugins/macros/kexiactions/navigateaction.h
Unescape View File

@ -63,7 +63,7 @@ namespace KexiMacro {
* @return true if the update was successfully else false * @return true if the update was successfully else false
* is returned. * is returned.
*/ */
virtual bool notifyUpdated(KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name); virtual bool notifyUpdated(TDESharedPtr<KoMacro::MacroItem> macroitem, const TQString& name);
public slots: public slots:
@ -71,7 +71,7 @@ namespace KexiMacro {
* Called if the @a Action should be executed within the * Called if the @a Action should be executed within the
* defined @p context . * defined @p context .
*/ */
virtual void activate(KSharedPtr<KoMacro::Context> context); virtual void activate(TDESharedPtr<KoMacro::Context> context);
}; };
} }

2
kexi/plugins/macros/kexiactions/objectnamevariable.h
Unescape View File

@ -61,7 +61,7 @@ namespace KexiMacro {
namelist << ""; namelist << "";
for(TQStringList::Iterator it = namelist.begin(); it != namelist.end(); ++it) for(TQStringList::Iterator it = namelist.begin(); it != namelist.end(); ++it)
this->appendChild( KSharedPtr<KoMacro::Variable>(new KoMacro::Variable(*it)) ); this->appendChild( TDESharedPtr<KoMacro::Variable>(new KoMacro::Variable(*it)) );
this->setVariant( (name.isNull() || ! namelist.contains(name)) ? namelist[0] : name ); this->setVariant( (name.isNull() || ! namelist.contains(name)) ? namelist[0] : name );

2
kexi/plugins/macros/kexiactions/objectvariable.h
Unescape View File

@ -67,7 +67,7 @@ namespace KexiMacro {
continue; continue;
const TQString name = info->objectName(); //info->groupName(); const TQString name = info->objectName(); //info->groupName();
this->appendChild( KSharedPtr<KoMacro::Variable>(new KoMacro::Variable(name)) ); this->appendChild( TDESharedPtr<KoMacro::Variable>(new KoMacro::Variable(name)) );
} }
if(! objectname.isNull()) if(! objectname.isNull())

18
kexi/plugins/macros/kexiactions/openaction.cpp
Unescape View File

@ -63,7 +63,7 @@ namespace KexiMacro {
if(viewmodes & Kexi::TextViewMode) if(viewmodes & Kexi::TextViewMode)
namelist << TEXTVIEW; namelist << TEXTVIEW;
for(TQStringList::Iterator it = namelist.begin(); it != namelist.end(); ++it) for(TQStringList::Iterator it = namelist.begin(); it != namelist.end(); ++it)
this->children().append( KSharedPtr<KoMacro::Variable>(new KoMacro::Variable(*it)) ); this->children().append( TDESharedPtr<KoMacro::Variable>(new KoMacro::Variable(*it)) );
} }
const TQString n = const TQString n =
namelist.contains(viewname) namelist.contains(viewname)
@ -81,21 +81,21 @@ OpenAction::OpenAction()
{ {
const int conditions = ObjectVariable<OpenAction>::VisibleInNav; const int conditions = ObjectVariable<OpenAction>::VisibleInNav;
KSharedPtr<KoMacro::Variable> objvar = new ObjectVariable<OpenAction>(this, conditions); TDESharedPtr<KoMacro::Variable> objvar = new ObjectVariable<OpenAction>(this, conditions);
setVariable(objvar); setVariable(objvar);
setVariable(KSharedPtr<KoMacro::Variable>( new ObjectNameVariable<OpenAction>(this, objvar->variant().toString()) )); setVariable(TDESharedPtr<KoMacro::Variable>( new ObjectNameVariable<OpenAction>(this, objvar->variant().toString()) ));
setVariable(KSharedPtr<KoMacro::Variable>( new ViewVariable<OpenAction>(this, objvar->variant().toString()) )); setVariable(TDESharedPtr<KoMacro::Variable>( new ViewVariable<OpenAction>(this, objvar->variant().toString()) ));
} }
OpenAction::~OpenAction() OpenAction::~OpenAction()
{ {
} }
bool OpenAction::notifyUpdated(KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name) bool OpenAction::notifyUpdated(TDESharedPtr<KoMacro::MacroItem> macroitem, const TQString& name)
{ {
kdDebug()<<"OpenAction::notifyUpdated() name="<<name<<" macroitem.action="<<(macroitem->action() ? macroitem->action()->name() : "NOACTION")<<endl; kdDebug()<<"OpenAction::notifyUpdated() name="<<name<<" macroitem.action="<<(macroitem->action() ? macroitem->action()->name() : "NOACTION")<<endl;
KSharedPtr<KoMacro::Variable> variable = macroitem->variable(name, false); TDESharedPtr<KoMacro::Variable> variable = macroitem->variable(name, false);
if(! variable) { if(! variable) {
kdWarning()<<"OpenAction::notifyUpdated() No such variable="<<name<<" in macroitem."<<endl; kdWarning()<<"OpenAction::notifyUpdated() No such variable="<<name<<" in macroitem."<<endl;
return false; return false;
@ -108,15 +108,15 @@ bool OpenAction::notifyUpdated(KSharedPtr<KoMacro::MacroItem> macroitem, const T
const TQString viewname = macroitem->variant(VIEW, true).toString(); // "data", "design" or "text" const TQString viewname = macroitem->variant(VIEW, true).toString(); // "data", "design" or "text"
macroitem->variable(NAME, true)->setChildren( macroitem->variable(NAME, true)->setChildren(
KoMacro::Variable::List() << KSharedPtr<KoMacro::Variable>(new ObjectNameVariable<OpenAction>(this, objectvalue, objectname)) ); KoMacro::Variable::List() << TDESharedPtr<KoMacro::Variable>(new ObjectNameVariable<OpenAction>(this, objectvalue, objectname)) );
macroitem->variable(VIEW, true)->setChildren( macroitem->variable(VIEW, true)->setChildren(
KoMacro::Variable::List() << KSharedPtr<KoMacro::Variable>(new ViewVariable<OpenAction>(this, objectvalue, viewname)) ); KoMacro::Variable::List() << TDESharedPtr<KoMacro::Variable>(new ViewVariable<OpenAction>(this, objectvalue, viewname)) );
} }
return true; return true;
} }
void OpenAction::activate(KSharedPtr<KoMacro::Context> context) void OpenAction::activate(TDESharedPtr<KoMacro::Context> context)
{ {
if(! mainWin()->project()) { if(! mainWin()->project()) {
throw KoMacro::Exception(i18n("No project loaded.")); throw KoMacro::Exception(i18n("No project loaded."));

4
kexi/plugins/macros/kexiactions/openaction.h
Unescape View File

@ -64,7 +64,7 @@ namespace KexiMacro {
* @return true if the update was successfully else false * @return true if the update was successfully else false
* is returned. * is returned.
*/ */
virtual bool notifyUpdated(KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name); virtual bool notifyUpdated(TDESharedPtr<KoMacro::MacroItem> macroitem, const TQString& name);
public slots: public slots:
@ -72,7 +72,7 @@ namespace KexiMacro {
* Called if the @a Action should be executed within the * Called if the @a Action should be executed within the
* defined @p context . * defined @p context .
*/ */
virtual void activate(KSharedPtr<KoMacro::Context> context); virtual void activate(TDESharedPtr<KoMacro::Context> context);
}; };
} }

26
kexi/plugins/macros/kexipart/keximacrodesignview.cpp
Unescape View File

@ -137,7 +137,7 @@ KexiMacroDesignView::KexiMacroDesignView(KexiMainWindow *mainwin, TQWidget *pare
TQStringList actionnames = KoMacro::Manager::self()->actionNames(); TQStringList actionnames = KoMacro::Manager::self()->actionNames();
TQStringList::ConstIterator it, end( actionnames.constEnd() ); TQStringList::ConstIterator it, end( actionnames.constEnd() );
for( it = actionnames.constBegin(); it != end; ++it) { for( it = actionnames.constBegin(); it != end; ++it) {
KSharedPtr<KoMacro::Action> action = KoMacro::Manager::self()->action(*it); TDESharedPtr<KoMacro::Action> action = KoMacro::Manager::self()->action(*it);
items.append( action->text() ); items.append( action->text() );
} }
@ -218,7 +218,7 @@ void KexiMacroDesignView::updateData()
d->tabledata->append(tableitem); d->tabledata->append(tableitem);
} }
// Set the action-column. // Set the action-column.
KSharedPtr<KoMacro::Action> action = (*it)->action(); TDESharedPtr<KoMacro::Action> action = (*it)->action();
if(action.data()) { if(action.data()) {
int i = actionnames.findIndex( action->name() ); int i = actionnames.findIndex( action->name() );
if(i >= 0) { if(i >= 0) {
@ -273,11 +273,11 @@ void KexiMacroDesignView::beforeCellChanged(KexiTableItem* item, int colnum, TQV
// If the rowindex doesn't exists yet, we need to append new // If the rowindex doesn't exists yet, we need to append new
// items till we are able to access the item we like to use. // items till we are able to access the item we like to use.
for(int i = macro()->items().count(); i <= rowindex; i++) { for(int i = macro()->items().count(); i <= rowindex; i++) {
macro()->addItem( KSharedPtr<KoMacro::MacroItem>( new KoMacro::MacroItem() ) ); macro()->addItem( TDESharedPtr<KoMacro::MacroItem>( new KoMacro::MacroItem() ) );
} }
// Get the matching MacroItem. // Get the matching MacroItem.
KSharedPtr<KoMacro::MacroItem> macroitem = macro()->items()[rowindex]; TDESharedPtr<KoMacro::MacroItem> macroitem = macro()->items()[rowindex];
if(! macroitem.data()) { if(! macroitem.data()) {
kdWarning() << "KexiMacroDesignView::beforeCellChanged() Invalid item for rowindex=" << rowindex << endl; kdWarning() << "KexiMacroDesignView::beforeCellChanged() Invalid item for rowindex=" << rowindex << endl;
return; return;
@ -293,7 +293,7 @@ void KexiMacroDesignView::beforeCellChanged(KexiTableItem* item, int colnum, TQV
TQStringList actionnames = KoMacro::Manager::self()->actionNames(); TQStringList actionnames = KoMacro::Manager::self()->actionNames();
actionname = actionnames[ selectedindex - 1 ]; // first item is empty actionname = actionnames[ selectedindex - 1 ]; // first item is empty
} }
KSharedPtr<KoMacro::Action> action = KoMacro::Manager::self()->action(actionname); TDESharedPtr<KoMacro::Action> action = KoMacro::Manager::self()->action(actionname);
macroitem->setAction(action); macroitem->setAction(action);
updateProperties(d->propertyset->currentRow(), d->propertyset->currentPropertySet(), macroitem); updateProperties(d->propertyset->currentRow(), d->propertyset->currentPropertySet(), macroitem);
propertySetReloaded(true); propertySetReloaded(true);
@ -329,7 +329,7 @@ void KexiMacroDesignView::rowInserted(KexiTableItem*, uint row, bool)
// need to do anything yet cause the new item will be handled on // need to do anything yet cause the new item will be handled on
// beforeCellChanged() anyway. // beforeCellChanged() anyway.
kdDebug() << "KexiMacroDesignView::rowInserted() Inserting new MacroItem" << endl; kdDebug() << "KexiMacroDesignView::rowInserted() Inserting new MacroItem" << endl;
KSharedPtr<KoMacro::MacroItem> macroitem = KSharedPtr<KoMacro::MacroItem>( new KoMacro::MacroItem() ); TDESharedPtr<KoMacro::MacroItem> macroitem = TDESharedPtr<KoMacro::MacroItem>( new KoMacro::MacroItem() );
KoMacro::MacroItem::List::Iterator it = macroitems.at(row); KoMacro::MacroItem::List::Iterator it = macroitems.at(row);
macroitems.insert(it, macroitem); macroitems.insert(it, macroitem);
} }
@ -347,7 +347,7 @@ void KexiMacroDesignView::rowDeleted()
macroitems.remove( macroitems.at(rowindex) ); macroitems.remove( macroitems.at(rowindex) );
} }
bool KexiMacroDesignView::updateSet(KoProperty::Set* set, KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& variablename) bool KexiMacroDesignView::updateSet(KoProperty::Set* set, TDESharedPtr<KoMacro::MacroItem> macroitem, const TQString& variablename)
{ {
kdDebug() << "KexiMacroDesignView::updateSet() variablename=" << variablename << endl; kdDebug() << "KexiMacroDesignView::updateSet() variablename=" << variablename << endl;
KoProperty::Property* property = KexiMacroProperty::createProperty(macroitem, variablename); KoProperty::Property* property = KexiMacroProperty::createProperty(macroitem, variablename);
@ -357,7 +357,7 @@ bool KexiMacroDesignView::updateSet(KoProperty::Set* set, KSharedPtr<KoMacro::Ma
return true; return true;
} }
void KexiMacroDesignView::updateProperties(int row, KoProperty::Set* set, KSharedPtr<KoMacro::MacroItem> macroitem) void KexiMacroDesignView::updateProperties(int row, KoProperty::Set* set, TDESharedPtr<KoMacro::MacroItem> macroitem)
{ {
kdDebug() << "KexiMacroDesignView::updateProperties() row=" << row << endl; kdDebug() << "KexiMacroDesignView::updateProperties() row=" << row << endl;
@ -365,7 +365,7 @@ void KexiMacroDesignView::updateProperties(int row, KoProperty::Set* set, KShare
return; // ignore invalid rows and avoid infinite recursion. return; // ignore invalid rows and avoid infinite recursion.
} }
KSharedPtr<KoMacro::Action> action = macroitem->action(); TDESharedPtr<KoMacro::Action> action = macroitem->action();
if(! action.data()) { if(! action.data()) {
// don't display a propertyset if there is no action defined. // don't display a propertyset if there is no action defined.
d->propertyset->remove(row); d->propertyset->remove(row);
@ -395,7 +395,7 @@ void KexiMacroDesignView::updateProperties(int row, KoProperty::Set* set, KShare
TQStringList varnames = action->variableNames(); TQStringList varnames = action->variableNames();
for(TQStringList::Iterator it = varnames.begin(); it != varnames.end(); ++it) { for(TQStringList::Iterator it = varnames.begin(); it != varnames.end(); ++it) {
if(updateSet(set, macroitem, *it)) { if(updateSet(set, macroitem, *it)) {
KSharedPtr<KoMacro::Variable> variable = macroitem->variable(*it, true); TDESharedPtr<KoMacro::Variable> variable = macroitem->variable(*it, true);
kdDebug()<<"KexiMacroDesignView::updateProperties() name=" << *it << " variable=" << variable->variant().toString() << endl; kdDebug()<<"KexiMacroDesignView::updateProperties() name=" << *it << " variable=" << variable->variant().toString() << endl;
#if 0 #if 0
macroitem->setVariable(*it, variable); macroitem->setVariable(*it, variable);
@ -428,7 +428,7 @@ void KexiMacroDesignView::propertyChanged(KoProperty::Set& set, KoProperty::Prop
setDirty(); setDirty();
if(reload) { if(reload) {
// The MacroItem which should be changed. // The MacroItem which should be changed.
KSharedPtr<KoMacro::MacroItem> macroitem = macro()->items()[row]; TDESharedPtr<KoMacro::MacroItem> macroitem = macro()->items()[row];
// Update the properties. // Update the properties.
updateProperties(row, &set, macroitem); updateProperties(row, &set, macroitem);
} }
@ -442,11 +442,11 @@ void KexiMacroDesignView::propertyChanged(KoProperty::Set& set, KoProperty::Prop
*/ */
/* /*
TQStringList dirtyvarnames = macroitem->setVariable(name, KSharedPtr<KoMacro::Variable>(pv)); TQStringList dirtyvarnames = macroitem->setVariable(name, TDESharedPtr<KoMacro::Variable>(pv));
bool dirty = false; bool dirty = false;
bool reload = false; bool reload = false;
for(TQStringList::Iterator it = dirtyvarnames.begin(); it != dirtyvarnames.end(); ++it) { for(TQStringList::Iterator it = dirtyvarnames.begin(); it != dirtyvarnames.end(); ++it) {
KSharedPtr<KoMacro::Variable> variable = macroitem->variable(*it); TDESharedPtr<KoMacro::Variable> variable = macroitem->variable(*it);
if(! variable.data()) { if(! variable.data()) {
kdDebug() << "KexiMacroDesignView::propertyChanged() name=" << name << " it=" << *it << " skipped cause such a variable is not known." << endl; kdDebug() << "KexiMacroDesignView::propertyChanged() name=" << name << " it=" << *it << " skipped cause such a variable is not known." << endl;
continue; continue;

4
kexi/plugins/macros/kexipart/keximacrodesignview.h
Unescape View File

@ -118,13 +118,13 @@ class KexiMacroDesignView : public KexiMacroView
* Update the \a KoProperty::Set set with the passed \a KoMacro::MacroItem * Update the \a KoProperty::Set set with the passed \a KoMacro::MacroItem
* \p item and the variablename \p variablename . * \p item and the variablename \p variablename .
*/ */
bool updateSet(KoProperty::Set* set, KSharedPtr<KoMacro::MacroItem> item, const TQString& variablename); bool updateSet(KoProperty::Set* set, TDESharedPtr<KoMacro::MacroItem> item, const TQString& variablename);
/** /**
* Update the properties of the \a KoProperty::Set \p set at * Update the properties of the \a KoProperty::Set \p set at
* row-number \p row with the \a KoMacro::MacroItem \p macroitem . * row-number \p row with the \a KoMacro::MacroItem \p macroitem .
*/ */
void updateProperties(int row, KoProperty::Set* set, KSharedPtr<KoMacro::MacroItem> macroitem); void updateProperties(int row, KoProperty::Set* set, TDESharedPtr<KoMacro::MacroItem> macroitem);
}; };
#endif #endif

8
kexi/plugins/macros/kexipart/keximacroerror.cpp
Unescape View File

@ -34,7 +34,7 @@ class KexiMacroError::Private
{ {
public: public:
KexiMainWindow* const mainwin; KexiMainWindow* const mainwin;
KSharedPtr<KoMacro::Context> context; TDESharedPtr<KoMacro::Context> context;
Private(KexiMainWindow* const m, KoMacro::Context* const c) Private(KexiMainWindow* const m, KoMacro::Context* const c)
: mainwin(m) : mainwin(m)
@ -43,7 +43,7 @@ class KexiMacroError::Private
} }
}; };
KexiMacroError::KexiMacroError(KexiMainWindow* mainwin, KSharedPtr<KoMacro::Context> context) KexiMacroError::KexiMacroError(KexiMainWindow* mainwin, TDESharedPtr<KoMacro::Context> context)
: KexiMacroErrorBase(mainwin, "KexiMacroError" , /*WFlags*/ TQt::WDestructiveClose) : KexiMacroErrorBase(mainwin, "KexiMacroError" , /*WFlags*/ TQt::WDestructiveClose)
, d(new Private(mainwin, context)) , d(new Private(mainwin, context))
{ {
@ -62,7 +62,7 @@ KexiMacroError::KexiMacroError(KexiMainWindow* mainwin, KSharedPtr<KoMacro::Cont
KListViewItem* listviewitem = new KListViewItem(errorlist); KListViewItem* listviewitem = new KListViewItem(errorlist);
listviewitem->setText(0,TQString("%1").arg(i++)); listviewitem->setText(0,TQString("%1").arg(i++));
listviewitem->setText(1,i18n("Action")); listviewitem->setText(1,i18n("Action"));
KSharedPtr<KoMacro::MacroItem> macroitem = *mit; TDESharedPtr<KoMacro::MacroItem> macroitem = *mit;
if (macroitem != 0 && macroitem->action() != 0) if (macroitem != 0 && macroitem->action() != 0)
{ {
@ -103,7 +103,7 @@ void KexiMacroError::designbtnClicked()
} }
// We need to determinate the KexiPart::Item which should be opened. // We need to determinate the KexiPart::Item which should be opened.
KSharedPtr<KoMacro::Macro> macro = d->context->macro(); TDESharedPtr<KoMacro::Macro> macro = d->context->macro();
const TQString name = macro->name(); const TQString name = macro->name();
KexiPart::Item* item = d->mainwin->project()->itemForMimeType("kexi/macro", name); KexiPart::Item* item = d->mainwin->project()->itemForMimeType("kexi/macro", name);
if(! item) { if(! item) {

2
kexi/plugins/macros/kexipart/keximacroerror.h
Unescape View File

@ -60,7 +60,7 @@ class KexiMacroError : public KexiMacroErrorBase
* @param mainwin The parent @a KexiMainWindow instance. * @param mainwin The parent @a KexiMainWindow instance.
* @param context The @a KoMacro::Context where the error happened. * @param context The @a KoMacro::Context where the error happened.
*/ */
KexiMacroError(KexiMainWindow* mainwin, KSharedPtr<KoMacro::Context> context); KexiMacroError(KexiMainWindow* mainwin, TDESharedPtr<KoMacro::Context> context);
/** /**
* Destructor. * Destructor.

2
kexi/plugins/macros/kexipart/keximacropart.cpp
Unescape View File

@ -129,7 +129,7 @@ KexiViewBase* KexiMacroPart::createView(TQWidget* parent, KexiDialogBase* dialog
//kdDebug() << "KexiMacroPart::createView() itemname=" << itemname << endl; //kdDebug() << "KexiMacroPart::createView() itemname=" << itemname << endl;
if(! itemname.isNull()) { if(! itemname.isNull()) {
KSharedPtr<KoMacro::Macro> macro = ::KoMacro::Manager::self()->getMacro(itemname); TDESharedPtr<KoMacro::Macro> macro = ::KoMacro::Manager::self()->getMacro(itemname);
if(! macro) { if(! macro) {
// If we don't have a macro with that name yet, create one. // If we don't have a macro with that name yet, create one.
macro = ::KoMacro::Manager::self()->createMacro(itemname); macro = ::KoMacro::Manager::self()->createMacro(itemname);

42
kexi/plugins/macros/kexipart/keximacroproperty.cpp
Unescape View File

@ -47,13 +47,13 @@ class KexiMacroProperty::Private
/** The @a KoMacro::MacroItem the custom property uses /** The @a KoMacro::MacroItem the custom property uses
internal. Together with the name we are able to identify internal. Together with the name we are able to identify
the used variable at runtime. */ the used variable at runtime. */
KSharedPtr<KoMacro::MacroItem> macroitem; TDESharedPtr<KoMacro::MacroItem> macroitem;
/** The name the variable @a KoMacro::Variable is known /** The name the variable @a KoMacro::Variable is known
as in the @a KoMacro::MacroItem defined above. */ as in the @a KoMacro::MacroItem defined above. */
TQString name; TQString name;
}; };
KexiMacroProperty::KexiMacroProperty(KoProperty::Property* parent, KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name) KexiMacroProperty::KexiMacroProperty(KoProperty::Property* parent, TDESharedPtr<KoMacro::MacroItem> macroitem, const TQString& name)
: KoProperty::CustomProperty(parent) : KoProperty::CustomProperty(parent)
, d( new Private() ) , d( new Private() )
{ {
@ -72,14 +72,14 @@ void KexiMacroProperty::init()
Q_ASSERT( d->macroitem != 0 ); Q_ASSERT( d->macroitem != 0 );
//kdDebug() << "--------- KexiMacroProperty::set() macroitem=" << d->macroitem->name() << " name=" << d->name << endl; //kdDebug() << "--------- KexiMacroProperty::set() macroitem=" << d->macroitem->name() << " name=" << d->name << endl;
KSharedPtr<KoMacro::Action> action = d->macroitem->action(); TDESharedPtr<KoMacro::Action> action = d->macroitem->action();
KSharedPtr<KoMacro::Variable> actionvariable = action->variable(d->name); TDESharedPtr<KoMacro::Variable> actionvariable = action->variable(d->name);
if(! actionvariable.data()) { if(! actionvariable.data()) {
kdDebug() << "KexiMacroProperty::createProperty() Skipped cause there exists no such action=" << d->name << endl; kdDebug() << "KexiMacroProperty::createProperty() Skipped cause there exists no such action=" << d->name << endl;
return; return;
} }
KSharedPtr<KoMacro::Variable> variable = d->macroitem->variable(d->name, true/*checkaction*/); TDESharedPtr<KoMacro::Variable> variable = d->macroitem->variable(d->name, true/*checkaction*/);
if(! variable.data()) { if(! variable.data()) {
kdDebug() << "KexiMacroProperty::createProperty() Skipped cause there exists no such variable=" << d->name << endl; kdDebug() << "KexiMacroProperty::createProperty() Skipped cause there exists no such variable=" << d->name << endl;
return; return;
@ -121,7 +121,7 @@ void KexiMacroProperty::setValue(const TQVariant &value, bool rememberOldValue)
TQVariant KexiMacroProperty::value() const TQVariant KexiMacroProperty::value() const
{ {
KSharedPtr<KoMacro::Variable> variable = d->macroitem->variable(d->name, true); TDESharedPtr<KoMacro::Variable> variable = d->macroitem->variable(d->name, true);
Q_ASSERT( variable.data() != 0 ); Q_ASSERT( variable.data() != 0 );
return variable.data() ? variable->variant() : TQVariant(); return variable.data() ? variable->variant() : TQVariant();
} }
@ -131,7 +131,7 @@ bool KexiMacroProperty::handleValue() const
return true; // we handle getting and setting of values and don't need KoProperty::Property for it. return true; // we handle getting and setting of values and don't need KoProperty::Property for it.
} }
KSharedPtr<KoMacro::MacroItem> KexiMacroProperty::macroItem() const TDESharedPtr<KoMacro::MacroItem> KexiMacroProperty::macroItem() const
{ {
return d->macroitem; return d->macroitem;
} }
@ -141,12 +141,12 @@ TQString KexiMacroProperty::name() const
return d->name; return d->name;
} }
KSharedPtr<KoMacro::Variable> KexiMacroProperty::variable() const TDESharedPtr<KoMacro::Variable> KexiMacroProperty::variable() const
{ {
return d->macroitem->variable(d->name, true/*checkaction*/); return d->macroitem->variable(d->name, true/*checkaction*/);
} }
KoProperty::Property* KexiMacroProperty::createProperty(KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name) KoProperty::Property* KexiMacroProperty::createProperty(TDESharedPtr<KoMacro::MacroItem> macroitem, const TQString& name)
{ {
KoProperty::Property* property = new KoProperty::Property(); KoProperty::Property* property = new KoProperty::Property();
KexiMacroProperty* customproperty = new KexiMacroProperty(property, macroitem, name); KexiMacroProperty* customproperty = new KexiMacroProperty(property, macroitem, name);
@ -184,7 +184,7 @@ KoProperty::CustomProperty* KexiMacroPropertyFactory::createCustomProperty(KoPro
return 0; return 0;
} }
KSharedPtr<KoMacro::MacroItem> macroitem = parentcustomproperty->macroItem(); TDESharedPtr<KoMacro::MacroItem> macroitem = parentcustomproperty->macroItem();
Q_ASSERT( macroitem.data() != 0 ); Q_ASSERT( macroitem.data() != 0 );
const TQString name = parentcustomproperty->name(); const TQString name = parentcustomproperty->name();
Q_ASSERT(! name.isEmpty()); Q_ASSERT(! name.isEmpty());
@ -266,7 +266,7 @@ class EditListBoxItem : public ListBoxItem
} }
virtual TQString text() const { virtual TQString text() const {
KSharedPtr<KoMacro::Variable> variable = m_macroproperty->variable(); TDESharedPtr<KoMacro::Variable> variable = m_macroproperty->variable();
Q_ASSERT( variable.data() ); Q_ASSERT( variable.data() );
//kdDebug()<<"EditListBoxItem::text() text="<<variable->toString()<<endl; //kdDebug()<<"EditListBoxItem::text() text="<<variable->toString()<<endl;
Q_ASSERT( variable->toString() != TQString() ); Q_ASSERT( variable->toString() != TQString() );
@ -274,9 +274,9 @@ class EditListBoxItem : public ListBoxItem
} }
KoProperty::Widget* widget() const { return m_widget; } KoProperty::Widget* widget() const { return m_widget; }
KSharedPtr<KoMacro::MacroItem> macroItem() const { return m_macroproperty->macroItem(); } TDESharedPtr<KoMacro::MacroItem> macroItem() const { return m_macroproperty->macroItem(); }
KSharedPtr<KoMacro::Variable> variable() const { return m_macroproperty->variable(); } TDESharedPtr<KoMacro::Variable> variable() const { return m_macroproperty->variable(); }
KSharedPtr<KoMacro::Action> action() const { return m_macroproperty->macroItem()->action(); } TDESharedPtr<KoMacro::Action> action() const { return m_macroproperty->macroItem()->action(); }
protected: protected:
virtual void paint(TQPainter* p) { virtual void paint(TQPainter* p) {
@ -290,9 +290,9 @@ class EditListBoxItem : public ListBoxItem
private: private:
void init() { void init() {
KSharedPtr<KoMacro::MacroItem> macroitem = m_macroproperty->macroItem(); TDESharedPtr<KoMacro::MacroItem> macroitem = m_macroproperty->macroItem();
Q_ASSERT( macroitem.data() ); Q_ASSERT( macroitem.data() );
KSharedPtr<KoMacro::Action> action = m_macroproperty->macroItem()->action(); TDESharedPtr<KoMacro::Action> action = m_macroproperty->macroItem()->action();
if(! action.data()) { if(! action.data()) {
kdWarning() << "EditListBoxItem::EditListBoxItem() Skipped cause there exists no action for macroproperty=" << m_macroproperty->name() << endl; kdWarning() << "EditListBoxItem::EditListBoxItem() Skipped cause there exists no action for macroproperty=" << m_macroproperty->name() << endl;
return; return;
@ -302,7 +302,7 @@ class EditListBoxItem : public ListBoxItem
kdWarning() << "EditListBoxItem::EditListBoxItem() No parentproperty defined" << endl; kdWarning() << "EditListBoxItem::EditListBoxItem() No parentproperty defined" << endl;
return; return;
} }
KSharedPtr<KoMacro::Variable> variable = m_macroproperty->variable(); TDESharedPtr<KoMacro::Variable> variable = m_macroproperty->variable();
if(! variable.data()) { if(! variable.data()) {
kdWarning() << "EditListBoxItem::EditListBoxItem() No variable defined for property=" << parentproperty->name() << endl; kdWarning() << "EditListBoxItem::EditListBoxItem() No variable defined for property=" << parentproperty->name() << endl;
return; return;
@ -310,7 +310,7 @@ class EditListBoxItem : public ListBoxItem
TQVariant variant = variable->variant(); TQVariant variant = variable->variant();
KSharedPtr<KoMacro::Variable> actionvariable = action->variable(m_macroproperty->name()); TDESharedPtr<KoMacro::Variable> actionvariable = action->variable(m_macroproperty->name());
if(actionvariable.data()) { if(actionvariable.data()) {
TQVariant actionvariant = actionvariable->variant(); TQVariant actionvariant = actionvariable->variant();
Q_ASSERT( ! actionvariant.isNull() ); Q_ASSERT( ! actionvariant.isNull() );
@ -393,13 +393,13 @@ class ListBox : public TQListBox
{ {
KoMacro::Variable::List actionchildren; KoMacro::Variable::List actionchildren;
KSharedPtr<KoMacro::Variable> itemvar = m_macroproperty->macroItem()->variable(name,false); TDESharedPtr<KoMacro::Variable> itemvar = m_macroproperty->macroItem()->variable(name,false);
//kdDebug() << "KexiMacroProperty::ListBox::update() itemvar="<<(itemvar.data() ? "name:"+itemvar->name()+" value:"+itemvar->toString() : "NULL")<<endl; //kdDebug() << "KexiMacroProperty::ListBox::update() itemvar="<<(itemvar.data() ? "name:"+itemvar->name()+" value:"+itemvar->toString() : "NULL")<<endl;
if(itemvar.data()) if(itemvar.data())
actionchildren = itemvar->children(); actionchildren = itemvar->children();
KSharedPtr<KoMacro::Action> action = m_edititem->action(); TDESharedPtr<KoMacro::Action> action = m_edititem->action();
KSharedPtr<KoMacro::Variable> actionvar = action.data() ? action->variable(name) : KSharedPtr<KoMacro::Variable>(); TDESharedPtr<KoMacro::Variable> actionvar = action.data() ? action->variable(name) : TDESharedPtr<KoMacro::Variable>();
//kdDebug() << "KexiMacroProperty::ListBox::update() actionvar="<<(actionvar.data() ? "name:"+actionvar->name()+" value:"+actionvar->toString() : "NULL")<<endl; //kdDebug() << "KexiMacroProperty::ListBox::update() actionvar="<<(actionvar.data() ? "name:"+actionvar->name()+" value:"+actionvar->toString() : "NULL")<<endl;
if(actionvar.data()) if(actionvar.data())
actionchildren += actionvar->children(); actionchildren += actionvar->children();

8
kexi/plugins/macros/kexipart/keximacroproperty.h
Unescape View File

@ -47,7 +47,7 @@ class KexiMacroProperty
public: public:
/** Constructor. */ /** Constructor. */
explicit KexiMacroProperty(KoProperty::Property* parent, KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name); explicit KexiMacroProperty(KoProperty::Property* parent, TDESharedPtr<KoMacro::MacroItem> macroitem, const TQString& name);
/** Destructor. */ /** Destructor. */
virtual ~KexiMacroProperty(); virtual ~KexiMacroProperty();
@ -73,7 +73,7 @@ class KexiMacroProperty
/** \return the \a KoMacro::MacroItem this custom property has or /** \return the \a KoMacro::MacroItem this custom property has or
NULL if there was no item provided. */ NULL if there was no item provided. */
KSharedPtr<KoMacro::MacroItem> macroItem() const; TDESharedPtr<KoMacro::MacroItem> macroItem() const;
/** \return the name the property has in the \a KoMacro::MacroItem /** \return the name the property has in the \a KoMacro::MacroItem
above. Is TQString() if there was no item provided. */ above. Is TQString() if there was no item provided. */
@ -82,11 +82,11 @@ class KexiMacroProperty
/** \return the \a KoMacro::Variable which has the name @a name() /** \return the \a KoMacro::Variable which has the name @a name()
in the item @a macroItem() . If such a variable doesn't exists NULL in the item @a macroItem() . If such a variable doesn't exists NULL
is returned. */ is returned. */
KSharedPtr<KoMacro::Variable> variable() const; TDESharedPtr<KoMacro::Variable> variable() const;
/** Factory function to create a new @a KoProperty::Property instance /** Factory function to create a new @a KoProperty::Property instance
that will use a @a KexiMacroProperty as container. */ that will use a @a KexiMacroProperty as container. */
static KoProperty::Property* createProperty(KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name); static KoProperty::Property* createProperty(TDESharedPtr<KoMacro::MacroItem> macroitem, const TQString& name);
signals: signals:

6
kexi/plugins/macros/kexipart/keximacroview.cpp
Unescape View File

@ -47,7 +47,7 @@ class KexiMacroView::Private
* The \a KoMacro::Manager instance used to access the * The \a KoMacro::Manager instance used to access the
* Macro Framework. * Macro Framework.
*/ */
KSharedPtr<KoMacro::Macro> macro; TDESharedPtr<KoMacro::Macro> macro;
/** /**
* Constructor. * Constructor.
@ -76,7 +76,7 @@ KexiMacroView::~KexiMacroView()
delete d; delete d;
} }
KSharedPtr<KoMacro::Macro> KexiMacroView::macro() const TDESharedPtr<KoMacro::Macro> KexiMacroView::macro() const
{ {
return d->macro; return d->macro;
} }
@ -161,7 +161,7 @@ tristate KexiMacroView::storeData(bool /*dontAsk*/)
void KexiMacroView::execute(TQObject* sender) void KexiMacroView::execute(TQObject* sender)
{ {
KSharedPtr<KoMacro::Context> context = d->macro->execute(sender); TDESharedPtr<KoMacro::Context> context = d->macro->execute(sender);
if(context->hadException()) { if(context->hadException()) {
KexiMacroError* error = new KexiMacroError( KexiMacroError* error = new KexiMacroError(
mainWin(), // The parent KexiMainWindow mainWin(), // The parent KexiMainWindow

2
kexi/plugins/macros/kexipart/keximacroview.h
Unescape View File

@ -63,7 +63,7 @@ class KexiMacroView : public KexiViewBase
/** /**
* \return the Macro instance. * \return the Macro instance.
*/ */
KSharedPtr<KoMacro::Macro> macro() const; TDESharedPtr<KoMacro::Macro> macro() const;
/** /**
* Load the data from XML source and fill the internally * Load the data from XML source and fill the internally

12
kexi/plugins/macros/lib/action.cpp
Unescape View File

@ -68,7 +68,7 @@ namespace KoMacro {
Action::Action(const TQString& name, const TQString& text) Action::Action(const TQString& name, const TQString& text)
: TQObject() : TQObject()
, KShared() , TDEShared()
, d( new Private() ) // create the private d-pointer instance. , d( new Private() ) // create the private d-pointer instance.
{ {
kdDebug() << "Action::Action() name=" << name << endl; kdDebug() << "Action::Action() name=" << name << endl;
@ -76,7 +76,7 @@ Action::Action(const TQString& name, const TQString& text)
setText(text); setText(text);
// Publish this action. // Publish this action.
KoMacro::Manager::self()->publishAction( KSharedPtr<Action>(this) ); KoMacro::Manager::self()->publishAction( TDESharedPtr<Action>(this) );
} }
Action::~Action() Action::~Action()
@ -127,9 +127,9 @@ bool Action::hasVariable(const TQString& name) const
return d->varmap.contains(name); return d->varmap.contains(name);
} }
KSharedPtr<Variable> Action::variable(const TQString& name) const TDESharedPtr<Variable> Action::variable(const TQString& name) const
{ {
return d->varmap.contains(name) ? d->varmap[name] : KSharedPtr<Variable>(0); return d->varmap.contains(name) ? d->varmap[name] : TDESharedPtr<Variable>(0);
} }
Variable::Map Action::variables() const Variable::Map Action::variables() const
@ -142,7 +142,7 @@ TQStringList Action::variableNames() const
return d->varnames; return d->varnames;
} }
void Action::setVariable(KSharedPtr<Variable> variable) void Action::setVariable(TDESharedPtr<Variable> variable)
{ {
const TQString name = variable->name(); const TQString name = variable->name();
if(! d->varmap.contains(name)) { if(! d->varmap.contains(name)) {
@ -156,7 +156,7 @@ void Action::setVariable(const TQString& name, const TQString& text, const TQVar
Variable* variable = new Variable(variant); Variable* variable = new Variable(variant);
variable->setName(name); variable->setName(name);
variable->setText(text); variable->setText(text);
setVariable( KSharedPtr<Variable>(variable) ); setVariable( TDESharedPtr<Variable>(variable) );
} }
void Action::removeVariable(const TQString& name) void Action::removeVariable(const TQString& name)

12
kexi/plugins/macros/lib/action.h
Unescape View File

@ -37,7 +37,7 @@ namespace KoMacro {
*/ */
class KOMACRO_EXPORT Action class KOMACRO_EXPORT Action
: public TQObject // TQt functionality like signals and slots : public TQObject // TQt functionality like signals and slots
, public KShared // shared reference-counting , public TDEShared // shared reference-counting
{ {
Q_OBJECT Q_OBJECT
@ -56,7 +56,7 @@ namespace KoMacro {
/** /**
* Shared pointer to implement reference-counting. * Shared pointer to implement reference-counting.
*/ */
typedef TQMap<TQString, KSharedPtr<Action> > Map; typedef TQMap<TQString, TDESharedPtr<Action> > Map;
/** /**
* Constructor. * Constructor.
@ -118,7 +118,7 @@ namespace KoMacro {
* name @p name . If there exists no @a Variable with * name @p name . If there exists no @a Variable with
* such a name, NULL is returned. * such a name, NULL is returned.
*/ */
KSharedPtr<Variable> variable(const TQString& name) const; TDESharedPtr<Variable> variable(const TQString& name) const;
/** /**
* @return the map of variables this @a Action provides. * @return the map of variables this @a Action provides.
@ -134,7 +134,7 @@ namespace KoMacro {
* Append the @a Variable @p variable to list of variables * Append the @a Variable @p variable to list of variables
* this @a Action provides. * this @a Action provides.
*/ */
void setVariable(KSharedPtr<Variable> variable); void setVariable(TDESharedPtr<Variable> variable);
/** /**
* Set the variable. * Set the variable.
@ -162,7 +162,7 @@ namespace KoMacro {
* @return true if the update was successfully else false * @return true if the update was successfully else false
* is returned. * is returned.
*/ */
virtual bool notifyUpdated(const KSharedPtr<MacroItem> &macroitem, const TQString& name) { virtual bool notifyUpdated(const TDESharedPtr<MacroItem> &macroitem, const TQString& name) {
Q_UNUSED(macroitem); Q_UNUSED(macroitem);
Q_UNUSED(name); Q_UNUSED(name);
return true; // The default implementation does nothing. return true; // The default implementation does nothing.
@ -174,7 +174,7 @@ namespace KoMacro {
* Called if the @a Action should be executed within the * Called if the @a Action should be executed within the
* defined @p context . * defined @p context .
*/ */
virtual void activate(KSharedPtr<Context> context) = 0; virtual void activate(TDESharedPtr<Context> context) = 0;
private: private:
/// @internal d-pointer class. /// @internal d-pointer class.

38
kexi/plugins/macros/lib/context.cpp
Unescape View File

@ -41,25 +41,25 @@ namespace KoMacro {
/** /**
* The @a Macro instance that owns this @a Context . * The @a Macro instance that owns this @a Context .
*/ */
KSharedPtr<Macro> macro; TDESharedPtr<Macro> macro;
/** /**
* List of @a Action instances that are children of the * List of @a Action instances that are children of the
* macro. * macro.
*/ */
TQValueList<KSharedPtr<MacroItem > > items; TQValueList<TDESharedPtr<MacroItem > > items;
/** /**
* The currently selected @a MacroItem or NULL if there * The currently selected @a MacroItem or NULL if there
* is now @a MacroItem selected yet. * is now @a MacroItem selected yet.
*/ */
KSharedPtr<MacroItem> macroitem; TDESharedPtr<MacroItem> macroitem;
/** /**
* Map of all @a Variable instance that are defined within * Map of all @a Variable instance that are defined within
* this context. * this context.
*/ */
TQMap<TQString, KSharedPtr<Variable > > variables; TQMap<TQString, TDESharedPtr<Variable > > variables;
/** /**
* The @a Exception instance thrown at the last @a activate() * The @a Exception instance thrown at the last @a activate()
@ -68,7 +68,7 @@ namespace KoMacro {
Exception* exception; Exception* exception;
/// Constructor. /// Constructor.
explicit Private(KSharedPtr<Macro> m) explicit Private(TDESharedPtr<Macro> m)
: macro(m) // remember the macro : macro(m) // remember the macro
, items(m->items()) // set d-pointer children to macro children , items(m->items()) // set d-pointer children to macro children
, exception(0) // no exception yet. , exception(0) // no exception yet.
@ -84,7 +84,7 @@ namespace KoMacro {
} }
//Constructor with initialization of our Private.object (d-pointer) //Constructor with initialization of our Private.object (d-pointer)
Context::Context(KSharedPtr<Macro> macro) Context::Context(TDESharedPtr<Macro> macro)
: TQObject() : TQObject()
, d( new Private(macro) ) // create the private d-pointer instance. , d( new Private(macro) ) // create the private d-pointer instance.
{ {
@ -104,7 +104,7 @@ bool Context::hasVariable(const TQString& name) const
} }
//return variable with name or throw an exception if none is found in variables //return variable with name or throw an exception if none is found in variables
KSharedPtr<Variable> Context::variable(const TQString& name) const TDESharedPtr<Variable> Context::variable(const TQString& name) const
{ {
//Use TQMap?s contains to check if a variable with name exists in context //Use TQMap?s contains to check if a variable with name exists in context
if (d->variables.contains(name)) { if (d->variables.contains(name)) {
@ -113,7 +113,7 @@ KSharedPtr<Variable> Context::variable(const TQString& name) const
} }
//if there is a macroitem try to get variable from it //if there is a macroitem try to get variable from it
if(d->macroitem.data()) { if(d->macroitem.data()) {
KSharedPtr<Variable> v = d->macroitem->variable(name, true); TDESharedPtr<Variable> v = d->macroitem->variable(name, true);
if(v.data()) { if(v.data()) {
return v; return v;
} }
@ -129,7 +129,7 @@ Variable::Map Context::variables() const
} }
//set a variable //set a variable
void Context::setVariable(const TQString& name, KSharedPtr<Variable> variable) void Context::setVariable(const TQString& name, TDESharedPtr<Variable> variable)
{ {
//debuging infos //debuging infos
kdDebug() << TQString("KoMacro::Context::setVariable name='%1' variable='%2'").arg(name).arg(variable->toString()) << endl; kdDebug() << TQString("KoMacro::Context::setVariable name='%1' variable='%2'").arg(name).arg(variable->toString()) << endl;
@ -138,13 +138,13 @@ void Context::setVariable(const TQString& name, KSharedPtr<Variable> variable)
} }
//return the associated Macro //return the associated Macro
KSharedPtr<Macro> Context::macro() const TDESharedPtr<Macro> Context::macro() const
{ {
return d->macro; return d->macro;
} }
//return the currently selected MacroItem //return the currently selected MacroItem
KSharedPtr<MacroItem> Context::macroItem() const TDESharedPtr<MacroItem> Context::macroItem() const
{ {
return d->macroitem; return d->macroitem;
} }
@ -162,18 +162,18 @@ Exception* Context::exception() const
} }
//try to activate all action?s in this context //try to activate all action?s in this context
void Context::activate(TQValueList<KSharedPtr<MacroItem > >::ConstIterator it) void Context::activate(TQValueList<TDESharedPtr<MacroItem > >::ConstIterator it)
{ {
//debuging infos //debuging infos
kdDebug() << "Context::activate()" << endl; kdDebug() << "Context::activate()" << endl;
//TQ_ASSIGN(d->macro); //TQ_ASSIGN(d->macro);
//set end to constEnd //set end to constEnd
TQValueList<KSharedPtr<MacroItem > >::ConstIterator end(d->items.constEnd()); TQValueList<TDESharedPtr<MacroItem > >::ConstIterator end(d->items.constEnd());
//loop through actions //loop through actions
for(;it != end; ++it) { for(;it != end; ++it) {
// fetch the MacroItem we are currently pointing to. // fetch the MacroItem we are currently pointing to.
d->macroitem = KSharedPtr<MacroItem>(*it); d->macroitem = TDESharedPtr<MacroItem>(*it);
//skip empty macroitems //skip empty macroitems
if(! d->macroitem.data()) { if(! d->macroitem.data()) {
kdDebug() << "Context::activate() Skipping empty MacroItem" << endl; kdDebug() << "Context::activate() Skipping empty MacroItem" << endl;
@ -181,7 +181,7 @@ void Context::activate(TQValueList<KSharedPtr<MacroItem > >::ConstIterator it)
} }
// fetch the Action, the MacroItem points to. // fetch the Action, the MacroItem points to.
KSharedPtr<Action> action = d->macroitem->action(); TDESharedPtr<Action> action = d->macroitem->action();
//skip macroitems without an action //skip macroitems without an action
if(! action.data()) { if(! action.data()) {
kdDebug() << "Context::activate() Skipping MacroItem with no action" << endl; kdDebug() << "Context::activate() Skipping MacroItem with no action" << endl;
@ -204,7 +204,7 @@ void Context::activate(TQValueList<KSharedPtr<MacroItem > >::ConstIterator it)
//and all variables wich belong to the action/macro //and all variables wich belong to the action/macro
TQStringList variables = action->variableNames(); TQStringList variables = action->variableNames();
for(TQStringList::Iterator vit = variables.begin(); vit != variables.end(); ++vit) { for(TQStringList::Iterator vit = variables.begin(); vit != variables.end(); ++vit) {
KSharedPtr<Variable> v = d->macroitem->variable(*vit, true); TDESharedPtr<Variable> v = d->macroitem->variable(*vit, true);
d->exception->addTraceMessage( TQString("%1=%2").arg(*vit).arg(v->toString()) ); d->exception->addTraceMessage( TQString("%1=%2").arg(*vit).arg(v->toString()) );
} }
return; // abort execution return; // abort execution
@ -213,11 +213,11 @@ void Context::activate(TQValueList<KSharedPtr<MacroItem > >::ConstIterator it)
// The run is done. So, let's remove the currently selected item to // The run is done. So, let's remove the currently selected item to
// outline, that we did the job and there stays no dangling item. // outline, that we did the job and there stays no dangling item.
d->macroitem = KSharedPtr<MacroItem>(0); d->macroitem = TDESharedPtr<MacroItem>(0);
} }
//try to activated an context //try to activated an context
void Context::activate(KSharedPtr<Context> context) void Context::activate(TDESharedPtr<Context> context)
{ {
//setup context //setup context
delete d->exception; d->exception = 0; delete d->exception; d->exception = 0;
@ -252,7 +252,7 @@ void Context::activateNext()
} }
//find the macroitem from which to continue //find the macroitem from which to continue
TQValueList<KSharedPtr<MacroItem > >::ConstIterator it = d->items.find(d->macroitem); TQValueList<TDESharedPtr<MacroItem > >::ConstIterator it = d->items.find(d->macroitem);
if (it != d->items.constEnd()) { if (it != d->items.constEnd()) {
activate(++it); // try to continue the execution. activate(++it); // try to continue the execution.
} }

16
kexi/plugins/macros/lib/context.h
Unescape View File

@ -40,7 +40,7 @@ namespace KoMacro {
*/ */
class KOMACRO_EXPORT Context class KOMACRO_EXPORT Context
: public TQObject : public TQObject
, public KShared , public TDEShared
{ {
Q_OBJECT Q_OBJECT
@ -51,7 +51,7 @@ namespace KoMacro {
* *
* @param macro The @a Macro this @a Context belongs to. * @param macro The @a Macro this @a Context belongs to.
*/ */
explicit Context(KSharedPtr<Macro> macro); explicit Context(TDESharedPtr<Macro> macro);
/** /**
* Destructor. * Destructor.
@ -68,7 +68,7 @@ namespace KoMacro {
* @return the @a Variable defined with name @p name or * @return the @a Variable defined with name @p name or
* NULL if there exists no such variable. * NULL if there exists no such variable.
*/ */
KSharedPtr<Variable> variable(const TQString& name) const; TDESharedPtr<Variable> variable(const TQString& name) const;
/** /**
* @return a map of all @a Variable instance that are defined * @return a map of all @a Variable instance that are defined
@ -80,18 +80,18 @@ namespace KoMacro {
* Set the variable @p variable defined with name @p name . If * Set the variable @p variable defined with name @p name . If
* there exists already a variable with that name replace it. * there exists already a variable with that name replace it.
*/ */
void setVariable(const TQString& name, KSharedPtr<Variable> variable); void setVariable(const TQString& name, TDESharedPtr<Variable> variable);
/** /**
* @return the associated macro * @return the associated macro
*/ */
KSharedPtr<Macro> macro() const; TDESharedPtr<Macro> macro() const;
/** /**
* @return the currently selected @a MacroItem instance * @return the currently selected @a MacroItem instance
* or NULL if there is no @a MacroItem selected yet. * or NULL if there is no @a MacroItem selected yet.
*/ */
KSharedPtr<MacroItem> macroItem() const; TDESharedPtr<MacroItem> macroItem() const;
/** /**
* @return true if the last @a activate() stopped with an * @return true if the last @a activate() stopped with an
@ -114,7 +114,7 @@ namespace KoMacro {
* remembers what @a Action should be executed next and * remembers what @a Action should be executed next and
* calling this slot just activates those @a Action . * calling this slot just activates those @a Action .
*/ */
virtual void activate(TQValueList<KSharedPtr <MacroItem> >::ConstIterator it); virtual void activate(TQValueList<TDESharedPtr <MacroItem> >::ConstIterator it);
public slots: public slots:
@ -123,7 +123,7 @@ namespace KoMacro {
* @a Context @p context which will be used as * @a Context @p context which will be used as
* parent context for this context. * parent context for this context.
*/ */
virtual void activate(KSharedPtr<Context> context); virtual void activate(TDESharedPtr<Context> context);
/** /**
* This slot continues execution. * This slot continues execution.

16
kexi/plugins/macros/lib/macro.cpp
Unescape View File

@ -41,7 +41,7 @@ namespace KoMacro {
/** /**
* A list of @a MacroItem instances. * A list of @a MacroItem instances.
*/ */
TQValueList<KSharedPtr<MacroItem > > itemlist; TQValueList<TDESharedPtr<MacroItem > > itemlist;
/** /**
* The name the @a Macro has. * The name the @a Macro has.
@ -55,7 +55,7 @@ namespace KoMacro {
//constructor, initalize internal (d-pointer) name //constructor, initalize internal (d-pointer) name
Macro::Macro(const TQString& name) Macro::Macro(const TQString& name)
: TQObject() : TQObject()
, KShared() , TDEShared()
, XMLHandler(this) , XMLHandler(this)
, d( new Private() ) // create the private d-pointer instance. , d( new Private() ) // create the private d-pointer instance.
{ {
@ -88,13 +88,13 @@ const TQString Macro::toString() const
} }
//get (d-pointer) itemlist //get (d-pointer) itemlist
TQValueList<KSharedPtr<MacroItem > >& Macro::items() const TQValueList<TDESharedPtr<MacroItem > >& Macro::items() const
{ {
return d->itemlist; return d->itemlist;
} }
//add a macroitem to internal (d-pointer) itemlist //add a macroitem to internal (d-pointer) itemlist
void Macro::addItem(KSharedPtr<MacroItem> item) void Macro::addItem(TDESharedPtr<MacroItem> item)
{ {
d->itemlist.append(item); d->itemlist.append(item);
} }
@ -105,15 +105,15 @@ void Macro::clearItems()
} }
//run our macro //run our macro
KSharedPtr<Context> Macro::execute(TQObject* sender) TDESharedPtr<Context> Macro::execute(TQObject* sender)
{ {
kdDebug() << "Macro::execute(KSharedPtr<Context>)" << endl; kdDebug() << "Macro::execute(TDESharedPtr<Context>)" << endl;
//create context in which macro can/should run //create context in which macro can/should run
KSharedPtr<Context> c = KSharedPtr<Context>( new Context(this) ); TDESharedPtr<Context> c = TDESharedPtr<Context>( new Context(this) );
if(sender) { if(sender) {
// set the sender-variable if we got a sender TQObject. // set the sender-variable if we got a sender TQObject.
c->setVariable("[sender]", KSharedPtr<Variable>( new Variable(sender) )); c->setVariable("[sender]", TDESharedPtr<Variable>( new Variable(sender) ));
} }
//connect(context, TQT_SIGNAL(activated()), this, TQT_SIGNAL(activated())); //connect(context, TQT_SIGNAL(activated()), this, TQT_SIGNAL(activated()));

10
kexi/plugins/macros/lib/macro.h
Unescape View File

@ -40,7 +40,7 @@ namespace KoMacro {
*/ */
class KOMACRO_EXPORT Macro class KOMACRO_EXPORT Macro
: public TQObject // TQt functionality like signals and slots : public TQObject // TQt functionality like signals and slots
, public KShared // shared reference-counting , public TDEShared // shared reference-counting
, public XMLHandler // to (un-)serialize from/to XML , public XMLHandler // to (un-)serialize from/to XML
{ {
Q_OBJECT Q_OBJECT
@ -53,7 +53,7 @@ namespace KoMacro {
* class should use this typemap rather then the TQMap direct. That * class should use this typemap rather then the TQMap direct. That
* way we are more flexible on future changes. * way we are more flexible on future changes.
*/ */
typedef TQMap<TQString, KSharedPtr<Macro > > Map; typedef TQMap<TQString, TDESharedPtr<Macro > > Map;
/** /**
* Constructor. * Constructor.
@ -87,13 +87,13 @@ namespace KoMacro {
* @return a list of @a MacroItem instances which * @return a list of @a MacroItem instances which
* are children of this @a Macro . * are children of this @a Macro .
*/ */
TQValueList< KSharedPtr<MacroItem> >& items() const; TQValueList< TDESharedPtr<MacroItem> >& items() const;
/** /**
* Add the @a MacroItem @p item to the list of items * Add the @a MacroItem @p item to the list of items
* this @a Macro has. * this @a Macro has.
*/ */
void addItem(KSharedPtr<MacroItem> item); void addItem(TDESharedPtr<MacroItem> item);
/** /**
* Removes all @a MacroItem instances this @a Macro has. * Removes all @a MacroItem instances this @a Macro has.
@ -117,7 +117,7 @@ namespace KoMacro {
* @param context The @a Context this @a Macro should * @param context The @a Context this @a Macro should
* be executed in. * be executed in.
*/ */
virtual KSharedPtr<Context> execute(TQObject* sender); virtual TDESharedPtr<Context> execute(TQObject* sender);
private: private:
/// @internal d-pointer class. /// @internal d-pointer class.

24
kexi/plugins/macros/lib/macroitem.cpp
Unescape View File

@ -35,7 +35,7 @@ namespace KoMacro {
/** /**
* The @a Action this @a MacroItem has. * The @a Action this @a MacroItem has.
*/ */
KSharedPtr<Action> action; TDESharedPtr<Action> action;
/** /**
* The comment this @a MacroItem has. * The comment this @a MacroItem has.
@ -109,7 +109,7 @@ namespace KoMacro {
} }
MacroItem::MacroItem() MacroItem::MacroItem()
: KShared() : TDEShared()
, d( new Private() ) , d( new Private() )
{ {
} }
@ -129,29 +129,29 @@ void MacroItem::setComment(const TQString& comment)
d->comment = comment; d->comment = comment;
} }
KSharedPtr<Action> MacroItem::action() const TDESharedPtr<Action> MacroItem::action() const
{ {
return d->action; return d->action;
} }
void MacroItem::setAction(KSharedPtr<Action> action) void MacroItem::setAction(TDESharedPtr<Action> action)
{ {
d->action = action; d->action = action;
} }
TQVariant MacroItem::variant(const TQString& name, bool checkaction) const TQVariant MacroItem::variant(const TQString& name, bool checkaction) const
{ {
KSharedPtr<Variable> v = variable(name, checkaction); TDESharedPtr<Variable> v = variable(name, checkaction);
return v.data() ? v->variant() : TQVariant(); return v.data() ? v->variant() : TQVariant();
} }
KSharedPtr<Variable> MacroItem::variable(const TQString& name, bool checkaction) const TDESharedPtr<Variable> MacroItem::variable(const TQString& name, bool checkaction) const
{ {
if(d->variables.contains(name)) if(d->variables.contains(name))
return d->variables[name]; return d->variables[name];
if(checkaction && d->action.data()) if(checkaction && d->action.data())
return d->action->variable(name); return d->action->variable(name);
return KSharedPtr<Variable>(0); return TDESharedPtr<Variable>(0);
} }
Variable::Map MacroItem::variables() const Variable::Map MacroItem::variables() const
@ -163,7 +163,7 @@ bool MacroItem::setVariant(const TQString& name, const TQVariant& variant)
{ {
// Let's look if there is an action defined for the variable. If that's // Let's look if there is an action defined for the variable. If that's
// the case, we try to use that action to preserve the type of the variant. // the case, we try to use that action to preserve the type of the variant.
KSharedPtr<Variable> actionvariable = d->action ? d->action->variable(name) : KSharedPtr<Variable>(0); TDESharedPtr<Variable> actionvariable = d->action ? d->action->variable(name) : TDESharedPtr<Variable>(0);
// If we know the expected type, we try to cast the variant to the expected // If we know the expected type, we try to cast the variant to the expected
// type else the variant stays untouched (so, it will stay a string). // type else the variant stays untouched (so, it will stay a string).
@ -172,12 +172,12 @@ bool MacroItem::setVariant(const TQString& name, const TQVariant& variant)
: variant; // don't cast anything, just leave the string-type... : variant; // don't cast anything, just leave the string-type...
// Now let's try to determinate the variable which should be changed. // Now let's try to determinate the variable which should be changed.
KSharedPtr<Variable> variable = d->variables[name]; TDESharedPtr<Variable> variable = d->variables[name];
if(! variable.data()) { if(! variable.data()) {
// if there exists no such variable yet, create one. // if there exists no such variable yet, create one.
kdDebug() << "MacroItem::setVariable() Creating new variable name=" << name << endl; kdDebug() << "MacroItem::setVariable() Creating new variable name=" << name << endl;
variable = KSharedPtr<Variable>( new Variable() ); variable = TDESharedPtr<Variable>( new Variable() );
variable->setName(name); variable->setName(name);
d->variables.replace(name, variable); d->variables.replace(name, variable);
} }
@ -201,11 +201,11 @@ bool MacroItem::setVariant(const TQString& name, const TQVariant& variant)
return true; return true;
} }
KSharedPtr<Variable> MacroItem::addVariable(const TQString& name, const TQVariant& variant) TDESharedPtr<Variable> MacroItem::addVariable(const TQString& name, const TQVariant& variant)
{ {
Q_ASSERT(! d->variables.contains(name) ); Q_ASSERT(! d->variables.contains(name) );
// Create a new Variable. // Create a new Variable.
KSharedPtr<Variable> variable = KSharedPtr<Variable>( new Variable() ); TDESharedPtr<Variable> variable = TDESharedPtr<Variable>( new Variable() );
variable->setName(name); variable->setName(name);
// Put it into the Variable-map. // Put it into the Variable-map.

14
kexi/plugins/macros/lib/macroitem.h
Unescape View File

@ -43,7 +43,7 @@ namespace KoMacro {
* MacroItem choosen @a Action implementation) and holds the by the * MacroItem choosen @a Action implementation) and holds the by the
* user defined modifications like e.g. the comment on the other hand. * user defined modifications like e.g. the comment on the other hand.
*/ */
class KOMACRO_EXPORT MacroItem : public KShared class KOMACRO_EXPORT MacroItem : public TDEShared
{ {
public: public:
@ -51,7 +51,7 @@ namespace KoMacro {
/** /**
* A list of \a MacroItem instances. * A list of \a MacroItem instances.
*/ */
typedef TQValueList<KSharedPtr<MacroItem > > List; typedef TQValueList<TDESharedPtr<MacroItem > > List;
/** /**
* Constructor. * Constructor.
@ -81,12 +81,12 @@ namespace KoMacro {
* no @a Action defined yet else the returned * no @a Action defined yet else the returned
* @a Action will be used to implement the execution. * @a Action will be used to implement the execution.
*/ */
KSharedPtr<Action> action() const; TDESharedPtr<Action> action() const;
/** /**
* Set the @a Action @param action this @a MacroItem points to. * Set the @a Action @param action this @a MacroItem points to.
*/ */
void setAction(KSharedPtr<Action> action); void setAction(TDESharedPtr<Action> action);
/** /**
* @return @a Variant from the @a Variable identified with * @return @a Variant from the @a Variable identified with
@ -110,12 +110,12 @@ namespace KoMacro {
* such a @param name in the case this @a MacroItem * such a @param name in the case this @a MacroItem
* doesn't have such a name. * doesn't have such a name.
*/ */
KSharedPtr<Variable> variable(const TQString& name, bool checkaction = false) const; TDESharedPtr<Variable> variable(const TQString& name, bool checkaction = false) const;
/** /**
* @return a map of @a Variable instances. * @return a map of @a Variable instances.
*/ */
TQMap<TQString, KSharedPtr<Variable> > variables() const; TQMap<TQString, TDESharedPtr<Variable> > variables() const;
/** /**
* Set the @a TQVariant @param variant as variable with the variablename * Set the @a TQVariant @param variant as variable with the variablename
@ -128,7 +128,7 @@ namespace KoMacro {
* Add a new variable with the vaiablename @param name and the given * Add a new variable with the vaiablename @param name and the given
* @a TQVariant @param variant to our @a MacroItem instance. * @a TQVariant @param variant to our @a MacroItem instance.
*/ */
KSharedPtr<Variable> addVariable(const TQString& name, const TQVariant& variant); TDESharedPtr<Variable> addVariable(const TQString& name, const TQVariant& variant);
private: private:
/// @internal d-pointer class. /// @internal d-pointer class.

16
kexi/plugins/macros/lib/manager.cpp
Unescape View File

@ -41,10 +41,10 @@ namespace KoMacro {
{ {
public: public:
KXMLGUIClient* const xmlguiclient; KXMLGUIClient* const xmlguiclient;
TQMap<TQString, KSharedPtr<Macro > > macros; TQMap<TQString, TDESharedPtr<Macro > > macros;
TQStringList actionnames; TQStringList actionnames;
TQMap<TQString, KSharedPtr<Action> > actions; TQMap<TQString, TDESharedPtr<Action> > actions;
TQMap<TQString, TQGuardedPtr<TQObject> > objects; TQMap<TQString, TQGuardedPtr<TQObject> > objects;
@ -108,12 +108,12 @@ bool Manager::hasMacro(const TQString& macroname)
return d->macros.contains(macroname); return d->macros.contains(macroname);
} }
KSharedPtr<Macro> Manager::getMacro(const TQString& macroname) TDESharedPtr<Macro> Manager::getMacro(const TQString& macroname)
{ {
return d->macros[macroname]; return d->macros[macroname];
} }
void Manager::addMacro(const TQString& macroname, KSharedPtr<Macro> macro) void Manager::addMacro(const TQString& macroname, TDESharedPtr<Macro> macro)
{ {
d->macros.replace(macroname, macro); d->macros.replace(macroname, macro);
} }
@ -123,13 +123,13 @@ void Manager::removeMacro(const TQString& macroname)
d->macros.remove(macroname); d->macros.remove(macroname);
} }
KSharedPtr<Macro> Manager::createMacro(const TQString& macroname) TDESharedPtr<Macro> Manager::createMacro(const TQString& macroname)
{ {
KSharedPtr<Macro> macro = KSharedPtr<Macro>( new Macro(macroname) ); TDESharedPtr<Macro> macro = TDESharedPtr<Macro>( new Macro(macroname) );
return macro; return macro;
} }
KSharedPtr<Action> Manager::action(const TQString& name) const TDESharedPtr<Action> Manager::action(const TQString& name) const
{ {
return d->actions[name]; return d->actions[name];
} }
@ -144,7 +144,7 @@ TQStringList Manager::actionNames() const
return d->actionnames; return d->actionnames;
} }
void Manager::publishAction(KSharedPtr<Action> action) void Manager::publishAction(TDESharedPtr<Action> action)
{ {
const TQString name = action->name(); const TQString name = action->name();
if(! d->actions.contains(name)) { if(! d->actions.contains(name)) {

16
kexi/plugins/macros/lib/manager.h
Unescape View File

@ -122,7 +122,7 @@ namespace KoMacro {
* \return the \a Macro defined with \p macroname * \return the \a Macro defined with \p macroname
* or NULL if we don't have such a \a Macro. * or NULL if we don't have such a \a Macro.
*/ */
KSharedPtr<Macro> getMacro(const TQString& macroname); TDESharedPtr<Macro> getMacro(const TQString& macroname);
/** /**
* Add a new \a Macro to the list of known macros. If * Add a new \a Macro to the list of known macros. If
@ -134,7 +134,7 @@ namespace KoMacro {
* accessible as. * accessible as.
* \param macro The \a Macro instance. * \param macro The \a Macro instance.
*/ */
void addMacro(const TQString& macroname, KSharedPtr<Macro> macro); void addMacro(const TQString& macroname, TDESharedPtr<Macro> macro);
/** /**
* Remove the \a Macro defined with \p macroname . If * Remove the \a Macro defined with \p macroname . If
@ -150,7 +150,7 @@ namespace KoMacro {
* like to attach the returned new \a Macro to this * like to attach the returned new \a Macro to this
* \a Manager instance. * \a Manager instance.
*/ */
KSharedPtr<Macro> createMacro(const TQString& macroname); TDESharedPtr<Macro> createMacro(const TQString& macroname);
#if 0 #if 0
/** /**
@ -164,20 +164,20 @@ namespace KoMacro {
* *
* @deprecated Moved to common XMLReader/XMLWriter classes. Use Macro::xmlHandler() ! * @deprecated Moved to common XMLReader/XMLWriter classes. Use Macro::xmlHandler() !
*/ */
KSharedPtr<Action> createAction(const TQDomElement& element); TDESharedPtr<Action> createAction(const TQDomElement& element);
#endif #endif
/** /**
* @return the @a Action which was published under the * @return the @a Action which was published under the
* name @p name or returns an empty @a KSharedPtr<Action> object * name @p name or returns an empty @a TDESharedPtr<Action> object
* if there was no such @a Action published. * if there was no such @a Action published.
*/ */
KSharedPtr<Action> action(const TQString& name) const; TDESharedPtr<Action> action(const TQString& name) const;
/** /**
* @return a map of all published actions. * @return a map of all published actions.
*/ */
TQMap<TQString, KSharedPtr<Action> > actions() const; TQMap<TQString, TDESharedPtr<Action> > actions() const;
/** /**
* @return a list of all published actions. * @return a list of all published actions.
@ -188,7 +188,7 @@ namespace KoMacro {
* Publish the @a Action @p action . The published @a Action * Publish the @a Action @p action . The published @a Action
* will be accessible via it's unique name. * will be accessible via it's unique name.
*/ */
void publishAction(KSharedPtr<Action> action); void publishAction(TDESharedPtr<Action> action);
/** /**
* Publish the passed TQObject @p object. Those object will * Publish the passed TQObject @p object. Those object will

20
kexi/plugins/macros/lib/metamethod.cpp
Unescape View File

@ -70,7 +70,7 @@ namespace KoMacro {
* if this @a MetaMethod doesn't belong to any @a MetaObject * if this @a MetaMethod doesn't belong to any @a MetaObject
* yet. * yet.
*/ */
KSharedPtr<MetaObject> object; TDESharedPtr<MetaObject> object;
/** /**
* The @a MetaMethod::Type this method provides access * The @a MetaMethod::Type this method provides access
@ -81,8 +81,8 @@ namespace KoMacro {
} }
MetaMethod::MetaMethod(const TQString& signature, Type type, KSharedPtr<MetaObject> object) MetaMethod::MetaMethod(const TQString& signature, Type type, TDESharedPtr<MetaObject> object)
: KShared() : TDEShared()
, d( new Private() ) // create the private d-pointer instance. , d( new Private() ) // create the private d-pointer instance.
{ {
d->signature = signature; d->signature = signature;
@ -135,7 +135,7 @@ MetaMethod::~MetaMethod()
delete d; delete d;
} }
KSharedPtr<MetaObject> const MetaMethod::object() const TDESharedPtr<MetaObject> const MetaMethod::object() const
{ {
return d->object; return d->object;
} }
@ -180,8 +180,8 @@ TQUObject* MetaMethod::toTQUObject(Variable::List arguments)
uo[0] = TQUObject(); // empty placeholder for the returnvalue. uo[0] = TQUObject(); // empty placeholder for the returnvalue.
for(uint i = 0; i < argsize; i++) { for(uint i = 0; i < argsize; i++) {
KSharedPtr<MetaParameter> metaargument = d->arguments[i]; TDESharedPtr<MetaParameter> metaargument = d->arguments[i];
KSharedPtr<Variable> variable = arguments[i + 1]; TDESharedPtr<Variable> variable = arguments[i + 1];
if ( !variable ) { if ( !variable ) {
throw Exception(TQString("Variable is undefined !")); throw Exception(TQString("Variable is undefined !"));
@ -254,7 +254,7 @@ TQUObject* MetaMethod::toTQUObject(Variable::List arguments)
return uo; return uo;
} }
KSharedPtr<Variable> MetaMethod::toVariable(TQUObject* uo) TDESharedPtr<Variable> MetaMethod::toVariable(TQUObject* uo)
{ {
const TQString desc( uo->type->desc() ); const TQString desc( uo->type->desc() );
@ -303,16 +303,16 @@ Variable::List MetaMethod::toVariableList(TQUObject* uo)
return list; return list;
} }
KSharedPtr<Variable> MetaMethod::invoke(Variable::List arguments) TDESharedPtr<Variable> MetaMethod::invoke(Variable::List arguments)
{ {
kdDebug() << "KSharedPtr<Variable> MetaMethod::invoke(Variable::List arguments)" << endl; kdDebug() << "TDESharedPtr<Variable> MetaMethod::invoke(Variable::List arguments)" << endl;
if(! d->object) { if(! d->object) {
throw Exception("MetaObject is undefined."); throw Exception("MetaObject is undefined.");
} }
TQObject* obj = d->object->object(); TQObject* obj = d->object->object();
KSharedPtr<Variable> returnvalue; TDESharedPtr<Variable> returnvalue;
TQUObject* qu = 0; TQUObject* qu = 0;
try { try {

16
kexi/plugins/macros/lib/metamethod.h
Unescape View File

@ -43,7 +43,7 @@ namespace KoMacro {
* The design tried to limit future porting to TQt4 by providing a * The design tried to limit future porting to TQt4 by providing a
* somewhat similar API to the TQt4 TQMeta* stuff. * somewhat similar API to the TQt4 TQMeta* stuff.
*/ */
class KOMACRO_EXPORT MetaMethod : public KShared class KOMACRO_EXPORT MetaMethod : public TDEShared
{ {
public: public:
@ -69,7 +69,7 @@ namespace KoMacro {
* belongs to. Each @a MethodMethod is associated with * belongs to. Each @a MethodMethod is associated with
* exactly one @a MetaObject . * exactly one @a MetaObject .
*/ */
explicit MetaMethod(const TQString& signature, Type type = Unknown, KSharedPtr<MetaObject> object = 0); explicit MetaMethod(const TQString& signature, Type type = Unknown, TDESharedPtr<MetaObject> object = 0);
/** /**
* Destructor. * Destructor.
@ -80,7 +80,7 @@ namespace KoMacro {
* @return the @a MetaObject instance this @a MethodMethod * @return the @a MetaObject instance this @a MethodMethod
* belongs to. * belongs to.
*/ */
KSharedPtr<MetaObject> const object() const; TDESharedPtr<MetaObject> const object() const;
/** /**
* @return the signature this @a MetaMethod has. It could * @return the signature this @a MetaMethod has. It could
@ -112,31 +112,31 @@ namespace KoMacro {
* @return the signature arguments as parsed list of * @return the signature arguments as parsed list of
* @a MetaParameter instances. * @a MetaParameter instances.
*/ */
TQValueList< KSharedPtr<MetaParameter> > arguments() const; TQValueList< TDESharedPtr<MetaParameter> > arguments() const;
/** /**
* Translate the passed @p arguments list of @a Variable instances * Translate the passed @p arguments list of @a Variable instances
* into a TQt3 TQUObject* array. * into a TQt3 TQUObject* array.
*/ */
TQUObject* toTQUObject(TQValueList< KSharedPtr<Variable> > arguments); TQUObject* toTQUObject(TQValueList< TDESharedPtr<Variable> > arguments);
/** /**
* Translate the passed @p uo TQUObject reference into an internal used * Translate the passed @p uo TQUObject reference into an internal used
* @a Variable instances. * @a Variable instances.
*/ */
KSharedPtr<Variable> toVariable(TQUObject* uo); TDESharedPtr<Variable> toVariable(TQUObject* uo);
/** /**
* Translate the passed @p uo TQUObject array into an internal used * Translate the passed @p uo TQUObject array into an internal used
* list of @a Variable instances. * list of @a Variable instances.
*/ */
TQValueList< KSharedPtr<Variable> > toVariableList(TQUObject* uo); TQValueList< TDESharedPtr<Variable> > toVariableList(TQUObject* uo);
/** /**
* Invoke the @a MetaMethod with the optional arguments * Invoke the @a MetaMethod with the optional arguments
* @p arguments and return a variable. * @p arguments and return a variable.
*/ */
KSharedPtr<Variable> invoke(TQValueList< KSharedPtr<Variable> > arguments); TDESharedPtr<Variable> invoke(TQValueList< TDESharedPtr<Variable> > arguments);
private: private:
/// @internal d-pointer class. /// @internal d-pointer class.

12
kexi/plugins/macros/lib/metaobject.cpp
Unescape View File

@ -56,7 +56,7 @@ namespace KoMacro {
} }
MetaObject::MetaObject(TQObject* const object) MetaObject::MetaObject(TQObject* const object)
: KShared() : TDEShared()
, d( new Private(object) ) // create the private d-pointer instance. , d( new Private(object) ) // create the private d-pointer instance.
{ {
} }
@ -106,7 +106,7 @@ int MetaObject::indexOfSlot(const char* slot) const
return slotid; return slotid;
} }
KSharedPtr<MetaMethod> MetaObject::method(int index) TDESharedPtr<MetaMethod> MetaObject::method(int index)
{ {
TQObject* obj = object(); TQObject* obj = object();
MetaMethod::Type type = MetaMethod::Slot; MetaMethod::Type type = MetaMethod::Slot;
@ -131,20 +131,20 @@ KSharedPtr<MetaMethod> MetaObject::method(int index)
return new MetaMethod(metadata->name, type, this); return new MetaMethod(metadata->name, type, this);
} }
KSharedPtr<MetaMethod> MetaObject::signal(const char* signal) TDESharedPtr<MetaMethod> MetaObject::signal(const char* signal)
{ {
return method( indexOfSignal(signal) ); return method( indexOfSignal(signal) );
} }
KSharedPtr<MetaMethod> MetaObject::slot(const char* slot) TDESharedPtr<MetaMethod> MetaObject::slot(const char* slot)
{ {
return method( indexOfSlot(slot) ); return method( indexOfSlot(slot) );
} }
KSharedPtr<Variable> MetaObject::invokeMethod(int index, Variable::List arguments) TDESharedPtr<Variable> MetaObject::invokeMethod(int index, Variable::List arguments)
{ {
// kdDebug() << "MetaObject::invokeMethod(int index, Variable::List arguments)" << endl; // kdDebug() << "MetaObject::invokeMethod(int index, Variable::List arguments)" << endl;
KSharedPtr<MetaMethod> m = method(index); TDESharedPtr<MetaMethod> m = method(index);
// kdDebug() << "MetaObject::invokeMethod(int index, Variable::List arguments) return" << endl; // kdDebug() << "MetaObject::invokeMethod(int index, Variable::List arguments) return" << endl;
return m->invoke(arguments); return m->invoke(arguments);
} }

12
kexi/plugins/macros/lib/metaobject.h
Unescape View File

@ -38,7 +38,7 @@ namespace KoMacro {
* The design tried to limit future porting to TQt4 by providing a * The design tried to limit future porting to TQt4 by providing a
* somewhat similar API to the TQt4 TQMeta* stuff. * somewhat similar API to the TQt4 TQMeta* stuff.
*/ */
class KOMACRO_EXPORT MetaObject : public KShared class KOMACRO_EXPORT MetaObject : public TDEShared
{ {
public: public:
@ -78,19 +78,19 @@ namespace KoMacro {
* @return the @a MetaMethod that matches to the * @return the @a MetaMethod that matches to the
* index @p index . * index @p index .
*/ */
KSharedPtr<MetaMethod> method(int index); TDESharedPtr<MetaMethod> method(int index);
/** /**
* @return a @a MetaMethod for the signal @p signal . * @return a @a MetaMethod for the signal @p signal .
*/ */
KSharedPtr<MetaMethod> signal(const char* signal); TDESharedPtr<MetaMethod> signal(const char* signal);
/** /**
* @return a @a MetaMethod for the slot @p slot . * @return a @a MetaMethod for the slot @p slot .
*/ */
KSharedPtr<MetaMethod> slot(const char* slot); TDESharedPtr<MetaMethod> slot(const char* slot);
//KSharedPtr<MetaMethod> addSlot(const char* slot); //TDESharedPtr<MetaMethod> addSlot(const char* slot);
//void connectSignal(TQObject* obj, const char* signal); //void connectSignal(TQObject* obj, const char* signal);
/** /**
@ -104,7 +104,7 @@ namespace KoMacro {
* @return The returnvalue the method provides and that got * @return The returnvalue the method provides and that got
* returned if the execution is done. * returned if the execution is done.
*/ */
KSharedPtr<Variable> invokeMethod(int index, TQValueList< KSharedPtr<Variable> > arguments); TDESharedPtr<Variable> invokeMethod(int index, TQValueList< TDESharedPtr<Variable> > arguments);
private: private:
/// @internal d-pointer class. /// @internal d-pointer class.

4
kexi/plugins/macros/lib/metaparameter.cpp
Unescape View File

@ -58,7 +58,7 @@ namespace KoMacro {
} }
MetaParameter::MetaParameter(const TQString& signatureargument) MetaParameter::MetaParameter(const TQString& signatureargument)
: KShared() : TDEShared()
, d( new Private() ) // create the private d-pointer instance. , d( new Private() ) // create the private d-pointer instance.
{ {
d->type = TypeNone; d->type = TypeNone;
@ -137,7 +137,7 @@ void MetaParameter::setSignatureArgument(const TQString& signatureargument)
} }
} }
bool MetaParameter::validVariable(KSharedPtr<Variable> variable) const bool MetaParameter::validVariable(TDESharedPtr<Variable> variable) const
{ {
if( type() != variable->type() ) { if( type() != variable->type() ) {
return false; return false;

6
kexi/plugins/macros/lib/metaparameter.h
Unescape View File

@ -39,7 +39,7 @@ namespace KoMacro {
* The design tried to limit future porting to TQt4 by providing a * The design tried to limit future porting to TQt4 by providing a
* somewhat similar API to the TQt4 TQMeta* stuff. * somewhat similar API to the TQt4 TQMeta* stuff.
*/ */
class KOMACRO_EXPORT MetaParameter : public KShared class KOMACRO_EXPORT MetaParameter : public TDEShared
{ {
/** /**
@ -57,7 +57,7 @@ namespace KoMacro {
/** /**
* List of @a MetaParameter instances. * List of @a MetaParameter instances.
*/ */
typedef TQValueList<KSharedPtr <MetaParameter > > List; typedef TQValueList<TDESharedPtr <MetaParameter > > List;
/** /**
* Constructor. * Constructor.
@ -114,7 +114,7 @@ namespace KoMacro {
* valid for this @a MetaParameter . Valid means, that * valid for this @a MetaParameter . Valid means, that
* the variable has a castable type. * the variable has a castable type.
*/ */
bool validVariable(KSharedPtr<Variable> variable) const; bool validVariable(TDESharedPtr<Variable> variable) const;
protected: protected:

2
kexi/plugins/macros/lib/variable.cpp
Unescape View File

@ -218,7 +218,7 @@ Variable::List Variable::children() const
return d->children; return d->children;
} }
void Variable::appendChild(KSharedPtr<Variable> variable) void Variable::appendChild(TDESharedPtr<Variable> variable)
{ {
d->children.append(variable); d->children.append(variable);
} }

8
kexi/plugins/macros/lib/variable.h
Unescape View File

@ -32,7 +32,7 @@ namespace KoMacro {
/** /**
* A variable value used to provide abstract access to variables. The * A variable value used to provide abstract access to variables. The
* class handles TQVariant and TQObject and provides access to them. * class handles TQVariant and TQObject and provides access to them.
* Variable inherits KShared and implements reference couting. So, it's * Variable inherits TDEShared and implements reference couting. So, it's
* not needed to take care of memory-managment. * not needed to take care of memory-managment.
*/ */
class KOMACRO_EXPORT Variable : public MetaParameter class KOMACRO_EXPORT Variable : public MetaParameter
@ -58,12 +58,12 @@ namespace KoMacro {
/** /**
* A list of variables. * A list of variables.
*/ */
typedef TQValueList<KSharedPtr<Variable > > List; typedef TQValueList<TDESharedPtr<Variable > > List;
/** /**
* A map of variables. * A map of variables.
*/ */
typedef TQMap<TQString, KSharedPtr<Variable > > Map; typedef TQMap<TQString, TDESharedPtr<Variable > > Map;
/** /**
* Default constructor. * Default constructor.
@ -185,7 +185,7 @@ namespace KoMacro {
* Append a @a Variable to the list of children this * Append a @a Variable to the list of children this
* @a Variable has. * @a Variable has.
*/ */
void appendChild(KSharedPtr<Variable> variable); void appendChild(TDESharedPtr<Variable> variable);
/** /**
* Clear the list of children this @a Variable has. * Clear the list of children this @a Variable has.

18
kexi/plugins/macros/lib/xmlhandler.cpp
Unescape View File

@ -99,7 +99,7 @@ bool XMLHandler::parseXML(const TQDomElement& element)
const TQDomElement itemelem = itemnode.toElement(); const TQDomElement itemelem = itemnode.toElement();
// Create a new MacroItem // Create a new MacroItem
KSharedPtr<MacroItem> item = new MacroItem(); TDESharedPtr<MacroItem> item = new MacroItem();
// Add the new item to our Macro. // Add the new item to our Macro.
d->macro->addItem( item ); d->macro->addItem( item );
@ -107,7 +107,7 @@ bool XMLHandler::parseXML(const TQDomElement& element)
// Each MacroItem may point to an Action instance. We // Each MacroItem may point to an Action instance. We
// try to determinate this action now and if it's defined // try to determinate this action now and if it's defined
// and available, we set it. // and available, we set it.
KSharedPtr<Action> action = Manager::self()->action( itemelem.attribute("action") ); TDESharedPtr<Action> action = Manager::self()->action( itemelem.attribute("action") );
if(action.data()) { if(action.data()) {
item->setAction(action); item->setAction(action);
} }
@ -157,14 +157,14 @@ TQDomElement XMLHandler::toXML()
//macroelem.setAttribute("name",d->macro->name()); //macroelem.setAttribute("name",d->macro->name());
// The list of MacroItem-children a Macro provides. // The list of MacroItem-children a Macro provides.
TQValueList<KSharedPtr<MacroItem > > items = d->macro->items(); TQValueList<TDESharedPtr<MacroItem > > items = d->macro->items();
// Create an iterator... // Create an iterator...
TQValueList<KSharedPtr<MacroItem > >::ConstIterator it(items.constBegin()), end(items.constEnd()); TQValueList<TDESharedPtr<MacroItem > >::ConstIterator it(items.constBegin()), end(items.constEnd());
// ...and iterate over the list of children the Macro provides. // ...and iterate over the list of children the Macro provides.
for(;it != end; ++it) { for(;it != end; ++it) {
// We are iterating over MacroItem instances. // We are iterating over MacroItem instances.
KSharedPtr<MacroItem> item = *it; TDESharedPtr<MacroItem> item = *it;
// Flag to determinate if we really need to remember this item what // Flag to determinate if we really need to remember this item what
// is only the case if comment or action is defined. // is only the case if comment or action is defined.
@ -174,7 +174,7 @@ TQDomElement XMLHandler::toXML()
TQDomElement itemelem = document.createElement("item"); TQDomElement itemelem = document.createElement("item");
// Each MacroItem could point to an Action provided by the Manager. // Each MacroItem could point to an Action provided by the Manager.
const KSharedPtr<Action> action = item->action(); const TDESharedPtr<Action> action = item->action();
if( action ) { if( action ) {
append = true; append = true;
@ -184,10 +184,10 @@ TQDomElement XMLHandler::toXML()
// Each MacroItem could have a list of variables. We // Each MacroItem could have a list of variables. We
// iterate through that list and build a element // iterate through that list and build a element
// for each single variable. // for each single variable.
TQMap<TQString, KSharedPtr<Variable > > varmap = item->variables(); TQMap<TQString, TDESharedPtr<Variable > > varmap = item->variables();
for(TQMap<TQString, KSharedPtr<Variable > >::ConstIterator vit = varmap.constBegin(); vit != varmap.constEnd(); ++vit) { for(TQMap<TQString, TDESharedPtr<Variable > >::ConstIterator vit = varmap.constBegin(); vit != varmap.constEnd(); ++vit) {
const KSharedPtr<Variable> v = vit.data(); const TDESharedPtr<Variable> v = vit.data();
if(! v.data()) { if(! v.data()) {
// skip if the variable is NULL. // skip if the variable is NULL.
continue; continue;

18
kexi/plugins/macros/tests/actiontests.cpp
Unescape View File

@ -73,11 +73,11 @@ namespace KoMacroTest {
TQDomDocument* doomdocument; TQDomDocument* doomdocument;
KSharedPtr<KoMacro::Macro> macro; TDESharedPtr<KoMacro::Macro> macro;
TQValueList< KSharedPtr<KoMacro::MacroItem> > items; TQValueList< TDESharedPtr<KoMacro::MacroItem> > items;
KSharedPtr<KoMacro::Action> actionptr; TDESharedPtr<KoMacro::Action> actionptr;
Private() Private()
: xmlguiclient(0) : xmlguiclient(0)
@ -90,7 +90,7 @@ namespace KoMacroTest {
}; };
} }
typedef TQValueList< KSharedPtr<KoMacro::MacroItem> >::size_type sizetype; typedef TQValueList< TDESharedPtr<KoMacro::MacroItem> >::size_type sizetype;
ActionTests::ActionTests() ActionTests::ActionTests()
@ -147,7 +147,7 @@ void ActionTests::testMacro()
kdDebug()<<"===================== testMacro() ======================" << endl; kdDebug()<<"===================== testMacro() ======================" << endl;
//fetch Items and .. //fetch Items and ..
//TQValueList< KSharedPtr<KoMacro::MacroItem> >& items = d->macro->items(); //TQValueList< TDESharedPtr<KoMacro::MacroItem> >& items = d->macro->items();
//... check that there is one //... check that there is one
KOMACROTEST_XASSERT( d->items.count(), sizetype(0) ); KOMACROTEST_XASSERT( d->items.count(), sizetype(0) );
@ -158,7 +158,7 @@ void ActionTests::testAction()
kdDebug()<<"===================== testAction() ======================" << endl; kdDebug()<<"===================== testAction() ======================" << endl;
//get it //get it
//KSharedPtr<KoMacro::Action> actionptr = d->items[0]->action(); //TDESharedPtr<KoMacro::Action> actionptr = d->items[0]->action();
//-> check that it is not null //-> check that it is not null
KOMACROTEST_XASSERT(sizetype(d->actionptr.data()), sizetype(0)); KOMACROTEST_XASSERT(sizetype(d->actionptr.data()), sizetype(0));
} }
@ -167,7 +167,7 @@ void ActionTests::testText()
{ {
kdDebug()<<"===================== testText() ======================" << endl; kdDebug()<<"===================== testText() ======================" << endl;
//KSharedPtr<KoMacro::Action> actionptr = items[0]->action(); //TDESharedPtr<KoMacro::Action> actionptr = items[0]->action();
const TQString leetSpeech = "']['3 $']['"; const TQString leetSpeech = "']['3 $']['";
@ -184,7 +184,7 @@ void ActionTests::testName()
{ {
kdDebug()<<"===================== testName() ======================" << endl; kdDebug()<<"===================== testName() ======================" << endl;
//KSharedPtr<KoMacro::Action> actionptr = items[0]->action(); //TDESharedPtr<KoMacro::Action> actionptr = items[0]->action();
//check name //check name
KOMACROTEST_ASSERT(d->actionptr->name(),TQString("testaction")); KOMACROTEST_ASSERT(d->actionptr->name(),TQString("testaction"));
@ -198,7 +198,7 @@ void ActionTests::testComment()
{ {
kdDebug()<<"===================== testComment() ======================" << endl; kdDebug()<<"===================== testComment() ======================" << endl;
//KSharedPtr<KoMacro::Action> actionptr = items[0]->action(); //TDESharedPtr<KoMacro::Action> actionptr = items[0]->action();
//check comment //check comment
KOMACROTEST_XASSERT(d->actionptr->comment(),TQString("No Comment!")); KOMACROTEST_XASSERT(d->actionptr->comment(),TQString("No Comment!"));

80
kexi/plugins/macros/tests/commontests.cpp
Unescape View File

@ -94,7 +94,7 @@ namespace KoMacroTest {
} }
typedef TQValueList< KSharedPtr<KoMacro::MacroItem> >::size_type sizetype; typedef TQValueList< TDESharedPtr<KoMacro::MacroItem> >::size_type sizetype;
CommonTests::CommonTests() CommonTests::CommonTests()
: KUnitTest::SlotTester() : KUnitTest::SlotTester()
@ -164,7 +164,7 @@ void CommonTests::testAction()
TQDomElement const domelement = d->doomdocument->documentElement(); TQDomElement const domelement = d->doomdocument->documentElement();
KSharedPtr<KoMacro::Macro> macro = KoMacro::Manager::self()->createMacro("testMacro"); TDESharedPtr<KoMacro::Macro> macro = KoMacro::Manager::self()->createMacro("testMacro");
//Is our XML parseable ? //Is our XML parseable ?
KOMACROTEST_ASSERT(macro->parseXML(domelement),true); KOMACROTEST_ASSERT(macro->parseXML(domelement),true);
@ -172,19 +172,19 @@ void CommonTests::testAction()
//?? //??
macro->execute(this); macro->execute(this);
//create list of KSharedPtr from the childs of the macro //create list of TDESharedPtr from the childs of the macro
TQValueList< KSharedPtr<KoMacro::MacroItem> >& items = macro->items(); TQValueList< TDESharedPtr<KoMacro::MacroItem> >& items = macro->items();
//check that there is one //check that there is one
KOMACROTEST_ASSERT( items.count(), sizetype(1) ); KOMACROTEST_ASSERT( items.count(), sizetype(1) );
//fetch the first one //fetch the first one
KSharedPtr<KoMacro::Action> actionptr = items[0]->action(); TDESharedPtr<KoMacro::Action> actionptr = items[0]->action();
//How do we know that an action exist ? //How do we know that an action exist ?
//-> check that it is not null //-> check that it is not null
KOMACROTEST_XASSERT(sizetype(actionptr.data()), sizetype(0)); KOMACROTEST_XASSERT(sizetype(actionptr.data()), sizetype(0));
//fetch the "teststring"-variable //fetch the "teststring"-variable
KSharedPtr<KoMacro::Variable> variableptr = actionptr->variable("teststring"); TDESharedPtr<KoMacro::Variable> variableptr = actionptr->variable("teststring");
//check that it is not null //check that it is not null
KOMACROTEST_XASSERT(sizetype(variableptr.data()), sizetype(0)); KOMACROTEST_XASSERT(sizetype(variableptr.data()), sizetype(0));
//check that it is " " //check that it is " "
@ -249,7 +249,7 @@ void CommonTests::testAction()
//commontests.cpp: In member function 'void KoMacroTest::CommonTests::testAction()': //commontests.cpp: In member function 'void KoMacroTest::CommonTests::testAction()':
//commontests.cpp:249: error: call of overloaded 'setVariable(const char [8], int)' is ambiguous //commontests.cpp:249: error: call of overloaded 'setVariable(const char [8], int)' is ambiguous
//../lib/macroitem.h:131: note: candidates are: TQStringList KoMacro::MacroItem::setVariable(const TQString&, KSharedPtr<KoMacro::Variable>) //../lib/macroitem.h:131: note: candidates are: TQStringList KoMacro::MacroItem::setVariable(const TQString&, TDESharedPtr<KoMacro::Variable>)
//../lib/macroitem.h:137: note: TQStringList KoMacro::MacroItem::setVariable(const TQString&, const TQVariant&) //../lib/macroitem.h:137: note: TQStringList KoMacro::MacroItem::setVariable(const TQString&, const TQVariant&)
macroitem->setVariable("testint",(int) 0); macroitem->setVariable("testint",(int) 0);
@ -285,7 +285,7 @@ void CommonTests::testXmlhandler()
kdDebug()<<"===================== testXmlhandler() ======================" << endl; kdDebug()<<"===================== testXmlhandler() ======================" << endl;
// Local Init // Local Init
KSharedPtr<KoMacro::Macro> macro = KoMacro::Manager::self()->createMacro("testMacro"); TDESharedPtr<KoMacro::Macro> macro = KoMacro::Manager::self()->createMacro("testMacro");
TQDomElement domelement; TQDomElement domelement;
// Save old doomdocument // Save old doomdocument
@ -428,9 +428,9 @@ void CommonTests::testFunction()
"</function>" "</function>"
)); ));
//create an KomacroFunction with our data, and put it into a KSharedPtr //create an KomacroFunction with our data, and put it into a TDESharedPtr
KSharedPtr<KoMacro::Action> functionptr = ::KoMacro::Manager::self()->createAction( domdocument.documentElement() ); TDESharedPtr<KoMacro::Action> functionptr = ::KoMacro::Manager::self()->createAction( domdocument.documentElement() );
//cast KSharedPtr to KoMacro-"Function" //cast TDESharedPtr to KoMacro-"Function"
KoMacro::Function* func = dynamic_cast<KoMacro::Function*>( functionptr.data() ); KoMacro::Function* func = dynamic_cast<KoMacro::Function*>( functionptr.data() );
//check that function is not null //check that function is not null
KOMACROTEST_XASSERT((int) func, 0); KOMACROTEST_XASSERT((int) func, 0);
@ -449,12 +449,12 @@ void CommonTests::testFunction()
KOMACROTEST_ASSERT( TQString(func->slot()), TQString("myslot(const TQString&,int)") ); KOMACROTEST_ASSERT( TQString(func->slot()), TQString("myslot(const TQString&,int)") );
//create KoMacro-MetaObject from receiverObject //create KoMacro-MetaObject from receiverObject
KSharedPtr<KoMacro::MetaObject> receivermetaobject = func->receiverObject(); TDESharedPtr<KoMacro::MetaObject> receivermetaobject = func->receiverObject();
//check that receivermetaobject.data is not null //check that receivermetaobject.data is not null
KOMACROTEST_XASSERT((int) receivermetaobject.data(), 0); KOMACROTEST_XASSERT((int) receivermetaobject.data(), 0);
//create KoMacro-MetaMethod from receiverObject //create KoMacro-MetaMethod from receiverObject
KSharedPtr<KoMacro::MetaMethod> receivermetamethod = receivermetaobject->slot( func->slot().latin1() ); TDESharedPtr<KoMacro::MetaMethod> receivermetamethod = receivermetaobject->slot( func->slot().latin1() );
//check that receivermetamethod.data is not null //check that receivermetamethod.data is not null
KOMACROTEST_XASSERT((int) receivermetamethod.data(), 0); KOMACROTEST_XASSERT((int) receivermetamethod.data(), 0);
@ -469,7 +469,7 @@ void CommonTests::testFunction()
// firstrun we have a TQString, secondrun we have an int // firstrun we have a TQString, secondrun we have an int
switch(i) { switch(i) {
case 0: { // returnvalue case 0: { // returnvalue
KOMACROTEST_ASSERT(*it, KSharedPtr<KoMacro::Variable>(NULL)); KOMACROTEST_ASSERT(*it, TDESharedPtr<KoMacro::Variable>(NULL));
} break; } break;
case 1: { // first parameter case 1: { // first parameter
//check first variable of func is the same as argument1 //check first variable of func is the same as argument1
@ -491,10 +491,10 @@ void CommonTests::testFunction()
KOMACROTEST_ASSERT( funcvariables.count(), uint(3) ); KOMACROTEST_ASSERT( funcvariables.count(), uint(3) );
// check that the first argument (the returnvalue) is empty // check that the first argument (the returnvalue) is empty
KOMACROTEST_ASSERT( funcvariables[0], KSharedPtr<KoMacro::Variable>(NULL) ); KOMACROTEST_ASSERT( funcvariables[0], TDESharedPtr<KoMacro::Variable>(NULL) );
//create a KoMacro-Variable-Ptr from first func argument //create a KoMacro-Variable-Ptr from first func argument
KSharedPtr<KoMacro::Variable> stringvar = funcvariables[1]; TDESharedPtr<KoMacro::Variable> stringvar = funcvariables[1];
//check that it is not null //check that it is not null
KOMACROTEST_XASSERT((int) stringvar.data(),0); KOMACROTEST_XASSERT((int) stringvar.data(),0);
//check via TQVariant type that stringvar is from Type Variant //check via TQVariant type that stringvar is from Type Variant
@ -505,7 +505,7 @@ void CommonTests::testFunction()
KOMACROTEST_ASSERT( stringvar->toString(), argument1 ); KOMACROTEST_ASSERT( stringvar->toString(), argument1 );
//create a KoMacro-Variable-Ptr from second func argument //create a KoMacro-Variable-Ptr from second func argument
KSharedPtr<KoMacro::Variable> intvar = funcvariables[2]; TDESharedPtr<KoMacro::Variable> intvar = funcvariables[2];
//check that it is not null //check that it is not null
KOMACROTEST_XASSERT((int) intvar.data(), 0); KOMACROTEST_XASSERT((int) intvar.data(), 0);
//check via TQVariant type that stringvar is from Type Variant //check via TQVariant type that stringvar is from Type Variant
@ -516,7 +516,7 @@ void CommonTests::testFunction()
KOMACROTEST_ASSERT( intvar->toInt(), argument2 ); KOMACROTEST_ASSERT( intvar->toInt(), argument2 );
//returnvalue see testobject .... //returnvalue see testobject ....
KSharedPtr<KoMacro::Variable> funcreturnvalue = receivermetamethod->invoke( funcvariables ); TDESharedPtr<KoMacro::Variable> funcreturnvalue = receivermetamethod->invoke( funcvariables );
kdDebug() << "CommonTests::testFunction() RETURNVALUE =====> " << funcreturnvalue->toString() << endl; kdDebug() << "CommonTests::testFunction() RETURNVALUE =====> " << funcreturnvalue->toString() << endl;
KOMACROTEST_ASSERT( funcreturnvalue->toInt(), argument2 ); KOMACROTEST_ASSERT( funcreturnvalue->toInt(), argument2 );
@ -543,8 +543,8 @@ void CommonTests::testIntFunction()
"</function>" "</function>"
)); ));
//create an KomacroFunction with our data, and put it into a KSharedPtr //create an KomacroFunction with our data, and put it into a TDESharedPtr
KSharedPtr<KoMacro::Action> functionptr = ::KoMacro::Manager::self()->createAction( domdocument.documentElement() ); TDESharedPtr<KoMacro::Action> functionptr = ::KoMacro::Manager::self()->createAction( domdocument.documentElement() );
//Cast data to function //Cast data to function
KoMacro::Function* func = dynamic_cast<KoMacro::Function*>( functionptr.data() ); KoMacro::Function* func = dynamic_cast<KoMacro::Function*>( functionptr.data() );
//check that it is not null //check that it is not null
@ -573,8 +573,8 @@ void CommonTests::testDoubleFunction()
"</function>" "</function>"
)); ));
//create an KomacroFunction with our data, and put it into a KSharedPtr //create an KomacroFunction with our data, and put it into a TDESharedPtr
KSharedPtr<KoMacro::Action> functionptr = ::KoMacro::Manager::self()->createAction( domdocument.documentElement() ); TDESharedPtr<KoMacro::Action> functionptr = ::KoMacro::Manager::self()->createAction( domdocument.documentElement() );
//Cast data to function //Cast data to function
KoMacro::Function* func = dynamic_cast<KoMacro::Function*>( functionptr.data() ); KoMacro::Function* func = dynamic_cast<KoMacro::Function*>( functionptr.data() );
//check that it is not null //check that it is not null
@ -602,8 +602,8 @@ void CommonTests::testTQStringFunction()
"</function>" "</function>"
)); ));
//create an KomacroFunction with our data, and put it into a KSharedPtr //create an KomacroFunction with our data, and put it into a TDESharedPtr
KSharedPtr<KoMacro::Action> functionptr = ::KoMacro::Manager::self()->createAction( domdocument.documentElement() ); TDESharedPtr<KoMacro::Action> functionptr = ::KoMacro::Manager::self()->createAction( domdocument.documentElement() );
//Cast data to function //Cast data to function
KoMacro::Function* func = dynamic_cast<KoMacro::Function*>( functionptr.data() ); KoMacro::Function* func = dynamic_cast<KoMacro::Function*>( functionptr.data() );
//check that it is not null //check that it is not null
@ -621,7 +621,7 @@ void CommonTests::testMacro()
TQDomElement const domelement = d->doomdocument->documentElement(); TQDomElement const domelement = d->doomdocument->documentElement();
KSharedPtr<KoMacro::Macro> macro = KoMacro::Manager::self()->createMacro("testMacro"); TDESharedPtr<KoMacro::Macro> macro = KoMacro::Manager::self()->createMacro("testMacro");
//Is our XML parseable ? //Is our XML parseable ?
KOMACROTEST_ASSERT(macro->parseXML(domelement),true); KOMACROTEST_ASSERT(macro->parseXML(domelement),true);
@ -639,7 +639,7 @@ void CommonTests::testMacro()
// )); // ));
// //
// //create Macro // //create Macro
// // KSharedPtr<KoMacro::Action> macroptr = ::KoMacro::Manager::self()->createAction( domdocument.documentElement() ); // // TDESharedPtr<KoMacro::Action> macroptr = ::KoMacro::Manager::self()->createAction( domdocument.documentElement() );
// //cast data to Macro // //cast data to Macro
// KoMacro::Macro* macro = dynamic_cast<KoMacro::Macro*>( macroptr.data() ); // KoMacro::Macro* macro = dynamic_cast<KoMacro::Macro*>( macroptr.data() );
//check that it is not null //check that it is not null
@ -661,11 +661,11 @@ void CommonTests::testMacro()
*/ */
//create list of KsharedPtr from the childs of the macro //create list of KsharedPtr from the childs of the macro
TQValueList< KSharedPtr<KoMacro::MacroItem> >& items = macro->items(); TQValueList< TDESharedPtr<KoMacro::MacroItem> >& items = macro->items();
//check that there is one //check that there is one
KOMACROTEST_ASSERT( items.count(), sizetype(1) ); KOMACROTEST_ASSERT( items.count(), sizetype(1) );
//fetch the first one //fetch the first one
KSharedPtr<KoMacro::Action> actionptr = items[0]->action(); TDESharedPtr<KoMacro::Action> actionptr = items[0]->action();
//How do we know that an action exist ? //How do we know that an action exist ?
//-> check that it is not null //-> check that it is not null
KOMACROTEST_XASSERT(sizetype(actionptr.data()), sizetype(0)); KOMACROTEST_XASSERT(sizetype(actionptr.data()), sizetype(0));
@ -677,7 +677,7 @@ void CommonTests::testMacro()
// KOMACROTEST_ASSERT( actionptr->comment(), TQString("") ); // KOMACROTEST_ASSERT( actionptr->comment(), TQString("") );
/* /*
//fetch the second one //fetch the second one
KSharedPtr<KoMacro::Action> myfuncptr = children[1]; TDESharedPtr<KoMacro::Action> myfuncptr = children[1];
//cast it to function //cast it to function
KoMacro::Function* myfunc = dynamic_cast<KoMacro::Function*>( myfuncptr.data() ); KoMacro::Function* myfunc = dynamic_cast<KoMacro::Function*>( myfuncptr.data() );
@ -700,12 +700,12 @@ void CommonTests::testMacro()
myfunc->activate(); myfunc->activate();
*/ */
//create another macro //create another macro
KSharedPtr<KoMacro::Macro> yanMacro = KoMacro::Manager::self()->createMacro("testMacro2"); TDESharedPtr<KoMacro::Macro> yanMacro = KoMacro::Manager::self()->createMacro("testMacro2");
KOMACROTEST_ASSERT(yanMacro->parseXML(domelement),true); KOMACROTEST_ASSERT(yanMacro->parseXML(domelement),true);
//create two more macros //create two more macros
//KSharedPtr<KoMacro::Action> yanActionptr2 = ::KoMacro::Manager::self()->createAction( domdocument.documentElement() ); //TDESharedPtr<KoMacro::Action> yanActionptr2 = ::KoMacro::Manager::self()->createAction( domdocument.documentElement() );
//KSharedPtr<KoMacro::Action> yanActionptr3 = ::KoMacro::Manager::self()->createAction( domdocument.documentElement() ); //TDESharedPtr<KoMacro::Action> yanActionptr3 = ::KoMacro::Manager::self()->createAction( domdocument.documentElement() );
//check that they aren?t null //check that they aren?t null
KOMACROTEST_XASSERT(sizetype(yanMacro.data()), sizetype(0)); KOMACROTEST_XASSERT(sizetype(yanMacro.data()), sizetype(0));
@ -713,7 +713,7 @@ void CommonTests::testMacro()
//KOMACROTEST_XASSERT((int) yanActionptr3.data(), 0); //KOMACROTEST_XASSERT((int) yanActionptr3.data(), 0);
//create a list of the children from yanMacro //create a list of the children from yanMacro
//TQValueList< KSharedPtr<KoMacro::Action> > yanChildren = yanMacro->children(); //TQValueList< TDESharedPtr<KoMacro::Action> > yanChildren = yanMacro->children();
//check that there are two //check that there are two
//KOMACROTEST_ASSERT(yanChildren.count(), uint(2)); //KOMACROTEST_ASSERT(yanChildren.count(), uint(2));
/* /*
@ -769,7 +769,7 @@ void CommonTests::testDom() {
"</function>" "</function>"
)); ));
//create functiom //create functiom
KSharedPtr<KoMacro::Action> macroptr = ::KoMacro::Manager::self()->createAction( domdocument.documentElement() ); TDESharedPtr<KoMacro::Action> macroptr = ::KoMacro::Manager::self()->createAction( domdocument.documentElement() );
//try to execute function and catch exception //try to execute function and catch exception
KOMACROTEST_ASSERTEXCEPTION(KoMacro::Exception&, macroptr->activate()); KOMACROTEST_ASSERTEXCEPTION(KoMacro::Exception&, macroptr->activate());
@ -853,21 +853,21 @@ void CommonTests::testVariables()
)); ));
//create an macro //create an macro
KSharedPtr<KoMacro::Action> macroptr = ::KoMacro::Manager::self()->createAction( domdocument.documentElement() ); TDESharedPtr<KoMacro::Action> macroptr = ::KoMacro::Manager::self()->createAction( domdocument.documentElement() );
//cast data to macro //cast data to macro
KoMacro::Macro* macro = dynamic_cast<KoMacro::Macro*>( macroptr.data() ); KoMacro::Macro* macro = dynamic_cast<KoMacro::Macro*>( macroptr.data() );
//check that it is not null //check that it is not null
KOMACROTEST_XASSERT((int) macro, 0); KOMACROTEST_XASSERT((int) macro, 0);
//create a list of its children //create a list of its children
TQValueList< KSharedPtr<KoMacro::Action> > children = macro->children(); TQValueList< TDESharedPtr<KoMacro::Action> > children = macro->children();
//Check that there are two children. The first child is always the returnvalue. //Check that there are two children. The first child is always the returnvalue.
KOMACROTEST_ASSERT( children.count(), uint(2) ); KOMACROTEST_ASSERT( children.count(), uint(2) );
//fetch the children //fetch the children
KSharedPtr<KoMacro::Action> func1ptr = children[1]; TDESharedPtr<KoMacro::Action> func1ptr = children[1];
//create new context //create new context
KSharedPtr<KoMacro::Context> context = new KoMacro::Context(macroptr); TDESharedPtr<KoMacro::Context> context = new KoMacro::Context(macroptr);
{ {
//try to execute function with non-functional variable //try to execute function with non-functional variable
@ -882,7 +882,7 @@ void CommonTests::testVariables()
//execute function //execute function
func1ptr->activate(context); func1ptr->activate(context);
//fetch return value //fetch return value
KSharedPtr<KoMacro::Variable> returnvariable = context->variable("$MyReturnVariable"); TDESharedPtr<KoMacro::Variable> returnvariable = context->variable("$MyReturnVariable");
//check that it is not null //check that it is not null
KOMACROTEST_XASSERT( (int) returnvariable.data(), 0); KOMACROTEST_XASSERT( (int) returnvariable.data(), 0);
//check that it is "Some String" //check that it is "Some String"
@ -895,7 +895,7 @@ void CommonTests::testVariables()
//execute function //execute function
func1ptr->activate(context); func1ptr->activate(context);
//fetch return value //fetch return value
KSharedPtr<KoMacro::Variable> returnvariable = context->variable("$MyReturnVariable"); TDESharedPtr<KoMacro::Variable> returnvariable = context->variable("$MyReturnVariable");
//check that it is not null //check that it is not null
KOMACROTEST_XASSERT( (int) returnvariable.data(), 0); KOMACROTEST_XASSERT( (int) returnvariable.data(), 0);
//check that it is 12345 //check that it is 12345

24
kexi/plugins/macros/tests/macroitemtests.cpp
Unescape View File

@ -71,7 +71,7 @@ namespace KoMacroTest {
TQDomDocument* doomdocument; TQDomDocument* doomdocument;
KSharedPtr<KoMacro::Macro> macro; TDESharedPtr<KoMacro::Macro> macro;
Private() Private()
: xmlguiclient(0) : xmlguiclient(0)
@ -83,7 +83,7 @@ namespace KoMacroTest {
}; };
} }
typedef TQValueList< KSharedPtr<KoMacro::MacroItem> >::size_type sizetype; typedef TQValueList< TDESharedPtr<KoMacro::MacroItem> >::size_type sizetype;
MacroitemTests::MacroitemTests() MacroitemTests::MacroitemTests()
: KUnitTest::SlotTester() : KUnitTest::SlotTester()
@ -136,7 +136,7 @@ void MacroitemTests::testMacro()
kdDebug()<<"===================== testMacro() ======================" << endl; kdDebug()<<"===================== testMacro() ======================" << endl;
//fetch Items and .. //fetch Items and ..
TQValueList< KSharedPtr<KoMacro::MacroItem> >& items = d->macro->items(); TQValueList< TDESharedPtr<KoMacro::MacroItem> >& items = d->macro->items();
//... check that there is one //... check that there is one
KOMACROTEST_XASSERT( items.count(), sizetype(0) ); KOMACROTEST_XASSERT( items.count(), sizetype(0) );
@ -148,9 +148,9 @@ void MacroitemTests::testMacroItemString()
kdDebug()<<"===================== testMacroItemString() ======================" << endl; kdDebug()<<"===================== testMacroItemString() ======================" << endl;
TQValueList< KSharedPtr<KoMacro::MacroItem> >& items = d->macro->items(); TQValueList< TDESharedPtr<KoMacro::MacroItem> >& items = d->macro->items();
KSharedPtr<KoMacro::Action> actionptr = items[0]->action(); TDESharedPtr<KoMacro::Action> actionptr = items[0]->action();
KSharedPtr<KoMacro::Variable> variableptr = actionptr->variable(TESTSTRING); TDESharedPtr<KoMacro::Variable> variableptr = actionptr->variable(TESTSTRING);
//create new macroitem for testing //create new macroitem for testing
KoMacro::MacroItem* macroitem = new KoMacro::MacroItem(); KoMacro::MacroItem* macroitem = new KoMacro::MacroItem();
@ -185,8 +185,8 @@ void MacroitemTests::testMacroItemInt()
kdDebug()<<"===================== testMacroItemInt() ======================" << endl; kdDebug()<<"===================== testMacroItemInt() ======================" << endl;
TQValueList< KSharedPtr<KoMacro::MacroItem> >& items = d->macro->items(); TQValueList< TDESharedPtr<KoMacro::MacroItem> >& items = d->macro->items();
KSharedPtr<KoMacro::Action> actionptr = items[0]->action(); TDESharedPtr<KoMacro::Action> actionptr = items[0]->action();
//create new macroitem for testing //create new macroitem for testing
KoMacro::MacroItem* macroitem = new KoMacro::MacroItem(); KoMacro::MacroItem* macroitem = new KoMacro::MacroItem();
@ -195,7 +195,7 @@ void MacroitemTests::testMacroItemInt()
items.append(macroitem); items.append(macroitem);
macroitem->setVariable(TESTINT,INT_MIN); macroitem->setVariable(TESTINT,INT_MIN);
KSharedPtr<KoMacro::Variable> variableptr = macroitem->variable(TESTINT); TDESharedPtr<KoMacro::Variable> variableptr = macroitem->variable(TESTINT);
KOMACROTEST_XASSERT(sizetype(variableptr.data()), sizetype(0)); KOMACROTEST_XASSERT(sizetype(variableptr.data()), sizetype(0));
KOMACROTEST_ASSERT(sizetype(variableptr->variant().toInt()),sizetype(INT_MIN)); KOMACROTEST_ASSERT(sizetype(variableptr->variant().toInt()),sizetype(INT_MIN));
@ -226,8 +226,8 @@ void MacroitemTests::testMacroItemBool()
kdDebug()<<"===================== testMacroItemBool() ======================" << endl; kdDebug()<<"===================== testMacroItemBool() ======================" << endl;
TQValueList< KSharedPtr<KoMacro::MacroItem> >& items = d->macro->items(); TQValueList< TDESharedPtr<KoMacro::MacroItem> >& items = d->macro->items();
KSharedPtr<KoMacro::Action> actionptr = items[0]->action(); TDESharedPtr<KoMacro::Action> actionptr = items[0]->action();
//create new macroitem for testing //create new macroitem for testing
KoMacro::MacroItem* macroitem = new KoMacro::MacroItem(); KoMacro::MacroItem* macroitem = new KoMacro::MacroItem();
@ -236,7 +236,7 @@ void MacroitemTests::testMacroItemBool()
items.append(macroitem); items.append(macroitem);
macroitem->setVariable(TESTBOOL,"false"); macroitem->setVariable(TESTBOOL,"false");
KSharedPtr<KoMacro::Variable> variableptr = macroitem->variable(TESTBOOL); TDESharedPtr<KoMacro::Variable> variableptr = macroitem->variable(TESTBOOL);
KOMACROTEST_XASSERT(sizetype(variableptr.data()), sizetype(0)); KOMACROTEST_XASSERT(sizetype(variableptr.data()), sizetype(0));
KOMACROTEST_ASSERT(variableptr->variant().toBool(),false); KOMACROTEST_ASSERT(variableptr->variant().toBool(),false);
} }

12
kexi/plugins/macros/tests/macrotests.cpp
Unescape View File

@ -83,7 +83,7 @@ namespace KoMacroTest {
}; };
} }
typedef TQValueList< KSharedPtr<KoMacro::MacroItem> >::size_type sizetype; typedef TQValueList< TDESharedPtr<KoMacro::MacroItem> >::size_type sizetype;
MacroTests::MacroTests() MacroTests::MacroTests()
@ -136,8 +136,8 @@ void MacroTests::testMacro()
TQDomElement const domelement = d->doomdocument->documentElement(); TQDomElement const domelement = d->doomdocument->documentElement();
KSharedPtr<KoMacro::Macro> macro1 = KoMacro::Manager::self()->createMacro("testMacro"); TDESharedPtr<KoMacro::Macro> macro1 = KoMacro::Manager::self()->createMacro("testMacro");
KSharedPtr<KoMacro::Macro> macro2 = KoMacro::Manager::self()->createMacro("testMacro"); TDESharedPtr<KoMacro::Macro> macro2 = KoMacro::Manager::self()->createMacro("testMacro");
//Is our XML parseable ? //Is our XML parseable ?
KOMACROTEST_ASSERT(macro1->parseXML(domelement),true); KOMACROTEST_ASSERT(macro1->parseXML(domelement),true);
KOMACROTEST_ASSERT(macro2->parseXML(domelement),true); KOMACROTEST_ASSERT(macro2->parseXML(domelement),true);
@ -150,8 +150,8 @@ void MacroTests::testMacro()
KOMACROTEST_ASSERT(macro1->name(), macro2->name() ); KOMACROTEST_ASSERT(macro1->name(), macro2->name() );
//create list of KsharedPtr from the childs of the macro //create list of KsharedPtr from the childs of the macro
TQValueList< KSharedPtr<KoMacro::MacroItem> >& items1 = macro1->items(); TQValueList< TDESharedPtr<KoMacro::MacroItem> >& items1 = macro1->items();
TQValueList< KSharedPtr<KoMacro::MacroItem> >& items2 = macro2->items(); TQValueList< TDESharedPtr<KoMacro::MacroItem> >& items2 = macro2->items();
//check that there is one //check that there is one
KOMACROTEST_XASSERT( items1.count(), sizetype(0) ); KOMACROTEST_XASSERT( items1.count(), sizetype(0) );
@ -174,7 +174,7 @@ void MacroTests::testMacro()
} }
//fetch the first one //fetch the first one
KSharedPtr<KoMacro::Action> actionptr = items1[0]->action(); TDESharedPtr<KoMacro::Action> actionptr = items1[0]->action();
//check that it is not null //check that it is not null
KOMACROTEST_XASSERT(sizetype(actionptr.data()), sizetype(0)); KOMACROTEST_XASSERT(sizetype(actionptr.data()), sizetype(0));
//check that it has the right name //check that it has the right name

6
kexi/plugins/macros/tests/testaction.cpp
Unescape View File

@ -43,16 +43,16 @@ TestAction::~TestAction()
{ {
} }
bool TestAction::notifyUpdated(KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name) bool TestAction::notifyUpdated(TDESharedPtr<KoMacro::MacroItem> macroitem, const TQString& name)
{ {
Q_UNUSED(macroitem); Q_UNUSED(macroitem);
Q_UNUSED(name); Q_UNUSED(name);
return true; return true;
} }
void TestAction::activate(KSharedPtr<KoMacro::Context> context) void TestAction::activate(TDESharedPtr<KoMacro::Context> context)
{ {
kdDebug() << "TestAction::activate(KSharedPtr<Context>)" << endl; kdDebug() << "TestAction::activate(TDESharedPtr<Context>)" << endl;
const TQString teststring = context->variable("teststring")->variant().toString(); const TQString teststring = context->variable("teststring")->variant().toString();
const int testint = context->variable("testint")->variant().toInt(); const int testint = context->variable("testint")->variant().toInt();
const bool testbool = context->variable("testbool")->variant().toBool(); const bool testbool = context->variable("testbool")->variant().toBool();

4
kexi/plugins/macros/tests/testaction.h
Unescape View File

@ -63,7 +63,7 @@ namespace KoMacroTest {
* @return true if the update was successfully else false * @return true if the update was successfully else false
* is returned. * is returned.
*/ */
virtual bool notifyUpdated(KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name); virtual bool notifyUpdated(TDESharedPtr<KoMacro::MacroItem> macroitem, const TQString& name);
public slots: public slots:
@ -71,7 +71,7 @@ namespace KoMacroTest {
* Called if the @a Action should be executed within the * Called if the @a Action should be executed within the
* defined @p context . * defined @p context .
*/ */
virtual void activate(KSharedPtr<KoMacro::Context> context); virtual void activate(TDESharedPtr<KoMacro::Context> context);
}; };
} }

24
kexi/plugins/macros/tests/variabletests.cpp
Unescape View File

@ -73,7 +73,7 @@ namespace KoMacroTest {
TQDomDocument* doomdocument; TQDomDocument* doomdocument;
KSharedPtr<KoMacro::Macro> macro; TDESharedPtr<KoMacro::Macro> macro;
Private() Private()
: xmlguiclient(0) : xmlguiclient(0)
@ -85,7 +85,7 @@ namespace KoMacroTest {
}; };
} }
typedef TQValueList< KSharedPtr<KoMacro::MacroItem> >::size_type sizetype; typedef TQValueList< TDESharedPtr<KoMacro::MacroItem> >::size_type sizetype;
/****************************************************************************** /******************************************************************************
* This is an xtra big TODO: * This is an xtra big TODO:
@ -144,7 +144,7 @@ void VariableTests::testMacro()
kdDebug()<<"===================== testMacro() ======================" << endl; kdDebug()<<"===================== testMacro() ======================" << endl;
//fetch Items and .. //fetch Items and ..
TQValueList< KSharedPtr<KoMacro::MacroItem> >& items = d->macro->items(); TQValueList< TDESharedPtr<KoMacro::MacroItem> >& items = d->macro->items();
//... check that there is one //... check that there is one
KOMACROTEST_XASSERT( items.count(), sizetype(0) ); KOMACROTEST_XASSERT( items.count(), sizetype(0) );
@ -152,11 +152,11 @@ void VariableTests::testMacro()
void VariableTests::testVariableString() { void VariableTests::testVariableString() {
kdDebug()<<"===================== testVariableString() ======================" << endl; kdDebug()<<"===================== testVariableString() ======================" << endl;
TQValueList< KSharedPtr<KoMacro::MacroItem> >& items = d->macro->items(); TQValueList< TDESharedPtr<KoMacro::MacroItem> >& items = d->macro->items();
KSharedPtr<KoMacro::Action> actionptr = items[0]->action(); TDESharedPtr<KoMacro::Action> actionptr = items[0]->action();
//fetch the "teststring"-variable //fetch the "teststring"-variable
KSharedPtr<KoMacro::Variable> variableptr = actionptr->variable(TESTSTRING); TDESharedPtr<KoMacro::Variable> variableptr = actionptr->variable(TESTSTRING);
//So there is a variable, does hasVariable() work ? //So there is a variable, does hasVariable() work ?
KOMACROTEST_ASSERT(actionptr->hasVariable(TESTSTRING),true); KOMACROTEST_ASSERT(actionptr->hasVariable(TESTSTRING),true);
//check count of variables //check count of variables
@ -185,11 +185,11 @@ void VariableTests::testVariableString() {
void VariableTests::testVariableInt() { void VariableTests::testVariableInt() {
kdDebug()<<"===================== testVariableInt() ======================" << endl; kdDebug()<<"===================== testVariableInt() ======================" << endl;
TQValueList< KSharedPtr<KoMacro::MacroItem> >& items = d->macro->items(); TQValueList< TDESharedPtr<KoMacro::MacroItem> >& items = d->macro->items();
KSharedPtr<KoMacro::Action> actionptr = items[0]->action(); TDESharedPtr<KoMacro::Action> actionptr = items[0]->action();
//fetch the "testint"-variable //fetch the "testint"-variable
KSharedPtr<KoMacro::Variable> variableptr = actionptr->variable(TESTINT); TDESharedPtr<KoMacro::Variable> variableptr = actionptr->variable(TESTINT);
//check that it is not null //check that it is not null
KOMACROTEST_XASSERT(sizetype(variableptr.data()), sizetype(0)); KOMACROTEST_XASSERT(sizetype(variableptr.data()), sizetype(0));
//check that it is 0 //check that it is 0
@ -218,11 +218,11 @@ void VariableTests::testVariableInt() {
void VariableTests::testVariableBool() { void VariableTests::testVariableBool() {
kdDebug()<<"===================== testVariableBool() ======================" << endl; kdDebug()<<"===================== testVariableBool() ======================" << endl;
TQValueList< KSharedPtr<KoMacro::MacroItem> >& items = d->macro->items(); TQValueList< TDESharedPtr<KoMacro::MacroItem> >& items = d->macro->items();
KSharedPtr<KoMacro::Action> actionptr = items[0]->action(); TDESharedPtr<KoMacro::Action> actionptr = items[0]->action();
//fetch the "testbool"-variable //fetch the "testbool"-variable
KSharedPtr<KoMacro::Variable> variableptr = actionptr->variable(TESTBOOL); TDESharedPtr<KoMacro::Variable> variableptr = actionptr->variable(TESTBOOL);
//check that it is not null //check that it is not null
KOMACROTEST_XASSERT(sizetype(variableptr.data()), sizetype(0)); KOMACROTEST_XASSERT(sizetype(variableptr.data()), sizetype(0));
//check that it is " " //check that it is " "

42
kexi/plugins/macros/tests/xmlhandlertests.cpp
Unescape View File

@ -61,7 +61,7 @@ namespace KoMacroTest {
* handling and communication with from TQObject * handling and communication with from TQObject
* inheritated instances. * inheritated instances.
*/ */
KSharedPtr<KoMacro::Action> testaction; TDESharedPtr<KoMacro::Action> testaction;
Private() Private()
: xmlguiclient(0) : xmlguiclient(0)
@ -143,7 +143,7 @@ void XMLHandlerTests::testParseAndToXML()
void XMLHandlerTests::testCorrectDomElement() void XMLHandlerTests::testCorrectDomElement()
{ {
// Local Init // Local Init
KSharedPtr<KoMacro::Macro> macro = KoMacro::Manager::self()->createMacro("testMacro"); TDESharedPtr<KoMacro::Macro> macro = KoMacro::Manager::self()->createMacro("testMacro");
TQDomDocument doomdocument; TQDomDocument doomdocument;
// Part 1: From XML to a Macro. // Part 1: From XML to a Macro.
@ -184,7 +184,7 @@ void XMLHandlerTests::testCorrectDomElement()
// 2.Test - XML-document with bad root element. // 2.Test - XML-document with bad root element.
void XMLHandlerTests::testBadRoot() void XMLHandlerTests::testBadRoot()
{ {
KSharedPtr<KoMacro::Macro> macro = KoMacro::Manager::self()->createMacro("testMacro"); TDESharedPtr<KoMacro::Macro> macro = KoMacro::Manager::self()->createMacro("testMacro");
TQDomDocument doomdocument; TQDomDocument doomdocument;
const TQString xml = TQString("<!DOCTYPE macros>" const TQString xml = TQString("<!DOCTYPE macros>"
@ -210,7 +210,7 @@ void XMLHandlerTests::testBadRoot()
// 3.Test - XML-document with a missing Variable. // 3.Test - XML-document with a missing Variable.
void XMLHandlerTests::testMissingVariable() void XMLHandlerTests::testMissingVariable()
{ {
KSharedPtr<KoMacro::Macro> macro = KoMacro::Manager::self()->createMacro("testMacro"); TDESharedPtr<KoMacro::Macro> macro = KoMacro::Manager::self()->createMacro("testMacro");
TQDomDocument doomdocument; TQDomDocument doomdocument;
const TQString xml = TQString("<!DOCTYPE macros>" const TQString xml = TQString("<!DOCTYPE macros>"
@ -238,7 +238,7 @@ void XMLHandlerTests::testMissingVariable()
// 4.Test - One more Variable in XML-Document. // 4.Test - One more Variable in XML-Document.
void XMLHandlerTests::testMoreVariables() void XMLHandlerTests::testMoreVariables()
{ {
KSharedPtr<KoMacro::Macro> macro = KoMacro::Manager::self()->createMacro("testMacro"); TDESharedPtr<KoMacro::Macro> macro = KoMacro::Manager::self()->createMacro("testMacro");
TQDomDocument doomdocument; TQDomDocument doomdocument;
const TQString xml = TQString("<!DOCTYPE macros>" const TQString xml = TQString("<!DOCTYPE macros>"
@ -270,7 +270,7 @@ void XMLHandlerTests::testMoreVariables()
// 5.Test - XML-document with wrong macro-xmlversion. // 5.Test - XML-document with wrong macro-xmlversion.
void XMLHandlerTests::testWrongVersion() void XMLHandlerTests::testWrongVersion()
{ {
KSharedPtr<KoMacro::Macro> macro = KoMacro::Manager::self()->createMacro("testMacro"); TDESharedPtr<KoMacro::Macro> macro = KoMacro::Manager::self()->createMacro("testMacro");
TQDomDocument doomdocument; TQDomDocument doomdocument;
const TQString xml = TQString("<!DOCTYPE macros>" const TQString xml = TQString("<!DOCTYPE macros>"
@ -297,7 +297,7 @@ void XMLHandlerTests::testWrongVersion()
// or missing end tag. // or missing end tag.
void XMLHandlerTests::testWrongXMLStruct() void XMLHandlerTests::testWrongXMLStruct()
{ {
KSharedPtr<KoMacro::Macro> macro = KoMacro::Manager::self()->createMacro("testMacro"); TDESharedPtr<KoMacro::Macro> macro = KoMacro::Manager::self()->createMacro("testMacro");
TQDomDocument doomdocument; TQDomDocument doomdocument;
const TQString xml = TQString("<!DOCTYPE macros>" const TQString xml = TQString("<!DOCTYPE macros>"
@ -321,7 +321,7 @@ void XMLHandlerTests::testWrongXMLStruct()
// 7.Test-XML-document with maximum field-size. // 7.Test-XML-document with maximum field-size.
void XMLHandlerTests::testMaxNum() void XMLHandlerTests::testMaxNum()
{ {
KSharedPtr<KoMacro::Macro> macro = KoMacro::Manager::self()->createMacro("testMacro"); TDESharedPtr<KoMacro::Macro> macro = KoMacro::Manager::self()->createMacro("testMacro");
TQDomDocument doomdocument; TQDomDocument doomdocument;
const TQString xml = TQString("<!DOCTYPE macros>" const TQString xml = TQString("<!DOCTYPE macros>"
@ -351,7 +351,7 @@ void XMLHandlerTests::testMaxNum()
// 8.Test-XML-document with maximum+1 field-size. // 8.Test-XML-document with maximum+1 field-size.
void XMLHandlerTests::testMaxNum2() void XMLHandlerTests::testMaxNum2()
{ {
KSharedPtr<KoMacro::Macro> macro = KoMacro::Manager::self()->createMacro("testMacro"); TDESharedPtr<KoMacro::Macro> macro = KoMacro::Manager::self()->createMacro("testMacro");
TQDomDocument doomdocument; TQDomDocument doomdocument;
const TQString xml = TQString("<!DOCTYPE macros>" const TQString xml = TQString("<!DOCTYPE macros>"
@ -381,7 +381,7 @@ void XMLHandlerTests::testMaxNum2()
// 9.Test-XML-document with minimum field-size. // 9.Test-XML-document with minimum field-size.
void XMLHandlerTests::testMinNum() void XMLHandlerTests::testMinNum()
{ {
KSharedPtr<KoMacro::Macro> macro = KoMacro::Manager::self()->createMacro("testMacro"); TDESharedPtr<KoMacro::Macro> macro = KoMacro::Manager::self()->createMacro("testMacro");
TQDomDocument doomdocument; TQDomDocument doomdocument;
const TQString xml = TQString("<!DOCTYPE macros>" const TQString xml = TQString("<!DOCTYPE macros>"
@ -411,7 +411,7 @@ void XMLHandlerTests::testMinNum()
// 10.Test-XML-document with minimum+1 field-size. // 10.Test-XML-document with minimum+1 field-size.
void XMLHandlerTests::testMinNum2() void XMLHandlerTests::testMinNum2()
{ {
KSharedPtr<KoMacro::Macro> macro = KoMacro::Manager::self()->createMacro("testMacro"); TDESharedPtr<KoMacro::Macro> macro = KoMacro::Manager::self()->createMacro("testMacro");
TQDomDocument doomdocument; TQDomDocument doomdocument;
const TQString xml = TQString("<!DOCTYPE macros>" const TQString xml = TQString("<!DOCTYPE macros>"
@ -441,7 +441,7 @@ void XMLHandlerTests::testMinNum2()
// 11.Test - With a to big number. // 11.Test - With a to big number.
void XMLHandlerTests::testBigNumber() void XMLHandlerTests::testBigNumber()
{ {
KSharedPtr<KoMacro::Macro> macro = KoMacro::Manager::self()->createMacro("testMacro"); TDESharedPtr<KoMacro::Macro> macro = KoMacro::Manager::self()->createMacro("testMacro");
TQDomDocument doomdocument; TQDomDocument doomdocument;
const TQString xml = TQString("<!DOCTYPE macros>" const TQString xml = TQString("<!DOCTYPE macros>"
@ -471,7 +471,7 @@ void XMLHandlerTests::testBigNumber()
// 12.Test - With two MacroItems. // 12.Test - With two MacroItems.
void XMLHandlerTests::testTwoMacroItems() void XMLHandlerTests::testTwoMacroItems()
{ {
KSharedPtr<KoMacro::Macro> macro = KoMacro::Manager::self()->createMacro("testMacro"); TDESharedPtr<KoMacro::Macro> macro = KoMacro::Manager::self()->createMacro("testMacro");
TQDomDocument doomdocument; TQDomDocument doomdocument;
const TQString xml = TQString("<!DOCTYPE macros>" const TQString xml = TQString("<!DOCTYPE macros>"
@ -517,15 +517,15 @@ void XMLHandlerTests::testTwoMacroItems()
* @p isactionset Bool for expectation that the @a Action -names are equal. * @p isactionset Bool for expectation that the @a Action -names are equal.
* @p isvariableok TQMap of Bools for comparing each @a Variable . * @p isvariableok TQMap of Bools for comparing each @a Variable .
*/ */
void XMLHandlerTests::assertMacroContentEqToXML(const KSharedPtr<KoMacro::Macro> macro, void XMLHandlerTests::assertMacroContentEqToXML(const TDESharedPtr<KoMacro::Macro> macro,
const TQDomElement& elem, const TQDomElement& elem,
const bool isitemsempty, const bool isitemsempty,
const bool isactionset, const bool isactionset,
const TQMap<TQString, bool> isvariableok) const TQMap<TQString, bool> isvariableok)
{ {
// Make an Iterator over the MacroItems of the Macro. // Make an Iterator over the MacroItems of the Macro.
const TQValueList<KSharedPtr<KoMacro::MacroItem > > macroitems = macro->items(); const TQValueList<TDESharedPtr<KoMacro::MacroItem > > macroitems = macro->items();
TQValueList<KSharedPtr<KoMacro::MacroItem > >::ConstIterator TQValueList<TDESharedPtr<KoMacro::MacroItem > >::ConstIterator
mit(macroitems.constBegin()), end(macroitems.constEnd()); mit(macroitems.constBegin()), end(macroitems.constEnd());
//1.comparison - Is the MacroItem-list empty? //1.comparison - Is the MacroItem-list empty?
@ -545,7 +545,7 @@ void XMLHandlerTests::assertMacroContentEqToXML(const KSharedPtr<KoMacro::Macro>
// Iterate over the MacroItems and item-elements. // Iterate over the MacroItems and item-elements.
while(mit != end && ! itemnode.isNull()) { while(mit != end && ! itemnode.isNull()) {
const KSharedPtr<KoMacro::MacroItem> macroitem = *mit; const TDESharedPtr<KoMacro::MacroItem> macroitem = *mit;
const TQDomElement itemelem = itemnode.toElement(); const TQDomElement itemelem = itemnode.toElement();
//2.comparison - Is the Action-name equal? //2.comparison - Is the Action-name equal?
@ -563,12 +563,12 @@ void XMLHandlerTests::assertMacroContentEqToXML(const KSharedPtr<KoMacro::Macro>
} }
// Go down to MacroItem->Variable and item->variable and compare them. // Go down to MacroItem->Variable and item->variable and compare them.
TQMap<TQString, KSharedPtr<KoMacro::Variable > > mvariables = macroitem->variables(); TQMap<TQString, TDESharedPtr<KoMacro::Variable > > mvariables = macroitem->variables();
TQDomNode varnode = itemelem.firstChild(); TQDomNode varnode = itemelem.firstChild();
while ( ! varnode.isNull()) { while ( ! varnode.isNull()) {
const TQDomElement varelem = varnode.toElement(); const TQDomElement varelem = varnode.toElement();
const KSharedPtr<KoMacro::Variable> varitem = mvariables.find(varelem.attribute("name")).data(); const TDESharedPtr<KoMacro::Variable> varitem = mvariables.find(varelem.attribute("name")).data();
//3.comparison - Is the content of the Variable //3.comparison - Is the content of the Variable
// in the MacroItem and and item equal? // in the MacroItem and and item equal?
@ -605,10 +605,10 @@ void XMLHandlerTests::assertMacroContentEqToXML(const KSharedPtr<KoMacro::Macro>
} }
// Prints a TQMap of Variables to kdDebug(). // Prints a TQMap of Variables to kdDebug().
void XMLHandlerTests::printMvariables(const TQMap<TQString, KSharedPtr<KoMacro::Variable > > mvariables, const TQString s) void XMLHandlerTests::printMvariables(const TQMap<TQString, TDESharedPtr<KoMacro::Variable > > mvariables, const TQString s)
{ {
//TQValueList<TQString>::ConstIterator kit (keys.constBegin()), end(keys.constEnd()); //TQValueList<TQString>::ConstIterator kit (keys.constBegin()), end(keys.constEnd());
TQMap<TQString, KSharedPtr<KoMacro::Variable > >::ConstIterator mvit (mvariables.constBegin()), end(mvariables.constEnd()); TQMap<TQString, TDESharedPtr<KoMacro::Variable > >::ConstIterator mvit (mvariables.constBegin()), end(mvariables.constEnd());
while(mvit != end){ while(mvit != end){
const KoMacro::Variable * v = *mvit; const KoMacro::Variable * v = *mvit;
kdDebug() << s << ": " << v->name() << endl; kdDebug() << s << ": " << v->name() << endl;

4
kexi/plugins/macros/tests/xmlhandlertests.h
Unescape View File

@ -77,14 +77,14 @@ namespace KoMacroTest {
* @p isactionset Bool for expectation that the @a Action -names are equal. * @p isactionset Bool for expectation that the @a Action -names are equal.
* @p isvariableok TQMap of Bools for comparing each @a Variable . * @p isvariableok TQMap of Bools for comparing each @a Variable .
*/ */
void assertMacroContentEqToXML(const KSharedPtr<KoMacro::Macro> macro, void assertMacroContentEqToXML(const TDESharedPtr<KoMacro::Macro> macro,
const TQDomElement& elem, const TQDomElement& elem,
const bool isitemsempty, const bool isitemsempty,
const bool isactionset, const bool isactionset,
const TQMap<TQString, bool> isvariableok); const TQMap<TQString, bool> isvariableok);
// Prints a TQMap of Variables to kdDebug(). // Prints a TQMap of Variables to kdDebug().
void printMvariables(const TQMap<TQString, KSharedPtr<KoMacro::Variable > > mvariables, const TQString s); void printMvariables(const TQMap<TQString, TDESharedPtr<KoMacro::Variable > > mvariables, const TQString s);
/** /**
* Sub-methods of testParseXML() and testToXML(). * Sub-methods of testParseXML() and testToXML().

154
kexi/plugins/macros/tests/xmlhandlertests2.cpp
Unescape View File

@ -59,39 +59,39 @@ namespace KoMacroTest {
/** /**
* @a Macro instance as a container for the macroitems; * @a Macro instance as a container for the macroitems;
*/ */
KSharedPtr<KoMacro::Macro> macro; // container for manually created items TDESharedPtr<KoMacro::Macro> macro; // container for manually created items
KSharedPtr<KoMacro::Macro> macro2; // container for parsen items TDESharedPtr<KoMacro::Macro> macro2; // container for parsen items
KSharedPtr<KoMacro::Macro> macro3; // container for parsen items after back-converting by toXML() and again parseXML() TDESharedPtr<KoMacro::Macro> macro3; // container for parsen items after back-converting by toXML() and again parseXML()
/** /**
* An @a TestObject instance used internaly to test * An @a TestObject instance used internaly to test
* handling and communication with from TQObject * handling and communication with from TQObject
* inheritated instances. * inheritated instances.
*/ */
KSharedPtr<KoMacro::Action> testaction; TDESharedPtr<KoMacro::Action> testaction;
KSharedPtr<KoMacro::Action> action2; // action of the parsen macro2 TDESharedPtr<KoMacro::Action> action2; // action of the parsen macro2
KSharedPtr<KoMacro::Action> action3; // action of the parsen macro3 TDESharedPtr<KoMacro::Action> action3; // action of the parsen macro3
KSharedPtr<KoMacro::Action> testaction_2; // for test12 TDESharedPtr<KoMacro::Action> testaction_2; // for test12
KSharedPtr<KoMacro::Action> action2_2; // action of the parsen macro2, for test12 TDESharedPtr<KoMacro::Action> action2_2; // action of the parsen macro2, for test12
KSharedPtr<KoMacro::Action> action3_2; // action of the parsen macro3, for test12 TDESharedPtr<KoMacro::Action> action3_2; // action of the parsen macro3, for test12
/** /**
* Represents a @a TQValuList of @a MacroItem which are parsen in the * Represents a @a TQValuList of @a MacroItem which are parsen in the
* correspondig @a Macro . * correspondig @a Macro .
*/ */
TQValueList<KSharedPtr<KoMacro::MacroItem > > macroitems2; // items of macro2 TQValueList<TDESharedPtr<KoMacro::MacroItem > > macroitems2; // items of macro2
TQValueList<KSharedPtr<KoMacro::MacroItem > > macroitems3; // items of macro3 TQValueList<TDESharedPtr<KoMacro::MacroItem > > macroitems3; // items of macro3
/** /**
* @a MacroItem instances which ist fillen manually from the given XML * @a MacroItem instances which ist fillen manually from the given XML
* and parsen by the @a XMLHandler over the XML. * and parsen by the @a XMLHandler over the XML.
*/ */
KSharedPtr<KoMacro::MacroItem> macroitem; // created manually from XML TDESharedPtr<KoMacro::MacroItem> macroitem; // created manually from XML
KSharedPtr<KoMacro::MacroItem> macroitem2; // parsen from XML in macro2 TDESharedPtr<KoMacro::MacroItem> macroitem2; // parsen from XML in macro2
KSharedPtr<KoMacro::MacroItem> macroitem3; // parsen from XML in macro3 TDESharedPtr<KoMacro::MacroItem> macroitem3; // parsen from XML in macro3
KSharedPtr<KoMacro::MacroItem> macroitem_2; // created manually from XML, for test12 TDESharedPtr<KoMacro::MacroItem> macroitem_2; // created manually from XML, for test12
KSharedPtr<KoMacro::MacroItem> macroitem2_2;// parsen from XML in macro2, for test12 TDESharedPtr<KoMacro::MacroItem> macroitem2_2;// parsen from XML in macro2, for test12
KSharedPtr<KoMacro::MacroItem> macroitem3_2;// parsen from XML in macro3, for test12 TDESharedPtr<KoMacro::MacroItem> macroitem3_2;// parsen from XML in macro3, for test12
Private() Private()
: xmlguiclient(0) : xmlguiclient(0)
@ -207,10 +207,10 @@ void XMLHandlerTests2::testCorrectDomElement()
d->macroitem->setAction(d->testaction); d->macroitem->setAction(d->testaction);
// Push the Variables into the macroitem. // Push the Variables into the macroitem.
KSharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); TDESharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",TQVariant("test_string"));
KSharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",TQVariant(0)); TDESharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",TQVariant(0));
KSharedPtr<KoMacro::Variable> varbool = d->macroitem->addVariable("testbool",TQVariant(true)); TDESharedPtr<KoMacro::Variable> varbool = d->macroitem->addVariable("testbool",TQVariant(true));
KSharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",TQVariant(0.6)); TDESharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",TQVariant(0.6));
// Is our XML parseable into a 2. Macro by calling parseXML()? // Is our XML parseable into a 2. Macro by calling parseXML()?
KOMACROTEST_ASSERT(d->macro2->parseXML(elem),true); KOMACROTEST_ASSERT(d->macro2->parseXML(elem),true);
@ -300,10 +300,10 @@ void XMLHandlerTests2::testBadRoot()
d->macroitem->setAction(d->testaction); d->macroitem->setAction(d->testaction);
// Push the Variables into the macroitem. // Push the Variables into the macroitem.
KSharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); TDESharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",TQVariant("test_string"));
KSharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",TQVariant(0)); TDESharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",TQVariant(0));
KSharedPtr<KoMacro::Variable> varbool = d->macroitem->addVariable("testbool",TQVariant(true)); TDESharedPtr<KoMacro::Variable> varbool = d->macroitem->addVariable("testbool",TQVariant(true));
KSharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",TQVariant(0.6)); TDESharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",TQVariant(0.6));
// Is our XML parseable into a 2. Macro by calling parseXML()? // Is our XML parseable into a 2. Macro by calling parseXML()?
KOMACROTEST_XASSERT(d->macro2->parseXML(elem),true); KOMACROTEST_XASSERT(d->macro2->parseXML(elem),true);
@ -339,9 +339,9 @@ void XMLHandlerTests2::testMissingVariable()
d->macroitem->setAction(d->testaction); d->macroitem->setAction(d->testaction);
// Push the Variables into the macroitem. // Push the Variables into the macroitem.
KSharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); TDESharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",TQVariant("test_string"));
KSharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",TQVariant(0)); TDESharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",TQVariant(0));
KSharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",TQVariant(0.6)); TDESharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",TQVariant(0.6));
// Is our XML parseable into a 2. Macro by calling parseXML()? // Is our XML parseable into a 2. Macro by calling parseXML()?
KOMACROTEST_ASSERT(d->macro2->parseXML(elem),true); KOMACROTEST_ASSERT(d->macro2->parseXML(elem),true);
@ -425,11 +425,11 @@ void XMLHandlerTests2::testMoreVariables()
d->macroitem->setAction(d->testaction); d->macroitem->setAction(d->testaction);
// Push the Variables into the macroitem. // Push the Variables into the macroitem.
KSharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); TDESharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",TQVariant("test_string"));
KSharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",TQVariant(0)); TDESharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",TQVariant(0));
KSharedPtr<KoMacro::Variable> varbool = d->macroitem->addVariable("testbool",TQVariant(true)); TDESharedPtr<KoMacro::Variable> varbool = d->macroitem->addVariable("testbool",TQVariant(true));
KSharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",TQVariant(0.6)); TDESharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",TQVariant(0.6));
KSharedPtr<KoMacro::Variable> varbla = d->macroitem->addVariable("testbla","somethingwrong"); TDESharedPtr<KoMacro::Variable> varbla = d->macroitem->addVariable("testbla","somethingwrong");
// Is our XML parseable into a 2. Macro by calling parseXML()? // Is our XML parseable into a 2. Macro by calling parseXML()?
KOMACROTEST_ASSERT(d->macro2->parseXML(elem),true); KOMACROTEST_ASSERT(d->macro2->parseXML(elem),true);
@ -517,10 +517,10 @@ void XMLHandlerTests2::testWrongVersion()
d->macroitem->setAction(d->testaction); d->macroitem->setAction(d->testaction);
// Push the Variables into the macroitem. // Push the Variables into the macroitem.
KSharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); TDESharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",TQVariant("test_string"));
KSharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",TQVariant(0)); TDESharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",TQVariant(0));
KSharedPtr<KoMacro::Variable> varbool = d->macroitem->addVariable("testbool",TQVariant(true)); TDESharedPtr<KoMacro::Variable> varbool = d->macroitem->addVariable("testbool",TQVariant(true));
KSharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",TQVariant(0.6)); TDESharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",TQVariant(0.6));
// Is our XML parseable into a 2. Macro by calling parseXML()? // Is our XML parseable into a 2. Macro by calling parseXML()?
KOMACROTEST_XASSERT(d->macro2->parseXML(elem),true); KOMACROTEST_XASSERT(d->macro2->parseXML(elem),true);
@ -559,10 +559,10 @@ void XMLHandlerTests2::testWrongXMLStruct()
d->macroitem->setAction(d->testaction); d->macroitem->setAction(d->testaction);
// Push the Variables into the macroitem. // Push the Variables into the macroitem.
KSharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); TDESharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",TQVariant("test_string"));
KSharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",TQVariant(0)); TDESharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",TQVariant(0));
KSharedPtr<KoMacro::Variable> varbool = d->macroitem->addVariable("testbool",TQVariant(true)); TDESharedPtr<KoMacro::Variable> varbool = d->macroitem->addVariable("testbool",TQVariant(true));
KSharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",TQVariant(0.6)); TDESharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",TQVariant(0.6));
// Is our XML parseable into a 2. Macro by calling parseXML()? // Is our XML parseable into a 2. Macro by calling parseXML()?
KOMACROTEST_XASSERT(d->macro2->parseXML(elem),true); KOMACROTEST_XASSERT(d->macro2->parseXML(elem),true);
@ -599,10 +599,10 @@ void XMLHandlerTests2::testMaxNum()
d->macroitem->setAction(d->testaction); d->macroitem->setAction(d->testaction);
// Push the Variables into the macroitem. // Push the Variables into the macroitem.
KSharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); TDESharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",TQVariant("test_string"));
KSharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",TQVariant(INT_MAX)); TDESharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",TQVariant(INT_MAX));
KSharedPtr<KoMacro::Variable> varbool = d->macroitem->addVariable("testbool",TQVariant(true)); TDESharedPtr<KoMacro::Variable> varbool = d->macroitem->addVariable("testbool",TQVariant(true));
KSharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",TQVariant(DBL_MAX)); TDESharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",TQVariant(DBL_MAX));
// Is our XML parseable into a 2. Macro by calling parseXML()? // Is our XML parseable into a 2. Macro by calling parseXML()?
KOMACROTEST_ASSERT(d->macro2->parseXML(elem),true); KOMACROTEST_ASSERT(d->macro2->parseXML(elem),true);
@ -687,10 +687,10 @@ void XMLHandlerTests2::testMaxNum2()
d->macroitem->setAction(d->testaction); d->macroitem->setAction(d->testaction);
// Push the Variables into the macroitem. // Push the Variables into the macroitem.
KSharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); TDESharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",TQVariant("test_string"));
KSharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",TQVariant(INT_MAX+1)); TDESharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",TQVariant(INT_MAX+1));
KSharedPtr<KoMacro::Variable> varbool = d->macroitem->addVariable("testbool",TQVariant(true)); TDESharedPtr<KoMacro::Variable> varbool = d->macroitem->addVariable("testbool",TQVariant(true));
KSharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",TQVariant(DBL_MAX+1)); TDESharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",TQVariant(DBL_MAX+1));
// Is our XML parseable into a 2. Macro by calling parseXML()? // Is our XML parseable into a 2. Macro by calling parseXML()?
KOMACROTEST_ASSERT(d->macro2->parseXML(elem),true); KOMACROTEST_ASSERT(d->macro2->parseXML(elem),true);
@ -775,10 +775,10 @@ void XMLHandlerTests2::testMinNum()
d->macroitem->setAction(d->testaction); d->macroitem->setAction(d->testaction);
// Push the Variables into the macroitem. // Push the Variables into the macroitem.
KSharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); TDESharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",TQVariant("test_string"));
KSharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",TQVariant(INT_MIN)); TDESharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",TQVariant(INT_MIN));
KSharedPtr<KoMacro::Variable> varbool = d->macroitem->addVariable("testbool",TQVariant(true)); TDESharedPtr<KoMacro::Variable> varbool = d->macroitem->addVariable("testbool",TQVariant(true));
KSharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",TQVariant(DBL_MIN)); TDESharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",TQVariant(DBL_MIN));
// Is our XML parseable into a 2. Macro by calling parseXML()? // Is our XML parseable into a 2. Macro by calling parseXML()?
KOMACROTEST_ASSERT(d->macro2->parseXML(elem),true); KOMACROTEST_ASSERT(d->macro2->parseXML(elem),true);
@ -863,10 +863,10 @@ void XMLHandlerTests2::testMinNum2()
d->macroitem->setAction(d->testaction); d->macroitem->setAction(d->testaction);
// Push the Variables into the macroitem. // Push the Variables into the macroitem.
KSharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); TDESharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",TQVariant("test_string"));
KSharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",TQVariant(INT_MIN-1)); TDESharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",TQVariant(INT_MIN-1));
KSharedPtr<KoMacro::Variable> varbool = d->macroitem->addVariable("testbool",TQVariant(true)); TDESharedPtr<KoMacro::Variable> varbool = d->macroitem->addVariable("testbool",TQVariant(true));
KSharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",TQVariant(DBL_MIN-1)); TDESharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",TQVariant(DBL_MIN-1));
// Is our XML parseable into a 2. Macro by calling parseXML()? // Is our XML parseable into a 2. Macro by calling parseXML()?
KOMACROTEST_ASSERT(d->macro2->parseXML(elem),true); KOMACROTEST_ASSERT(d->macro2->parseXML(elem),true);
@ -951,10 +951,10 @@ void XMLHandlerTests2::testBigNumber()
d->macroitem->setAction(d->testaction); d->macroitem->setAction(d->testaction);
// Push the Variables into the macroitem. // Push the Variables into the macroitem.
KSharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); TDESharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",TQVariant("test_string"));
//TODO //KSharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",TQVariant(0123456789012345678901234567890123456789)); //TODO //TDESharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",TQVariant(0123456789012345678901234567890123456789));
KSharedPtr<KoMacro::Variable> varbool = d->macroitem->addVariable("testbool",TQVariant(true)); TDESharedPtr<KoMacro::Variable> varbool = d->macroitem->addVariable("testbool",TQVariant(true));
KSharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",TQVariant(0.6)); TDESharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",TQVariant(0.6));
// Is our XML parseable into a 2. Macro by calling parseXML()? // Is our XML parseable into a 2. Macro by calling parseXML()?
KOMACROTEST_ASSERT(d->macro2->parseXML(elem),true); KOMACROTEST_ASSERT(d->macro2->parseXML(elem),true);
@ -1050,18 +1050,18 @@ void XMLHandlerTests2::testTwoMacroItems()
d->macroitem_2->setAction(d->testaction_2); d->macroitem_2->setAction(d->testaction_2);
// Push the Variables into the macroitem. // Push the Variables into the macroitem.
KSharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); TDESharedPtr<KoMacro::Variable> varstring = d->macroitem->addVariable("teststring",TQVariant("test_string"));
KSharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",TQVariant(0)); TDESharedPtr<KoMacro::Variable> varint = d->macroitem->addVariable("testint",TQVariant(0));
KSharedPtr<KoMacro::Variable> varbool = d->macroitem->addVariable("testbool",TQVariant(true)); TDESharedPtr<KoMacro::Variable> varbool = d->macroitem->addVariable("testbool",TQVariant(true));
KSharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",TQVariant(0.6)); TDESharedPtr<KoMacro::Variable> vardouble = d->macroitem->addVariable("testdouble",TQVariant(0.6));
KSharedPtr<KoMacro::Variable> varbla = d->macroitem->addVariable("testbla","somethingwrong"); TDESharedPtr<KoMacro::Variable> varbla = d->macroitem->addVariable("testbla","somethingwrong");
// Push the Variables into the macroitem4. // Push the Variables into the macroitem4.
KSharedPtr<KoMacro::Variable> varstring_2 = d->macroitem_2->addVariable("teststring",TQVariant("testString2")); TDESharedPtr<KoMacro::Variable> varstring_2 = d->macroitem_2->addVariable("teststring",TQVariant("testString2"));
KSharedPtr<KoMacro::Variable> varint_2 = d->macroitem_2->addVariable("testint",TQVariant(4)); TDESharedPtr<KoMacro::Variable> varint_2 = d->macroitem_2->addVariable("testint",TQVariant(4));
KSharedPtr<KoMacro::Variable> varbool_2 = d->macroitem_2->addVariable("testbool",TQVariant(false)); TDESharedPtr<KoMacro::Variable> varbool_2 = d->macroitem_2->addVariable("testbool",TQVariant(false));
KSharedPtr<KoMacro::Variable> vardouble_2 = d->macroitem_2->addVariable("testdouble",TQVariant(0.7)); TDESharedPtr<KoMacro::Variable> vardouble_2 = d->macroitem_2->addVariable("testdouble",TQVariant(0.7));
KSharedPtr<KoMacro::Variable> varbla_2 = d->macroitem_2->addVariable("testbla","somethingwrong2"); TDESharedPtr<KoMacro::Variable> varbla_2 = d->macroitem_2->addVariable("testbla","somethingwrong2");
// Is our XML parseable into a 2. Macro by calling parseXML()? // Is our XML parseable into a 2. Macro by calling parseXML()?
KOMACROTEST_ASSERT(d->macro2->parseXML(elem),true); KOMACROTEST_ASSERT(d->macro2->parseXML(elem),true);
@ -1072,7 +1072,7 @@ void XMLHandlerTests2::testTwoMacroItems()
KOMACROTEST_ASSERT(d->macroitems2.size(),(sizetypelist)2); KOMACROTEST_ASSERT(d->macroitems2.size(),(sizetypelist)2);
{ {
TQValueList<KSharedPtr<KoMacro::MacroItem > >::ConstIterator mit2(d->macroitems2.constBegin()); TQValueList<TDESharedPtr<KoMacro::MacroItem > >::ConstIterator mit2(d->macroitems2.constBegin());
// 2a.comparison - Test if the Action is correct? // 2a.comparison - Test if the Action is correct?
d->macroitem2 = *mit2; d->macroitem2 = *mit2;
mit2++; mit2++;
@ -1111,7 +1111,7 @@ void XMLHandlerTests2::testTwoMacroItems()
KOMACROTEST_ASSERT(d->macroitems3.size(),(sizetypelist)2); KOMACROTEST_ASSERT(d->macroitems3.size(),(sizetypelist)2);
{ {
TQValueList<KSharedPtr<KoMacro::MacroItem > >::ConstIterator mit3(d->macroitems3.constBegin()); TQValueList<TDESharedPtr<KoMacro::MacroItem > >::ConstIterator mit3(d->macroitems3.constBegin());
// 2b.comparison - Test if the Action is correct? // 2b.comparison - Test if the Action is correct?
d->macroitem3 = *mit3; d->macroitem3 = *mit3;
mit3++; mit3++;
@ -1145,14 +1145,14 @@ void XMLHandlerTests2::testTwoMacroItems()
* End of Sub-methos of testParseAndToXML2(). * End of Sub-methos of testParseAndToXML2().
***************************************************************************/ ***************************************************************************/
bool XMLHandlerTests2::assertActionsEqual(KSharedPtr<KoMacro::Action> action, bool XMLHandlerTests2::assertActionsEqual(TDESharedPtr<KoMacro::Action> action,
KSharedPtr<KoMacro::Action> action2) TDESharedPtr<KoMacro::Action> action2)
{ {
return action->name() == action2->name(); return action->name() == action2->name();
} }
bool XMLHandlerTests2::assertVariablesEqual(KSharedPtr<KoMacro::Variable> var, bool XMLHandlerTests2::assertVariablesEqual(TDESharedPtr<KoMacro::Variable> var,
KSharedPtr<KoMacro::Variable> var2) TDESharedPtr<KoMacro::Variable> var2)
{ {
if ( var->variant() != var2->variant() ) kdDebug() << "Variable1: " << var->variant() << " and Variable2: " << var2->variant() << endl; if ( var->variant() != var2->variant() ) kdDebug() << "Variable1: " << var->variant() << " and Variable2: " << var2->variant() << endl;
return var->variant() == var2->variant(); return var->variant() == var2->variant();

14
kexi/plugins/macros/tests/xmlhandlertests2.h
Unescape View File

@ -70,7 +70,7 @@ namespace KoMacroTest {
Private* const d; Private* const d;
typedef TQMap<TQString,KoMacro::Variable>::size_type sizetypemap; typedef TQMap<TQString,KoMacro::Variable>::size_type sizetypemap;
typedef TQValueList<KSharedPtr<KoMacro::MacroItem > >::size_type sizetypelist; typedef TQValueList<TDESharedPtr<KoMacro::MacroItem > >::size_type sizetypelist;
/** /**
* Compares a XML-Element with a Macro. Call sub-asserts. * Compares a XML-Element with a Macro. Call sub-asserts.
@ -80,14 +80,14 @@ namespace KoMacroTest {
* @p isactionset Bool for expectation that the @a Action -names are equal. * @p isactionset Bool for expectation that the @a Action -names are equal.
* @p isvariableok TQMap of Bools for comparing each @a Variable . * @p isvariableok TQMap of Bools for comparing each @a Variable .
*/ */
/* void assertMacroContentEqToXML(const KSharedPtr<KoMacro::Macro> macro, /* void assertMacroContentEqToXML(const TDESharedPtr<KoMacro::Macro> macro,
const TQDomElement& elem, const TQDomElement& elem,
const bool isitemsempty, const bool isitemsempty,
const bool isactionset, const bool isactionset,
const TQMap<TQString, bool> isvariableok); const TQMap<TQString, bool> isvariableok);
// Prints a TQMap of Variables to kdDebug(). // Prints a TQMap of Variables to kdDebug().
void printMvariables(const TQMap<TQString, KSharedPtr<KoMacro::Variable > > mvariables, const TQString s); void printMvariables(const TQMap<TQString, TDESharedPtr<KoMacro::Variable > > mvariables, const TQString s);
*/ */
/** /**
* Sub-methods of testParseXML() and testToXML(). * Sub-methods of testParseXML() and testToXML().
@ -122,11 +122,11 @@ namespace KoMacroTest {
void testTwoMacroItems(); void testTwoMacroItems();
bool assertActionsEqual(KSharedPtr<KoMacro::Action> action, bool assertActionsEqual(TDESharedPtr<KoMacro::Action> action,
KSharedPtr<KoMacro::Action> action2); TDESharedPtr<KoMacro::Action> action2);
bool assertVariablesEqual(KSharedPtr<KoMacro::Variable> var, bool assertVariablesEqual(TDESharedPtr<KoMacro::Variable> var,
KSharedPtr<KoMacro::Variable> var2); TDESharedPtr<KoMacro::Variable> var2);
}; };
} }

4
kexi/plugins/scripting/kexidb/kexidbconnection.h
Unescape View File

@ -180,8 +180,8 @@ namespace Kross { namespace KexiDB {
::KexiDB::Connection* connection() const; ::KexiDB::Connection* connection() const;
::KexiDB::Connection* m_connection; ::KexiDB::Connection* m_connection;
KSharedPtr<KexiDBConnectionData> m_connectiondata; TDESharedPtr<KexiDBConnectionData> m_connectiondata;
KSharedPtr<KexiDBDriver> m_driver; TDESharedPtr<KexiDBDriver> m_driver;
/// Initialize the class instance. /// Initialize the class instance.
void initialize(); void initialize();

2
kpresenter/KPrBgSpellCheck.cpp
Unescape View File

@ -35,7 +35,7 @@ using namespace KSpell2;
#include <klocale.h> #include <klocale.h>
KPrBgSpellCheck::KPrBgSpellCheck(KPrDocument *_doc) KPrBgSpellCheck::KPrBgSpellCheck(KPrDocument *_doc)
: KoBgSpellCheck(Broker::openBroker( KSharedConfig::openConfig( "kpresenterrc" ) ), _doc ) : KoBgSpellCheck(Broker::openBroker( TDESharedConfig::openConfig( "kpresenterrc" ) ), _doc )
{ {
m_doc=_doc; m_doc=_doc;
m_currentObj=0L; m_currentObj=0L;

2
kpresenter/KPrView.cpp
Unescape View File

@ -326,7 +326,7 @@ KPrView::KPrView( KPrDocument* _doc, TQWidget *_parent, const char *_name )
m_spell.textIterator = 0L; m_spell.textIterator = 0L;
m_spell.macroCmdSpellCheck = 0L; m_spell.macroCmdSpellCheck = 0L;
m_spell.dlg = 0; m_spell.dlg = 0;
m_broker = Broker::openBroker( KSharedConfig::openConfig( "kpresenterrc" ) ); m_broker = Broker::openBroker( TDESharedConfig::openConfig( "kpresenterrc" ) );
m_autoPresTimerConnected = false; m_autoPresTimerConnected = false;
m_actionList.setAutoDelete( true ); m_actionList.setAutoDelete( true );

2
kword/KWBgSpellCheck.cpp
Unescape View File

@ -36,7 +36,7 @@ using namespace KSpell2;
KWBgSpellCheck::KWBgSpellCheck(KWDocument *_doc) KWBgSpellCheck::KWBgSpellCheck(KWDocument *_doc)
: KoBgSpellCheck( Broker::openBroker( KSharedConfig::openConfig( "kwordrc" ) ), : KoBgSpellCheck( Broker::openBroker( TDESharedConfig::openConfig( "kwordrc" ) ),
_doc ) _doc )
{ {
m_doc=_doc; m_doc=_doc;

2
kword/KWView.cpp
Unescape View File

@ -235,7 +235,7 @@ KWView::KWView( const TQString& viewMode, TQWidget *parent, const char *name, KW
m_fsInline=0; m_fsInline=0;
m_spell.kospell = 0; m_spell.kospell = 0;
m_spell.dlg = 0; m_spell.dlg = 0;
m_broker = Broker::openBroker( KSharedConfig::openConfig( "kwordrc" ) ); m_broker = Broker::openBroker( TDESharedConfig::openConfig( "kwordrc" ) );
m_spell.macroCmdSpellCheck=0L; m_spell.macroCmdSpellCheck=0L;
m_spell.textIterator = 0L; m_spell.textIterator = 0L;
m_currentPage = m_doc->pageManager()->page(m_doc->startPage()); m_currentPage = m_doc->pageManager()->page(m_doc->startPage());

4
lib/kofficecore/KoFilterChain.h
Unescape View File

@ -47,7 +47,7 @@ namespace KOffice {
* @author Werner Trobin <trobin@kde.org> * @author Werner Trobin <trobin@kde.org>
* @todo the class has no constructor and therefore cannot initialize its private class * @todo the class has no constructor and therefore cannot initialize its private class
*/ */
class KOFFICECORE_EXPORT KoFilterChain : public KShared class KOFFICECORE_EXPORT KoFilterChain : public TDEShared
{ {
// Only KOffice::Graph is allowed to construct instances and // Only KOffice::Graph is allowed to construct instances and
// add chain links. // add chain links.
@ -55,7 +55,7 @@ class KOFFICECORE_EXPORT KoFilterChain : public KShared
friend class KoFilterManager; friend class KoFilterManager;
public: public:
typedef KSharedPtr<KoFilterChain> Ptr; typedef TDESharedPtr<KoFilterChain> Ptr;
virtual ~KoFilterChain(); virtual ~KoFilterChain();

2
lib/kofficecore/KoMainWindow.cpp
Unescape View File

@ -180,7 +180,7 @@ public:
TQCString m_lastExportFormat; TQCString m_lastExportFormat;
int m_lastExportSpecialOutputFlag; int m_lastExportSpecialOutputFlag;
KSharedPtr<KoSpeaker> m_koSpeaker; TDESharedPtr<KoSpeaker> m_koSpeaker;
}; };
KoMainWindow::KoMainWindow( TDEInstance *instance, const char* name ) KoMainWindow::KoMainWindow( TDEInstance *instance, const char* name )

4
lib/kofficecore/KoQueryTrader.h
Unescape View File

@ -116,11 +116,11 @@ private:
/** /**
* Represents an available filter. * Represents an available filter.
*/ */
class KoFilterEntry : public KShared class KoFilterEntry : public TDEShared
{ {
public: public:
typedef KSharedPtr<KoFilterEntry> Ptr; typedef TDESharedPtr<KoFilterEntry> Ptr;
KoFilterEntry() : weight( 0 ) { m_service = 0L; } // for TQValueList KoFilterEntry() : weight( 0 ) { m_service = 0L; } // for TQValueList
KoFilterEntry( KService::Ptr service ); KoFilterEntry( KService::Ptr service );

2
lib/kofficecore/KoSpeaker.h
Unescape View File

@ -60,7 +60,7 @@ class KoSpeakerPrivate;
* *
* KOffice applications can access this object using the kospeaker global. * KOffice applications can access this object using the kospeaker global.
*/ */
class KOFFICECORE_EXPORT KoSpeaker : public TQObject, public KShared class KOFFICECORE_EXPORT KoSpeaker : public TQObject, public TDEShared
{ {
Q_OBJECT Q_OBJECT

2
lib/kross/api/callable.h
Unescape View File

@ -43,7 +43,7 @@ namespace Kross { namespace Api {
/** /**
* Shared pointer to implement reference-counting. * Shared pointer to implement reference-counting.
*/ */
typedef KSharedPtr<Callable> Ptr; typedef TDESharedPtr<Callable> Ptr;
/** /**
* Constructor. * Constructor.

2
lib/kross/api/class.h
Unescape View File

@ -48,7 +48,7 @@ namespace Kross { namespace Api {
/** /**
* Shared pointer to implement reference-counting. * Shared pointer to implement reference-counting.
*/ */
typedef KSharedPtr<T> Ptr; typedef TDESharedPtr<T> Ptr;
/** /**
* Constructor. * Constructor.

4
lib/kross/api/eventaction.h
Unescape View File

@ -45,7 +45,7 @@ namespace Kross { namespace Api {
/** /**
* Shared pointer to implement reference-counting. * Shared pointer to implement reference-counting.
*/ */
typedef KSharedPtr<EventAction> Ptr; typedef TDESharedPtr<EventAction> Ptr;
/** /**
* Constructor. * Constructor.
@ -61,7 +61,7 @@ namespace Kross { namespace Api {
virtual const TQString getClassName() const; virtual const TQString getClassName() const;
/// \see Kross::Api::Event::call() /// \see Kross::Api::Event::call()
//virtual Object::Ptr call(const TQString& name, KSharedPtr<List> arguments); //virtual Object::Ptr call(const TQString& name, TDESharedPtr<List> arguments);
private: private:
KAction* m_action; KAction* m_action;

2
lib/kross/api/eventscript.cpp
Unescape View File

@ -38,7 +38,7 @@ const TQString EventScript::getClassName() const
return "Kross::Api::EventScript"; return "Kross::Api::EventScript";
} }
Object::Ptr EventScript::call(const TQString& name, KSharedPtr<List> arguments) Object::Ptr EventScript::call(const TQString& name, TDESharedPtr<List> arguments)
{ {
krossdebug( TQString("EventScript::call() name=%1 arguments=%2").arg(name).arg(arguments->toString()) ); krossdebug( TQString("EventScript::call() name=%1 arguments=%2").arg(name).arg(arguments->toString()) );
//TODO //TODO

4
lib/kross/api/eventscript.h
Unescape View File

@ -38,7 +38,7 @@ namespace Kross { namespace Api {
/** /**
* Shared pointer to implement reference-counting. * Shared pointer to implement reference-counting.
*/ */
typedef KSharedPtr<EventScript> Ptr; typedef TDESharedPtr<EventScript> Ptr;
/** /**
* Constructor. * Constructor.
@ -52,7 +52,7 @@ namespace Kross { namespace Api {
virtual const TQString getClassName() const; virtual const TQString getClassName() const;
virtual Object::Ptr call(const TQString& name, KSharedPtr<List> arguments); virtual Object::Ptr call(const TQString& name, TDESharedPtr<List> arguments);
private: private:
//ScriptContainer* m_scriptcontainer; //ScriptContainer* m_scriptcontainer;

2
lib/kross/api/eventsignal.cpp
Unescape View File

@ -43,7 +43,7 @@ const TQString EventSignal::getClassName() const
return "Kross::Api::EventSignal"; return "Kross::Api::EventSignal";
} }
Object::Ptr EventSignal::call(const TQString& /*name*/, KSharedPtr<List> arguments) Object::Ptr EventSignal::call(const TQString& /*name*/, TDESharedPtr<List> arguments)
{ {
#ifdef KROSS_API_EVENTSIGNAL_CALL_DEBUG #ifdef KROSS_API_EVENTSIGNAL_CALL_DEBUG
krossdebug( TQString("EventSignal::call() m_signal=%1 arguments=%2").arg(m_signal).arg(arguments->toString()) ); krossdebug( TQString("EventSignal::call() m_signal=%1 arguments=%2").arg(m_signal).arg(arguments->toString()) );

4
lib/kross/api/eventsignal.h
Unescape View File

@ -45,7 +45,7 @@ namespace Kross { namespace Api {
/** /**
* Shared pointer to implement reference-counting. * Shared pointer to implement reference-counting.
*/ */
typedef KSharedPtr<EventSignal> Ptr; typedef TDESharedPtr<EventSignal> Ptr;
/** /**
* Constructor. * Constructor.
@ -59,7 +59,7 @@ namespace Kross { namespace Api {
virtual const TQString getClassName() const; virtual const TQString getClassName() const;
virtual Object::Ptr call(const TQString& name, KSharedPtr<List> arguments); virtual Object::Ptr call(const TQString& name, TDESharedPtr<List> arguments);
/* /*
signals: signals:

4
lib/kross/api/eventslot.h
Unescape View File

@ -40,7 +40,7 @@ namespace Kross { namespace Api {
/** /**
* Shared pointer to implement reference-counting. * Shared pointer to implement reference-counting.
*/ */
typedef KSharedPtr<EventSlot> Ptr; typedef TDESharedPtr<EventSlot> Ptr;
/** /**
* Constructor. * Constructor.
@ -63,7 +63,7 @@ namespace Kross { namespace Api {
virtual const TQString getClassName() const; virtual const TQString getClassName() const;
/// \see Kross::Api::Event::call() /// \see Kross::Api::Event::call()
virtual Object::Ptr call(const TQString& name, KSharedPtr<List> arguments); virtual Object::Ptr call(const TQString& name, TDESharedPtr<List> arguments);
/* /*
private: private:

2
lib/kross/api/exception.h
Unescape View File

@ -42,7 +42,7 @@ namespace Kross { namespace Api {
/** /**
* Shared pointer to implement reference-counting. * Shared pointer to implement reference-counting.
*/ */
typedef KSharedPtr<Exception> Ptr; typedef TDESharedPtr<Exception> Ptr;
/** /**
* Constructor. * Constructor.

2
lib/kross/api/list.h
Unescape View File

@ -41,7 +41,7 @@ namespace Kross { namespace Api {
/** /**
* Shared pointer to implement reference-counting. * Shared pointer to implement reference-counting.
*/ */
typedef KSharedPtr<List> Ptr; typedef TDESharedPtr<List> Ptr;
/* /*
operator TQStringList () { operator TQStringList () {

2
lib/kross/api/module.h
Unescape View File

@ -38,7 +38,7 @@ namespace Kross { namespace Api {
/** /**
* Shared pointer to implement reference-counting. * Shared pointer to implement reference-counting.
*/ */
typedef KSharedPtr<Module> Ptr; typedef TDESharedPtr<Module> Ptr;
/** /**
* Constructor. * Constructor.

8
lib/kross/api/object.cpp
Unescape View File

@ -27,19 +27,19 @@
using namespace Kross::Api; using namespace Kross::Api;
Object::Object() Object::Object()
: KShared() : TDEShared()
{ {
#ifdef KROSS_API_OBJECT_CTOR_DEBUG #ifdef KROSS_API_OBJECT_CTOR_DEBUG
krossdebug( TQString("Kross::Api::Object::Constructor() name='%1' refcount='%2'").arg(m_name).arg(_KShared_count()) ); krossdebug( TQString("Kross::Api::Object::Constructor() name='%1' refcount='%2'").arg(m_name).arg(_TDEShared_count()) );
#endif #endif
} }
Object::~Object() Object::~Object()
{ {
#ifdef KROSS_API_OBJECT_DTOR_DEBUG #ifdef KROSS_API_OBJECT_DTOR_DEBUG
krossdebug( TQString("Kross::Api::Object::Destructor() name='%1' refcount='%2'").arg(m_name).arg(_KShared_count()) ); krossdebug( TQString("Kross::Api::Object::Destructor() name='%1' refcount='%2'").arg(m_name).arg(_TDEShared_count()) );
#endif #endif
//removeAllChildren(); // not needed cause we use KShared to handle ref-couting and freeing. //removeAllChildren(); // not needed cause we use TDEShared to handle ref-couting and freeing.
} }
const TQString Object::toString() const TQString Object::toString()

8
lib/kross/api/object.h
Unescape View File

@ -47,14 +47,14 @@ namespace Kross { namespace Api {
* This class implementates reference counting for shared * This class implementates reference counting for shared
* objects. So, no need to take care of freeing objects. * objects. So, no need to take care of freeing objects.
*/ */
class Object : public KShared class Object : public TDEShared
{ {
public: public:
/** /**
* Shared pointer to implement reference-counting. * Shared pointer to implement reference-counting.
*/ */
typedef KSharedPtr<Object> Ptr; typedef TDESharedPtr<Object> Ptr;
/** /**
* Constructor. * Constructor.
@ -99,7 +99,7 @@ namespace Kross { namespace Api {
* \return The call-result as \a Object::Ptr instance or * \return The call-result as \a Object::Ptr instance or
* NULL if the call has no result. * NULL if the call has no result.
*/ */
virtual Object::Ptr call(const TQString& name, KSharedPtr<List> arguments); virtual Object::Ptr call(const TQString& name, TDESharedPtr<List> arguments);
/** /**
* Return a list of supported callable objects. * Return a list of supported callable objects.
@ -142,7 +142,7 @@ template<class T> inline T* Object::fromObject(Object::Ptr object)
{ {
T* t = (T*) object.data(); T* t = (T*) object.data();
if(! t) if(! t)
throw KSharedPtr<Exception>( new Exception(TQString("Object \"%1\" invalid.").arg(object ? object->getClassName() : "")) ); throw TDESharedPtr<Exception>( new Exception(TQString("Object \"%1\" invalid.").arg(object ? object->getClassName() : "")) );
return t; return t;
} }

20
lib/kross/api/proxy.h
Unescape View File

@ -111,13 +111,13 @@ namespace Kross { namespace Api {
const METHOD m_method; const METHOD m_method;
/// First default argument. /// First default argument.
KSharedPtr<ARG1OBJ> m_defarg1; TDESharedPtr<ARG1OBJ> m_defarg1;
/// Second default argument. /// Second default argument.
KSharedPtr<ARG2OBJ> m_defarg2; TDESharedPtr<ARG2OBJ> m_defarg2;
/// Theird default argument. /// Theird default argument.
KSharedPtr<ARG3OBJ> m_defarg3; TDESharedPtr<ARG3OBJ> m_defarg3;
/// Forth default argument. /// Forth default argument.
KSharedPtr<ARG4OBJ> m_defarg4; TDESharedPtr<ARG4OBJ> m_defarg4;
/** /**
* \internal used struct that does the execution of the wrapped * \internal used struct that does the execution of the wrapped
@ -187,9 +187,9 @@ namespace Kross { namespace Api {
private: private:
INSTANCE* m_instance; INSTANCE* m_instance;
const METHOD m_method; const METHOD m_method;
KSharedPtr<ARG1OBJ> m_defarg1; TDESharedPtr<ARG1OBJ> m_defarg1;
KSharedPtr<ARG2OBJ> m_defarg2; TDESharedPtr<ARG2OBJ> m_defarg2;
KSharedPtr<ARG3OBJ> m_defarg3; TDESharedPtr<ARG3OBJ> m_defarg3;
template<class PROXYFUNC, typename RETURNTYPE> template<class PROXYFUNC, typename RETURNTYPE>
struct ProxyFunctionCaller { struct ProxyFunctionCaller {
@ -229,8 +229,8 @@ namespace Kross { namespace Api {
private: private:
INSTANCE* m_instance; INSTANCE* m_instance;
const METHOD m_method; const METHOD m_method;
KSharedPtr<ARG1OBJ> m_defarg1; TDESharedPtr<ARG1OBJ> m_defarg1;
KSharedPtr<ARG2OBJ> m_defarg2; TDESharedPtr<ARG2OBJ> m_defarg2;
template<class PROXYFUNC, typename RETURNTYPE> template<class PROXYFUNC, typename RETURNTYPE>
struct ProxyFunctionCaller { struct ProxyFunctionCaller {
@ -270,7 +270,7 @@ namespace Kross { namespace Api {
private: private:
INSTANCE* m_instance; INSTANCE* m_instance;
const METHOD m_method; const METHOD m_method;
KSharedPtr<ARG1OBJ> m_defarg1; TDESharedPtr<ARG1OBJ> m_defarg1;
template<class PROXYFUNC, typename RETURNTYPE> template<class PROXYFUNC, typename RETURNTYPE>
struct ProxyFunctionCaller { struct ProxyFunctionCaller {

2
lib/kross/api/qtobject.h
Unescape View File

@ -49,7 +49,7 @@ namespace Kross { namespace Api {
/** /**
* Shared pointer to implement reference-counting. * Shared pointer to implement reference-counting.
*/ */
typedef KSharedPtr<QtObject> Ptr; typedef TDESharedPtr<QtObject> Ptr;
/** /**
* Constructor. * Constructor.

2
lib/kross/api/value.h
Unescape View File

@ -72,7 +72,7 @@ namespace Kross { namespace Api {
/** /**
* Set the value. * Set the value.
* The value is call-by-value cause it may * The value is call-by-value cause it may
* contain some KShared and therefore * contain some TDEShared and therefore
* we need to keep a local copy to keep * we need to keep a local copy to keep
* it from disappearing. * it from disappearing.
* *

2
lib/kross/main/mainmodule.h
Unescape View File

@ -55,7 +55,7 @@ namespace Kross { namespace Api {
public: public:
/// Shared pointer to implement reference-counting. /// Shared pointer to implement reference-counting.
typedef KSharedPtr<MainModule> Ptr; typedef TDESharedPtr<MainModule> Ptr;
/** /**
* Constructor. * Constructor.

4
lib/kross/main/manager.cpp
Unescape View File

@ -60,7 +60,7 @@ namespace Kross { namespace Api {
* The Manager-singleton instance is NULL by default till the * The Manager-singleton instance is NULL by default till the
* Manager::scriptManager() method got called first time. * Manager::scriptManager() method got called first time.
*/ */
static KSharedPtr<Manager> m_manager = KSharedPtr<Manager>(0); static TDESharedPtr<Manager> m_manager = TDESharedPtr<Manager>(0);
}} }}
@ -68,7 +68,7 @@ Manager* Manager::scriptManager()
{ {
if(! m_manager.data()) { if(! m_manager.data()) {
// Create the Manager-singleton on demand. // Create the Manager-singleton on demand.
m_manager = KSharedPtr<Manager>( new Manager() ); m_manager = TDESharedPtr<Manager>( new Manager() );
} }
// and finally return the singleton. // and finally return the singleton.

2
lib/kross/main/manager.h
Unescape View File

@ -116,7 +116,7 @@ namespace Kross { namespace Api {
* \return The \a ScriptContainer instance matching to * \return The \a ScriptContainer instance matching to
* scriptname. * scriptname.
*/ */
KSharedPtr<ScriptContainer> getScriptContainer(const TQString& scriptname); TDESharedPtr<ScriptContainer> getScriptContainer(const TQString& scriptname);
/** /**
* Return the \a Interpreter instance defined by * Return the \a Interpreter instance defined by

2
lib/kross/main/scriptaction.h
Unescape View File

@ -58,7 +58,7 @@ namespace Kross { namespace Api {
public: public:
/// Shared pointer to implement reference-counting. /// Shared pointer to implement reference-counting.
typedef KSharedPtr<ScriptAction> Ptr; typedef TDESharedPtr<ScriptAction> Ptr;
/// A list of \a ScriptAction instances. /// A list of \a ScriptAction instances.
//typedef TQValueList<ScriptAction::Ptr> List; //typedef TQValueList<ScriptAction::Ptr> List;

6
lib/kross/main/scriptcontainer.h
Unescape View File

@ -72,7 +72,7 @@ namespace Kross { namespace Api {
public: public:
/// Shared pointer to implement reference-counting. /// Shared pointer to implement reference-counting.
typedef KSharedPtr<ScriptContainer> Ptr; typedef TDESharedPtr<ScriptContainer> Ptr;
/** /**
* Destructor. * Destructor.
@ -171,7 +171,7 @@ namespace Kross { namespace Api {
* \return \a Object instance representing * \return \a Object instance representing
* the functioncall returnvalue. * the functioncall returnvalue.
*/ */
KSharedPtr<Object> callFunction(const TQString& functionname, KSharedPtr<List> arguments = 0); TDESharedPtr<Object> callFunction(const TQString& functionname, TDESharedPtr<List> arguments = 0);
/** /**
* Return a list of classes. * Return a list of classes.
@ -181,7 +181,7 @@ namespace Kross { namespace Api {
/** /**
* Create and return a new class instance. * Create and return a new class instance.
*/ */
KSharedPtr<Object> classInstance(const TQString& classname); TDESharedPtr<Object> classInstance(const TQString& classname);
/** /**
* Initialize the \a Script instance. * Initialize the \a Script instance.

4
lib/kross/ruby/rubyextension.cpp
Unescape View File

@ -126,7 +126,7 @@ void RubyExtension::delete_object(void* object)
void RubyExtension::delete_exception(void* object) void RubyExtension::delete_exception(void* object)
{ {
Kross::Api::Exception* exc = static_cast<Kross::Api::Exception*>(object); Kross::Api::Exception* exc = static_cast<Kross::Api::Exception*>(object);
exc->_KShared_unref(); exc->_TDEShared_unref();
} }
@ -186,7 +186,7 @@ VALUE RubyExtension::convertFromException(Kross::Api::Exception::Ptr exc)
{ {
RubyExtensionPrivate::s_krossException = rb_define_class_under(RubyInterpreter::krossModule(), "KrossException", rb_eRuntimeError); RubyExtensionPrivate::s_krossException = rb_define_class_under(RubyInterpreter::krossModule(), "KrossException", rb_eRuntimeError);
} }
exc->_KShared_ref(); exc->_TDEShared_ref();
return Data_Wrap_Struct(RubyExtensionPrivate::s_krossException, 0, RubyExtension::delete_exception, exc.data() ); return Data_Wrap_Struct(RubyExtensionPrivate::s_krossException, 0, RubyExtension::delete_exception, exc.data() );
} }

Write Preview
Loading…
Cancel
Save