From f7055674768fa7f0267da4a14b9061e60ebab3fc Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 31 Jan 2013 00:15:51 -0600 Subject: [PATCH] Rename KShared --- chalk/chalkcolor/kis_channelinfo.h | 2 +- chalk/chalkcolor/kis_histogram_producer.h | 4 +- chalk/core/kis_alpha_mask.h | 2 +- chalk/core/kis_background.cc | 2 +- chalk/core/kis_background.h | 2 +- chalk/core/kis_convolution_painter.h | 4 +- chalk/core/kis_filter.h | 2 +- chalk/core/kis_histogram.h | 2 +- chalk/core/kis_image.cc | 4 +- chalk/core/kis_image.h | 2 +- chalk/core/kis_iterator.h | 6 +- chalk/core/kis_layer.cc | 4 +- chalk/core/kis_layer.h | 2 +- chalk/core/kis_merge_visitor.h | 4 +- chalk/core/kis_paint_device.cc | 6 +- chalk/core/kis_paint_device.h | 6 +- chalk/core/kis_paint_layer.h | 2 +- chalk/core/kis_paintop.h | 4 +- chalk/core/kis_perspective_grid.h | 4 +- chalk/core/kis_random_accessor.h | 2 +- chalk/core/kis_substrate.h | 4 +- chalk/core/kis_types.h | 30 ++-- chalk/core/tiles/kis_memento.cc | 2 +- chalk/core/tiles/kis_memento.h | 4 +- chalk/core/tiles/kis_tiled_random_accessor.h | 2 +- chalk/core/tiles/kis_tileddatamanager.cc | 2 +- chalk/core/tiles/kis_tileddatamanager.h | 10 +- chalk/core/tiles/kis_tilediterator.cc | 2 +- chalk/core/tiles/kis_tilediterator.h | 2 +- chalk/doc/colorspaces.xmi | 18 +- chalk/doc/controller.xmi | 44 ++--- chalk/doc/histograms.xmi | 2 +- .../substrate/kis_repeating_substrate.h | 4 +- chalk/sdk/kis_annotation.h | 4 +- chalk/sdk/kis_shared_ptr_vector.h | 10 +- chalk/ui/kis_opengl_image_context.h | 4 +- chalk/ui/kis_tool.h | 2 +- chalk/ui/kis_tool_factory.h | 2 +- chalk/ui/kis_tool_types.h | 4 +- kexi/core/kexi.cpp | 4 +- kexi/core/kexiactioncategories.h | 2 +- kexi/formeditor/scripting/formscript.h | 2 +- kexi/kexidb/preparedstatement.cpp | 2 +- kexi/kexidb/preparedstatement.h | 4 +- .../macros/kexiactions/datatableaction.cpp | 24 +-- .../macros/kexiactions/datatableaction.h | 4 +- .../macros/kexiactions/executeaction.cpp | 14 +- .../macros/kexiactions/executeaction.h | 4 +- .../macros/kexiactions/messageaction.cpp | 4 +- .../macros/kexiactions/messageaction.h | 2 +- .../macros/kexiactions/navigateaction.cpp | 18 +- .../macros/kexiactions/navigateaction.h | 4 +- .../macros/kexiactions/objectnamevariable.h | 2 +- .../macros/kexiactions/objectvariable.h | 2 +- .../plugins/macros/kexiactions/openaction.cpp | 18 +- kexi/plugins/macros/kexiactions/openaction.h | 4 +- .../macros/kexipart/keximacrodesignview.cpp | 26 +-- .../macros/kexipart/keximacrodesignview.h | 4 +- .../macros/kexipart/keximacroerror.cpp | 8 +- kexi/plugins/macros/kexipart/keximacroerror.h | 2 +- .../plugins/macros/kexipart/keximacropart.cpp | 2 +- .../macros/kexipart/keximacroproperty.cpp | 42 ++--- .../macros/kexipart/keximacroproperty.h | 8 +- .../plugins/macros/kexipart/keximacroview.cpp | 6 +- kexi/plugins/macros/kexipart/keximacroview.h | 2 +- kexi/plugins/macros/lib/action.cpp | 12 +- kexi/plugins/macros/lib/action.h | 12 +- kexi/plugins/macros/lib/context.cpp | 38 ++--- kexi/plugins/macros/lib/context.h | 16 +- kexi/plugins/macros/lib/macro.cpp | 16 +- kexi/plugins/macros/lib/macro.h | 10 +- kexi/plugins/macros/lib/macroitem.cpp | 24 +-- kexi/plugins/macros/lib/macroitem.h | 14 +- kexi/plugins/macros/lib/manager.cpp | 16 +- kexi/plugins/macros/lib/manager.h | 16 +- kexi/plugins/macros/lib/metamethod.cpp | 20 +-- kexi/plugins/macros/lib/metamethod.h | 16 +- kexi/plugins/macros/lib/metaobject.cpp | 12 +- kexi/plugins/macros/lib/metaobject.h | 12 +- kexi/plugins/macros/lib/metaparameter.cpp | 4 +- kexi/plugins/macros/lib/metaparameter.h | 6 +- kexi/plugins/macros/lib/variable.cpp | 2 +- kexi/plugins/macros/lib/variable.h | 8 +- kexi/plugins/macros/lib/xmlhandler.cpp | 18 +- kexi/plugins/macros/tests/actiontests.cpp | 18 +- kexi/plugins/macros/tests/commontests.cpp | 80 ++++----- kexi/plugins/macros/tests/macroitemtests.cpp | 24 +-- kexi/plugins/macros/tests/macrotests.cpp | 12 +- kexi/plugins/macros/tests/testaction.cpp | 6 +- kexi/plugins/macros/tests/testaction.h | 4 +- kexi/plugins/macros/tests/variabletests.cpp | 24 +-- kexi/plugins/macros/tests/xmlhandlertests.cpp | 42 ++--- kexi/plugins/macros/tests/xmlhandlertests.h | 4 +- .../plugins/macros/tests/xmlhandlertests2.cpp | 154 +++++++++--------- kexi/plugins/macros/tests/xmlhandlertests2.h | 14 +- .../scripting/kexidb/kexidbconnection.h | 4 +- kpresenter/KPrBgSpellCheck.cpp | 2 +- kpresenter/KPrView.cpp | 2 +- kword/KWBgSpellCheck.cpp | 2 +- kword/KWView.cpp | 2 +- lib/kofficecore/KoFilterChain.h | 4 +- lib/kofficecore/KoMainWindow.cpp | 2 +- lib/kofficecore/KoQueryTrader.h | 4 +- lib/kofficecore/KoSpeaker.h | 2 +- lib/kross/api/callable.h | 2 +- lib/kross/api/class.h | 2 +- lib/kross/api/eventaction.h | 4 +- lib/kross/api/eventscript.cpp | 2 +- lib/kross/api/eventscript.h | 4 +- lib/kross/api/eventsignal.cpp | 2 +- lib/kross/api/eventsignal.h | 4 +- lib/kross/api/eventslot.h | 4 +- lib/kross/api/exception.h | 2 +- lib/kross/api/list.h | 2 +- lib/kross/api/module.h | 2 +- lib/kross/api/object.cpp | 8 +- lib/kross/api/object.h | 8 +- lib/kross/api/proxy.h | 20 +-- lib/kross/api/qtobject.h | 2 +- lib/kross/api/value.h | 2 +- lib/kross/main/mainmodule.h | 2 +- lib/kross/main/manager.cpp | 4 +- lib/kross/main/manager.h | 2 +- lib/kross/main/scriptaction.h | 2 +- lib/kross/main/scriptcontainer.h | 6 +- lib/kross/ruby/rubyextension.cpp | 4 +- 126 files changed, 600 insertions(+), 600 deletions(-) diff --git a/chalk/chalkcolor/kis_channelinfo.h b/chalk/chalkcolor/kis_channelinfo.h index f8ec8301..70cbd37a 100644 --- a/chalk/chalkcolor/kis_channelinfo.h +++ b/chalk/chalkcolor/kis_channelinfo.h @@ -27,7 +27,7 @@ * that is, one of the components that makes up a particular * pixel. */ -class KisChannelInfo : public KShared { +class KisChannelInfo : public TDEShared { public: enum enumChannelType { COLOR, // The channel represents a color diff --git a/chalk/chalkcolor/kis_histogram_producer.h b/chalk/chalkcolor/kis_histogram_producer.h index 2d25b354..0849f4ab 100644 --- a/chalk/chalkcolor/kis_histogram_producer.h +++ b/chalk/chalkcolor/kis_histogram_producer.h @@ -47,7 +47,7 @@ class KisChannelInfo; * in which they are found in the channels() method. This is potentially different from * the order in which they are internally ordered! **/ -class KisHistogramProducer : public KShared { +class KisHistogramProducer : public TDEShared { public: KisHistogramProducer() : m_skipTransparent(true), m_skipUnselected(true) {} virtual ~KisHistogramProducer() {} @@ -93,7 +93,7 @@ protected: bool m_skipUnselected; }; -typedef KSharedPtr KisHistogramProducerSP; +typedef TDESharedPtr KisHistogramProducerSP; class KisHistogramProducerFactory { public: diff --git a/chalk/core/kis_alpha_mask.h b/chalk/core/kis_alpha_mask.h index c19cae59..08c86e23 100644 --- a/chalk/core/kis_alpha_mask.h +++ b/chalk/core/kis_alpha_mask.h @@ -31,7 +31,7 @@ * in brush creation. It is not a generic alpha mask that can be used with * KisPaintDevices: use a KisSelection for that. */ -class KisAlphaMask : public KShared { +class KisAlphaMask : public TDEShared { public: /** diff --git a/chalk/core/kis_background.cc b/chalk/core/kis_background.cc index 6f881d33..506d49e8 100644 --- a/chalk/core/kis_background.cc +++ b/chalk/core/kis_background.cc @@ -20,7 +20,7 @@ #include "kis_integer_maths.h" KisBackground::KisBackground() - : KShared() + : TDEShared() { m_patternTile = TQImage(PATTERN_WIDTH, PATTERN_HEIGHT, 32); m_patternTile.setAlphaBuffer(false); diff --git a/chalk/core/kis_background.h b/chalk/core/kis_background.h index f5b52903..f11645c2 100644 --- a/chalk/core/kis_background.h +++ b/chalk/core/kis_background.h @@ -22,7 +22,7 @@ #include -class KisBackground : public KShared { +class KisBackground : public TDEShared { public: KisBackground(); diff --git a/chalk/core/kis_convolution_painter.h b/chalk/core/kis_convolution_painter.h index 8c0b2bba..624a58f7 100644 --- a/chalk/core/kis_convolution_painter.h +++ b/chalk/core/kis_convolution_painter.h @@ -35,9 +35,9 @@ enum KisConvolutionBorderOp { }; class KisKernel; -typedef KSharedPtr KisKernelSP; +typedef TDESharedPtr KisKernelSP; -class KisKernel : public KShared +class KisKernel : public TDEShared { public: diff --git a/chalk/core/kis_filter.h b/chalk/core/kis_filter.h index 32350fff..534b4c69 100644 --- a/chalk/core/kis_filter.h +++ b/chalk/core/kis_filter.h @@ -43,7 +43,7 @@ class TQWidget; /** * Basic interface of a Chalk filter. */ -class KRITACORE_EXPORT KisFilter : public KisProgressSubject, public KShared { +class KRITACORE_EXPORT KisFilter : public KisProgressSubject, public TDEShared { Q_OBJECT public: diff --git a/chalk/core/kis_histogram.h b/chalk/core/kis_histogram.h index 3d315994..a94ac557 100644 --- a/chalk/core/kis_histogram.h +++ b/chalk/core/kis_histogram.h @@ -40,7 +40,7 @@ enum enumHistogramType { * The calculations are done in the range 0 - 1, instead of the native range that a pixel * might have, so it's not always as precise as it could be. But you can't have it all... */ -class KisHistogram : public KShared { +class KisHistogram : public TDEShared { public: /** diff --git a/chalk/core/kis_image.cc b/chalk/core/kis_image.cc index a872b3ee..c6af64b6 100644 --- a/chalk/core/kis_image.cc +++ b/chalk/core/kis_image.cc @@ -517,14 +517,14 @@ namespace { } KisImage::KisImage(KisUndoAdapter *adapter, TQ_INT32 width, TQ_INT32 height, KisColorSpace * colorSpace, const TQString& name) - : TQObject(0, name.latin1()), KShared() + : TQObject(0, name.latin1()), TDEShared() { init(adapter, width, height, colorSpace, name); setName(name); m_dcop = 0L; } -KisImage::KisImage(const KisImage& rhs) : TQObject(), KShared(rhs) +KisImage::KisImage(const KisImage& rhs) : TQObject(), TDEShared(rhs) { m_dcop = 0L; if (this != &rhs) { diff --git a/chalk/core/kis_image.h b/chalk/core/kis_image.h index b3cc4e5a..553806ae 100644 --- a/chalk/core/kis_image.h +++ b/chalk/core/kis_image.h @@ -58,7 +58,7 @@ class KisProgressDisplayInterface; class KisPaintLayer; class KisPerspectiveGrid; -class KRITACORE_EXPORT KisImage : public TQObject, public KShared { +class KRITACORE_EXPORT KisImage : public TQObject, public TDEShared { Q_OBJECT diff --git a/chalk/core/kis_iterator.h b/chalk/core/kis_iterator.h index 893461a5..e74816dd 100644 --- a/chalk/core/kis_iterator.h +++ b/chalk/core/kis_iterator.h @@ -23,13 +23,13 @@ #include class KisTiledRectIterator; -typedef KSharedPtr KisTiledRectIteratorSP; +typedef TDESharedPtr KisTiledRectIteratorSP; class KisTiledVLineIterator; -typedef KSharedPtr KisTiledVLineIteratorSP; +typedef TDESharedPtr KisTiledVLineIteratorSP; class KisTiledHLineIterator; -typedef KSharedPtr KisTiledHLineIteratorSP; +typedef TDESharedPtr KisTiledHLineIteratorSP; class KisDataManager; diff --git a/chalk/core/kis_layer.cc b/chalk/core/kis_layer.cc index 2b7307e5..f43570f0 100644 --- a/chalk/core/kis_layer.cc +++ b/chalk/core/kis_layer.cc @@ -268,7 +268,7 @@ static int getID() KisLayer::KisLayer(KisImage *img, const TQString &name, TQ_UINT8 opacity) : TQObject(0, name.latin1()), - KShared(), + TDEShared(), m_id(getID()), m_index(-1), m_opacity(opacity), @@ -284,7 +284,7 @@ KisLayer::KisLayer(KisImage *img, const TQString &name, TQ_UINT8 opacity) : KisLayer::KisLayer(const KisLayer& rhs) : TQObject(), - KShared(rhs) + TDEShared(rhs) { if (this != &rhs) { m_id = getID(); diff --git a/chalk/core/kis_layer.h b/chalk/core/kis_layer.h index eee2da12..6f99ae68 100644 --- a/chalk/core/kis_layer.h +++ b/chalk/core/kis_layer.h @@ -38,7 +38,7 @@ class KisGroupLayer; * is at the top of the group in the layerlist, using next will iterate to the bottom to last, * whereas previous will go up to first again. **/ -class KRITACORE_EXPORT KisLayer : public TQObject, public KShared +class KRITACORE_EXPORT KisLayer : public TQObject, public TDEShared { Q_OBJECT diff --git a/chalk/core/kis_merge_visitor.h b/chalk/core/kis_merge_visitor.h index afd8fb37..c682cedc 100644 --- a/chalk/core/kis_merge_visitor.h +++ b/chalk/core/kis_merge_visitor.h @@ -57,8 +57,8 @@ public: private: // Helper for the indirect painting (keep above to inhibit gcc-2.95 ICE) template - KSharedPtr paintIndirect(KisPaintDeviceSP source, - KSharedPtr target, + TDESharedPtr paintIndirect(KisPaintDeviceSP source, + TDESharedPtr target, KisLayerSupportsIndirectPainting* layer, TQ_INT32 sx, TQ_INT32 sy, TQ_INT32 dx, TQ_INT32 dy, TQ_INT32 w, TQ_INT32 h) { diff --git a/chalk/core/kis_paint_device.cc b/chalk/core/kis_paint_device.cc index c9734819..654caedd 100644 --- a/chalk/core/kis_paint_device.cc +++ b/chalk/core/kis_paint_device.cc @@ -202,7 +202,7 @@ namespace { } KisPaintDevice::KisPaintDevice(KisColorSpace * colorSpace, const char * name) : - TQObject(0, name), KShared(), m_exifInfo(0), m_lock( false ) + TQObject(0, name), TDEShared(), m_exifInfo(0), m_lock( false ) { if (colorSpace == 0) { kdWarning(41001) << "Cannot create paint device without colorstrategy!\n"; @@ -237,7 +237,7 @@ KisPaintDevice::KisPaintDevice(KisColorSpace * colorSpace, const char * name) : } KisPaintDevice::KisPaintDevice(KisLayer *parent, KisColorSpace * colorSpace, const char * name) : - TQObject(0, name), KShared(), m_exifInfo(0), m_lock( false ) + TQObject(0, name), TDEShared(), m_exifInfo(0), m_lock( false ) { m_longRunningFilterTimer = 0; @@ -284,7 +284,7 @@ KisPaintDevice::KisPaintDevice(KisLayer *parent, KisColorSpace * colorSpace, con } -KisPaintDevice::KisPaintDevice(const KisPaintDevice& rhs) : TQObject(), KShared(rhs) +KisPaintDevice::KisPaintDevice(const KisPaintDevice& rhs) : TQObject(), TDEShared(rhs) { if (this != &rhs) { m_longRunningFilterTimer = 0; diff --git a/chalk/core/kis_paint_device.h b/chalk/core/kis_paint_device.h index 4fe9c8d5..23ce651f 100644 --- a/chalk/core/kis_paint_device.h +++ b/chalk/core/kis_paint_device.h @@ -57,10 +57,10 @@ class KisRandomSubAccessorPixel; class KisUndoAdapter; class KisFilter; class KisDataManager; -typedef KSharedPtr KisDataManagerSP; +typedef TDESharedPtr KisDataManagerSP; class KisMemento; -typedef KSharedPtr KisMementoSP; +typedef TDESharedPtr KisMementoSP; /** @@ -72,7 +72,7 @@ typedef KSharedPtr KisMementoSP; */ class KRITACORE_EXPORT KisPaintDevice : public TQObject - , public KShared + , public TDEShared { Q_OBJECT diff --git a/chalk/core/kis_paint_layer.h b/chalk/core/kis_paint_layer.h index af8b1e4c..5f2ba06d 100644 --- a/chalk/core/kis_paint_layer.h +++ b/chalk/core/kis_paint_layer.h @@ -151,7 +151,7 @@ private: bool m_editMask; }; -typedef KSharedPtr KisPaintLayerSP; +typedef TDESharedPtr KisPaintLayerSP; #endif // KIS_PAINT_LAYER_H_ diff --git a/chalk/core/kis_paintop.h b/chalk/core/kis_paintop.h index 668856f7..7fad40ba 100644 --- a/chalk/core/kis_paintop.h +++ b/chalk/core/kis_paintop.h @@ -59,7 +59,7 @@ public: KisVector2D movement; }; -class KRITACORE_EXPORT KisPaintOp : public KShared +class KRITACORE_EXPORT KisPaintOp : public TDEShared { public: @@ -108,7 +108,7 @@ public: * If there is an optionWidget, the derived paintop itself must support settings, * and it's up to the factory to do that. */ -class KisPaintOpFactory : public KShared +class KisPaintOpFactory : public TDEShared { public: diff --git a/chalk/core/kis_perspective_grid.h b/chalk/core/kis_perspective_grid.h index 81ec2966..0b8ca99d 100644 --- a/chalk/core/kis_perspective_grid.h +++ b/chalk/core/kis_perspective_grid.h @@ -27,12 +27,12 @@ #include #include -class KisPerspectiveGridNode : public KisPoint, public KShared { +class KisPerspectiveGridNode : public KisPoint, public TDEShared { public: inline KisPerspectiveGridNode(double x, double y) : KisPoint(x,y) { } inline KisPerspectiveGridNode(KisPoint p) : KisPoint(p) { } }; -typedef KSharedPtr KisPerspectiveGridNodeSP; +typedef TDESharedPtr KisPerspectiveGridNodeSP; class KisSubPerspectiveGrid { public: diff --git a/chalk/core/kis_random_accessor.h b/chalk/core/kis_random_accessor.h index 62d90e04..0ec2626e 100644 --- a/chalk/core/kis_random_accessor.h +++ b/chalk/core/kis_random_accessor.h @@ -25,7 +25,7 @@ #include class KisTiledRandomAccessor; -typedef KSharedPtr KisTiledRandomAccessorSP; +typedef TDESharedPtr KisTiledRandomAccessorSP; class KisTiledDataManager; diff --git a/chalk/core/kis_substrate.h b/chalk/core/kis_substrate.h index 274f2680..569ed218 100644 --- a/chalk/core/kis_substrate.h +++ b/chalk/core/kis_substrate.h @@ -44,11 +44,11 @@ struct KisSubstratePixel { * or full-size, with specific and cool ways of generating the surface, or * maybe based on scans of real substrates. */ -class KisSubstrate : public KShared { +class KisSubstrate : public TDEShared { public: - KisSubstrate(KisImage * /*img*/) : KShared() {}; + KisSubstrate(KisImage * /*img*/) : TDEShared() {}; virtual ~KisSubstrate() {}; diff --git a/chalk/core/kis_types.h b/chalk/core/kis_types.h index b789fdd4..fbfb757f 100644 --- a/chalk/core/kis_types.h +++ b/chalk/core/kis_types.h @@ -35,56 +35,56 @@ */ class KisImage; -typedef KSharedPtr KisImageSP; +typedef TDESharedPtr KisImageSP; class KisPaintDevice; -typedef KSharedPtr KisPaintDeviceSP; +typedef TDESharedPtr KisPaintDeviceSP; typedef KisSharedPtrVector vKisPaintDeviceSP; typedef vKisPaintDeviceSP::iterator vKisPaintDeviceSP_it; typedef vKisPaintDeviceSP::const_iterator vKisPaintDeviceSP_cit; class KisLayer; -typedef KSharedPtr KisLayerSP; +typedef TDESharedPtr KisLayerSP; typedef KisSharedPtrVector vKisLayerSP; typedef vKisLayerSP::iterator vKisLayerSP_it; typedef vKisLayerSP::const_iterator vKisLayerSP_cit; class KisPartLayer; -typedef KSharedPtr KisPartLayerSP; +typedef TDESharedPtr KisPartLayerSP; class KisPaintLayer; -typedef KSharedPtr KisPaintLayerSP; +typedef TDESharedPtr KisPaintLayerSP; class KisAdjustmentLayer; -typedef KSharedPtr KisAdjustmentLayerSP; +typedef TDESharedPtr KisAdjustmentLayerSP; class KisGroupLayer; -typedef KSharedPtr KisGroupLayerSP; +typedef TDESharedPtr KisGroupLayerSP; class KisSelection; -typedef KSharedPtr KisSelectionSP; +typedef TDESharedPtr KisSelectionSP; class KisBackground; -typedef KSharedPtr KisBackgroundSP; +typedef TDESharedPtr KisBackgroundSP; class KisSubstrate; -typedef KSharedPtr KisSubstrateSP; +typedef TDESharedPtr KisSubstrateSP; class KisHistogram; -typedef KSharedPtr KisHistogramSP; +typedef TDESharedPtr KisHistogramSP; class KisPaintOpFactory; -typedef KSharedPtr KisPaintOpFactorySP; +typedef TDESharedPtr KisPaintOpFactorySP; typedef TQValueVector vKisSegments; //class KisGuide; -//typedef KSharedPtr KisGuideSP; +//typedef TDESharedPtr KisGuideSP; class KisAlphaMask; -typedef KSharedPtr KisAlphaMaskSP; +typedef TDESharedPtr KisAlphaMaskSP; class KisFilter; -typedef KSharedPtr KisFilterSP; +typedef TDESharedPtr KisFilterSP; #endif // KISTYPES_H_ diff --git a/chalk/core/tiles/kis_memento.cc b/chalk/core/tiles/kis_memento.cc index c67a0476..1181f70a 100644 --- a/chalk/core/tiles/kis_memento.cc +++ b/chalk/core/tiles/kis_memento.cc @@ -20,7 +20,7 @@ #include "kis_tile.h" #include "kis_tile_global.h" -KisMemento::KisMemento(TQ_UINT32 pixelSize) : KShared() +KisMemento::KisMemento(TQ_UINT32 pixelSize) : TDEShared() { m_hashTable = new KisTile * [1024]; TQ_CHECK_PTR(m_hashTable); diff --git a/chalk/core/tiles/kis_memento.h b/chalk/core/tiles/kis_memento.h index 3213a490..75739853 100644 --- a/chalk/core/tiles/kis_memento.h +++ b/chalk/core/tiles/kis_memento.h @@ -28,9 +28,9 @@ class KisTile; class KisTiledDataManager; class KisMemento; -typedef KSharedPtr KisMementoSP; +typedef TDESharedPtr KisMementoSP; -class KisMemento : public KShared +class KisMemento : public TDEShared { public: KisMemento(TQ_UINT32 pixelSize); diff --git a/chalk/core/tiles/kis_tiled_random_accessor.h b/chalk/core/tiles/kis_tiled_random_accessor.h index 23768ee6..207f4313 100644 --- a/chalk/core/tiles/kis_tiled_random_accessor.h +++ b/chalk/core/tiles/kis_tiled_random_accessor.h @@ -27,7 +27,7 @@ class KisTile; -class KisTiledRandomAccessor : public KShared { +class KisTiledRandomAccessor : public TDEShared { struct KisTileInfo { KisTile* tile; KisTile* oldtile; diff --git a/chalk/core/tiles/kis_tileddatamanager.cc b/chalk/core/tiles/kis_tileddatamanager.cc index 6d99dc93..4586903c 100644 --- a/chalk/core/tiles/kis_tileddatamanager.cc +++ b/chalk/core/tiles/kis_tileddatamanager.cc @@ -61,7 +61,7 @@ KisTiledDataManager::KisTiledDataManager(TQ_UINT32 pixelSize, const TQ_UINT8 *de } KisTiledDataManager::KisTiledDataManager(const KisTiledDataManager & dm) - : KShared() + : TDEShared() { m_pixelSize = dm.m_pixelSize; diff --git a/chalk/core/tiles/kis_tileddatamanager.h b/chalk/core/tiles/kis_tileddatamanager.h index 20d78085..539a9ae1 100644 --- a/chalk/core/tiles/kis_tileddatamanager.h +++ b/chalk/core/tiles/kis_tileddatamanager.h @@ -28,16 +28,16 @@ #include "kis_memento.h" class KisTiledDataManager; -typedef KSharedPtr KisTiledDataManagerSP; +typedef TDESharedPtr KisTiledDataManagerSP; class KisDataManager; -typedef KSharedPtr KisDataManagerSP; +typedef TDESharedPtr KisDataManagerSP; class KisTiledIterator; class KisTiledRandomAccessor; class KoStore; -class KisTileDataWrapper : public KShared { +class KisTileDataWrapper : public TDEShared { KisTile* m_tile; TQ_INT32 m_offset; public: @@ -46,7 +46,7 @@ public: TQ_UINT8* data() const { return m_tile->data() + m_offset; } }; -typedef KSharedPtr KisTileDataWrapperSP; +typedef TDESharedPtr KisTileDataWrapperSP; /** * KisTiledDataManager implements the interface that KisDataManager defines @@ -64,7 +64,7 @@ typedef KSharedPtr KisTileDataWrapperSP; * how many TQ_UINT8's a single pixel takes. */ -class KisTiledDataManager : public KShared { +class KisTiledDataManager : public TDEShared { protected: KisTiledDataManager(TQ_UINT32 pixelSize, const TQ_UINT8 *defPixel); diff --git a/chalk/core/tiles/kis_tilediterator.cc b/chalk/core/tiles/kis_tilediterator.cc index d6205f5a..0f3bdf00 100644 --- a/chalk/core/tiles/kis_tilediterator.cc +++ b/chalk/core/tiles/kis_tilediterator.cc @@ -44,7 +44,7 @@ KisTiledIterator::~KisTiledIterator( ) } KisTiledIterator::KisTiledIterator(const KisTiledIterator& rhs) - : KShared() + : TDEShared() { if (this != &rhs) { m_ktm = rhs.m_ktm; diff --git a/chalk/core/tiles/kis_tilediterator.h b/chalk/core/tiles/kis_tilediterator.h index 958876cd..6bb63c9b 100644 --- a/chalk/core/tiles/kis_tilediterator.h +++ b/chalk/core/tiles/kis_tilediterator.h @@ -28,7 +28,7 @@ /** * The KisIterator class iterates through the pixels of a KisPaintDevice hiding the tile structure */ -class KRITACORE_EXPORT KisTiledIterator : public KShared { +class KRITACORE_EXPORT KisTiledIterator : public TDEShared { protected: KisTiledDataManager *m_ktm; diff --git a/chalk/doc/colorspaces.xmi b/chalk/doc/colorspaces.xmi index 51523e7a..c103b208 100644 --- a/chalk/doc/colorspaces.xmi +++ b/chalk/doc/colorspaces.xmi @@ -492,7 +492,7 @@ model together." isSpecification="false" isLeaf="false" visibility="protected" x - + @@ -6044,7 +6044,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -6061,12 +6061,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
- +
@@ -6512,7 +6512,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
@@ -6526,7 +6526,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -6545,7 +6545,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -26627,7 +26627,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
- +
@@ -26651,7 +26651,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" - +
diff --git a/chalk/doc/controller.xmi b/chalk/doc/controller.xmi index c2af5136..7c15e5f8 100644 --- a/chalk/doc/controller.xmi +++ b/chalk/doc/controller.xmi @@ -2055,7 +2055,7 @@ That last bit has not been solved yet. - + @@ -7942,7 +7942,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -7959,12 +7959,12 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
- +
@@ -9436,7 +9436,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -9453,12 +9453,12 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
- +
@@ -13261,7 +13261,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -13278,12 +13278,12 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
- +
@@ -14235,7 +14235,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -14252,12 +14252,12 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
- +
@@ -15099,7 +15099,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -15116,12 +15116,12 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
- +
@@ -17605,7 +17605,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -17622,12 +17622,12 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
- +
@@ -17678,7 +17678,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f - +
@@ -17692,7 +17692,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
@@ -17711,7 +17711,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
- +
diff --git a/chalk/doc/histograms.xmi b/chalk/doc/histograms.xmi index 8b767b23..fb6bc511 100644 --- a/chalk/doc/histograms.xmi +++ b/chalk/doc/histograms.xmi @@ -259,7 +259,7 @@ The producer may only read the iterator, it may safely be constructed with write - + diff --git a/chalk/plugins/viewplugins/substrate/kis_repeating_substrate.h b/chalk/plugins/viewplugins/substrate/kis_repeating_substrate.h index 1a229dc1..0aac3fc8 100644 --- a/chalk/plugins/viewplugins/substrate/kis_repeating_substrate.h +++ b/chalk/plugins/viewplugins/substrate/kis_repeating_substrate.h @@ -43,11 +43,11 @@ struct KisSubstratePixel { * or full-size, with specific and cool ways of generating the surface, or * maybe based on scans of real substrates. */ -class KisSubstrate : public KShared { +class KisSubstrate : public TDEShared { public: - KisSubstrate(KisImage * /*img*/) : KShared() {}; + KisSubstrate(KisImage * /*img*/) : TDEShared() {}; virtual ~KisSubstrate() {}; diff --git a/chalk/sdk/kis_annotation.h b/chalk/sdk/kis_annotation.h index 0753af8f..2ba814d1 100644 --- a/chalk/sdk/kis_annotation.h +++ b/chalk/sdk/kis_annotation.h @@ -40,7 +40,7 @@ * * Examples of annotations are EXIF data and ICC profiles. */ -class KisAnnotation : public KShared { +class KisAnnotation : public TDEShared { public: @@ -81,7 +81,7 @@ private: }; -typedef KSharedPtr KisAnnotationSP; +typedef TDESharedPtr KisAnnotationSP; typedef KisSharedPtrVector vKisAnnotationSP; typedef vKisAnnotationSP::iterator vKisAnnotationSP_it; typedef vKisAnnotationSP::const_iterator vKisAnnotationSP_cit; diff --git a/chalk/sdk/kis_shared_ptr_vector.h b/chalk/sdk/kis_shared_ptr_vector.h index ee7961ae..0e7c99e8 100644 --- a/chalk/sdk/kis_shared_ptr_vector.h +++ b/chalk/sdk/kis_shared_ptr_vector.h @@ -25,15 +25,15 @@ /** * TQValueVector does not always destroy an element when it is erased. - * If the items it is holding are KSharedPtr, this can result in hidden + * If the items it is holding are TDESharedPtr, this can result in hidden * references to objects that cannot be accounted for. This class - * sets the KSharedPtr to 0 on erase, which dereferences the object as + * sets the TDESharedPtr to 0 on erase, which dereferences the object as * expected. */ template -class KisSharedPtrVector : public TQValueVector< KSharedPtr > +class KisSharedPtrVector : public TQValueVector< TDESharedPtr > { - typedef TQValueVector< KSharedPtr > super; + typedef TQValueVector< TDESharedPtr > super; public: KisSharedPtrVector() {} @@ -57,7 +57,7 @@ public: return super::erase(first, last); } - bool contains(KSharedPtr ptr) const + bool contains(TDESharedPtr ptr) const { for (int i = 0, n = super::count(); i < n; ++i) if (super::at(i) == ptr) diff --git a/chalk/ui/kis_opengl_image_context.h b/chalk/ui/kis_opengl_image_context.h index 84cbea45..6bdca958 100644 --- a/chalk/ui/kis_opengl_image_context.h +++ b/chalk/ui/kis_opengl_image_context.h @@ -37,10 +37,10 @@ class TQRegion; class KisOpenGLImageContext; -typedef KSharedPtr KisOpenGLImageContextSP; +typedef TDESharedPtr KisOpenGLImageContextSP; class KisColorSpace; -class KRITACORE_EXPORT KisOpenGLImageContext : public TQObject , public KShared { +class KRITACORE_EXPORT KisOpenGLImageContext : public TQObject , public TDEShared { Q_OBJECT diff --git a/chalk/ui/kis_tool.h b/chalk/ui/kis_tool.h index fb79325a..cd9cc424 100644 --- a/chalk/ui/kis_tool.h +++ b/chalk/ui/kis_tool.h @@ -58,7 +58,7 @@ enum enumToolType { const TQ_UINT8 NUMBER_OF_TOOLTYPES = 6; -class KisTool : public TQObject, public KisCanvasObserver, public KShared { +class KisTool : public TQObject, public KisCanvasObserver, public TDEShared { Q_OBJECT diff --git a/chalk/ui/kis_tool_factory.h b/chalk/ui/kis_tool_factory.h index da1239e3..90240f0c 100644 --- a/chalk/ui/kis_tool_factory.h +++ b/chalk/ui/kis_tool_factory.h @@ -25,7 +25,7 @@ #include "kis_types.h" #include "kactioncollection.h" -class KisToolFactory : public KShared +class KisToolFactory : public TDEShared { public: diff --git a/chalk/ui/kis_tool_types.h b/chalk/ui/kis_tool_types.h index 4811f75e..9dcb9e9f 100644 --- a/chalk/ui/kis_tool_types.h +++ b/chalk/ui/kis_tool_types.h @@ -23,12 +23,12 @@ class KisTool; -typedef KSharedPtr KisToolSP; +typedef TDESharedPtr KisToolSP; typedef KisSharedPtrVector vKisTool; typedef vKisTool::iterator vKisTool_it; typedef vKisTool::const_iterator vKisTool_cit; class KisToolFactory; -typedef KSharedPtr KisToolFactorySP; +typedef TDESharedPtr KisToolFactorySP; #endif // KIS_TOOL_TYPES_H_ diff --git a/kexi/core/kexi.cpp b/kexi/core/kexi.cpp index f352b51b..95b14e67 100644 --- a/kexi/core/kexi.cpp +++ b/kexi/core/kexi.cpp @@ -45,10 +45,10 @@ using namespace Kexi; //! used for speedup //! @internal -class KexiInternal : public KShared +class KexiInternal : public TDEShared { public: - KexiInternal() : KShared() + KexiInternal() : TDEShared() , connset(0) , smallFont(0) { diff --git a/kexi/core/kexiactioncategories.h b/kexi/core/kexiactioncategories.h index 6e672133..5f43aaf6 100644 --- a/kexi/core/kexiactioncategories.h +++ b/kexi/core/kexiactioncategories.h @@ -40,7 +40,7 @@ enum ActionCategory /*! Note: we do not declare actions used in design/text view modes, because the categories are used in the data view, for now in the 'assign action to a push button' function. */ -class KEXICORE_EXPORT ActionCategories : public KShared +class KEXICORE_EXPORT ActionCategories : public TDEShared { public: ActionCategories(); diff --git a/kexi/formeditor/scripting/formscript.h b/kexi/formeditor/scripting/formscript.h index 138a12de..de38325c 100644 --- a/kexi/formeditor/scripting/formscript.h +++ b/kexi/formeditor/scripting/formscript.h @@ -72,7 +72,7 @@ class FormScript : public TQObject private: ScriptManager *m_manager; Form *m_form; - KSharedPtr m_script; + TDESharedPtr m_script; EventList m_list; }; diff --git a/kexi/kexidb/preparedstatement.cpp b/kexi/kexidb/preparedstatement.cpp index ce96f630..f1ab679c 100644 --- a/kexi/kexidb/preparedstatement.cpp +++ b/kexi/kexidb/preparedstatement.cpp @@ -27,7 +27,7 @@ using namespace KexiDB; PreparedStatement::PreparedStatement(StatementType type, ConnectionInternal& conn, FieldList& fields, const TQStringList& where) - : KShared() + : TDEShared() , m_type(type) , m_fields(&fields) , m_where(where.isEmpty() ? new TQStringList(where) : 0) diff --git a/kexi/kexidb/preparedstatement.h b/kexi/kexidb/preparedstatement.h index 463c3c44..fa8e58a6 100644 --- a/kexi/kexidb/preparedstatement.h +++ b/kexi/kexidb/preparedstatement.h @@ -70,10 +70,10 @@ class FieldList; Depending on database backend, you can avoid escaping BLOBs. See KexiFormView::storeData() for example use. */ -class KEXI_DB_EXPORT PreparedStatement : public KShared +class KEXI_DB_EXPORT PreparedStatement : public TDEShared { public: - typedef KSharedPtr Ptr; + typedef TDESharedPtr Ptr; //! Defines type of the prepared statement. enum StatementType { diff --git a/kexi/plugins/macros/kexiactions/datatableaction.cpp b/kexi/plugins/macros/kexiactions/datatableaction.cpp index 19922122..4e211a53 100644 --- a/kexi/plugins/macros/kexiactions/datatableaction.cpp +++ b/kexi/plugins/macros/kexiactions/datatableaction.cpp @@ -46,7 +46,7 @@ namespace KexiMacro { { TQStringList list; list << "import" << "export"; - this->appendChild( KSharedPtr( new KoMacro::Variable(list, "@list") ) ); + this->appendChild( TDESharedPtr( new KoMacro::Variable(list, "@list") ) ); this->setVariant( list[0] ); } @@ -61,7 +61,7 @@ namespace KexiMacro { { TQStringList list; list << "file" << "clipboard"; - this->appendChild( KSharedPtr( new KoMacro::Variable(list, "@list") ) ); + this->appendChild( TDESharedPtr( new KoMacro::Variable(list, "@list") ) ); this->setVariant( list[0] ); } @@ -87,10 +87,10 @@ namespace KexiMacro { namelist << info->objectName() + "." + item_it.current()->name(); } for(TQStringList::Iterator it = namelist.begin(); it != namelist.end(); ++it) - this->appendChild( KSharedPtr(new KoMacro::Variable(*it)) ); + this->appendChild( TDESharedPtr(new KoMacro::Variable(*it)) ); //const TQString name = info->objectName(); //info->groupName(); - //this->appendChild( KSharedPtr(new KoMacro::Variable(name)) ); + //this->appendChild( TDESharedPtr(new KoMacro::Variable(name)) ); } const TQString n = namelist.contains(partitem) @@ -106,20 +106,20 @@ namespace KexiMacro { DataTableAction::DataTableAction() : KexiAction("datatable", i18n("Data Table")) { - setVariable(KSharedPtr( new MethodVariable(this) )); - setVariable(KSharedPtr( new TypeVariable(this) )); - setVariable(KSharedPtr( new PartItemVariable(this) )); + setVariable(TDESharedPtr( new MethodVariable(this) )); + setVariable(TDESharedPtr( new TypeVariable(this) )); + setVariable(TDESharedPtr( new PartItemVariable(this) )); } DataTableAction::~DataTableAction() { } -bool DataTableAction::notifyUpdated(KSharedPtr macroitem, const TQString& name) +bool DataTableAction::notifyUpdated(TDESharedPtr macroitem, const TQString& name) { kdDebug()<<"DataTableAction::notifyUpdated() name="< variable = macroitem->variable(name, false); + TDESharedPtr variable = macroitem->variable(name, false); if(! variable) { kdWarning()<<"DataTableAction::notifyUpdated() No such variable="< macroitem, co if(name == "method") { const int partitem = macroitem->variant(OBJECT, true).toString(); macroitem->variable(OBJECT, true)->setChildren( - KoMacro::Variable::List() << KSharedPtr(new ObjectVariable(this, partitem)) ); + KoMacro::Variable::List() << TDESharedPtr(new ObjectVariable(this, partitem)) ); } */ return true; } -void DataTableAction::activate(KSharedPtr context) +void DataTableAction::activate(TDESharedPtr context) { if(! mainWin()->project()) { - kdWarning() << "ExecuteAction::activate(KSharedPtr) Invalid project" << endl; + kdWarning() << "ExecuteAction::activate(TDESharedPtr) Invalid project" << endl; return; } diff --git a/kexi/plugins/macros/kexiactions/datatableaction.h b/kexi/plugins/macros/kexiactions/datatableaction.h index e3f71601..a3acf5f8 100644 --- a/kexi/plugins/macros/kexiactions/datatableaction.h +++ b/kexi/plugins/macros/kexiactions/datatableaction.h @@ -61,7 +61,7 @@ namespace KexiMacro { * @return true if the update was successfully else false * is returned. */ - virtual bool notifyUpdated(KSharedPtr macroitem, const TQString& name); + virtual bool notifyUpdated(TDESharedPtr macroitem, const TQString& name); public slots: @@ -69,7 +69,7 @@ namespace KexiMacro { * Called if the @a Action should be executed within the * defined @p context . */ - virtual void activate(KSharedPtr context); + virtual void activate(TDESharedPtr context); }; } diff --git a/kexi/plugins/macros/kexiactions/executeaction.cpp b/kexi/plugins/macros/kexiactions/executeaction.cpp index 564b03c8..7383b9a8 100644 --- a/kexi/plugins/macros/kexiactions/executeaction.cpp +++ b/kexi/plugins/macros/kexiactions/executeaction.cpp @@ -40,20 +40,20 @@ ExecuteAction::ExecuteAction() : KexiAction("execute", i18n("Execute")) { int conditions = ObjectVariable::VisibleInNav | ObjectVariable::Executable; - KSharedPtr objvar = new ObjectVariable(this, conditions); + TDESharedPtr objvar = new ObjectVariable(this, conditions); setVariable(objvar); - setVariable(KSharedPtr( new ObjectNameVariable(this, objvar->variant().toString()) )); + setVariable(TDESharedPtr( new ObjectNameVariable(this, objvar->variant().toString()) )); } ExecuteAction::~ExecuteAction() { } -bool ExecuteAction::notifyUpdated(KSharedPtr macroitem, const TQString& name) +bool ExecuteAction::notifyUpdated(TDESharedPtr macroitem, const TQString& name) { kdDebug()<<"ExecuteAction::notifyUpdated() name="< variable = macroitem->variable(name, false); + TDESharedPtr variable = macroitem->variable(name, false); if(! variable) { kdWarning()<<"ExecuteAction::notifyUpdated() No such variable="< macroitem, cons 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" macroitem->variable(NAME, true)->setChildren( - KoMacro::Variable::List() << KSharedPtr(new ObjectNameVariable(this, objectvalue, objectname)) ); + KoMacro::Variable::List() << TDESharedPtr(new ObjectNameVariable(this, objectvalue, objectname)) ); } return true; } -void ExecuteAction::activate(KSharedPtr context) +void ExecuteAction::activate(TDESharedPtr context) { if(! mainWin()->project()) { - kdWarning() << "ExecuteAction::activate(KSharedPtr) Invalid project" << endl; + kdWarning() << "ExecuteAction::activate(TDESharedPtr) Invalid project" << endl; return; } diff --git a/kexi/plugins/macros/kexiactions/executeaction.h b/kexi/plugins/macros/kexiactions/executeaction.h index 04fef2dc..be7c95dc 100644 --- a/kexi/plugins/macros/kexiactions/executeaction.h +++ b/kexi/plugins/macros/kexiactions/executeaction.h @@ -63,7 +63,7 @@ namespace KexiMacro { * @return true if the update was successfully else false * is returned. */ - virtual bool notifyUpdated(KSharedPtr macroitem, const TQString& name); + virtual bool notifyUpdated(TDESharedPtr macroitem, const TQString& name); public slots: @@ -71,7 +71,7 @@ namespace KexiMacro { * Called if the @a Action should be executed within the * defined @p context . */ - virtual void activate(KSharedPtr context); + virtual void activate(TDESharedPtr context); }; } diff --git a/kexi/plugins/macros/kexiactions/messageaction.cpp b/kexi/plugins/macros/kexiactions/messageaction.cpp index a36d0526..f421abb5 100644 --- a/kexi/plugins/macros/kexiactions/messageaction.cpp +++ b/kexi/plugins/macros/kexiactions/messageaction.cpp @@ -39,9 +39,9 @@ MessageAction::~MessageAction() { } -void MessageAction::activate(KSharedPtr context) +void MessageAction::activate(TDESharedPtr context) { - kdDebug() << "MessageAction::activate(KSharedPtr)" << endl; + kdDebug() << "MessageAction::activate(TDESharedPtr)" << endl; const TQString caption = context->variable("caption")->variant().toString(); const TQString message = context->variable("message")->variant().toString(); KMessageBox::information(mainWin(), message, caption); diff --git a/kexi/plugins/macros/kexiactions/messageaction.h b/kexi/plugins/macros/kexiactions/messageaction.h index da7723c3..9af12b89 100644 --- a/kexi/plugins/macros/kexiactions/messageaction.h +++ b/kexi/plugins/macros/kexiactions/messageaction.h @@ -59,7 +59,7 @@ namespace KexiMacro { * Called if the @a Action should be executed within the * defined @param context . */ - virtual void activate(KSharedPtr context); + virtual void activate(TDESharedPtr context); }; } diff --git a/kexi/plugins/macros/kexiactions/navigateaction.cpp b/kexi/plugins/macros/kexiactions/navigateaction.cpp index 815b8723..336039ae 100644 --- a/kexi/plugins/macros/kexiactions/navigateaction.cpp +++ b/kexi/plugins/macros/kexiactions/navigateaction.cpp @@ -47,7 +47,7 @@ namespace KexiMacro { { TQStringList list; list << "first" << "previous" << "next" << "last" << "goto"; - this->appendChild( KSharedPtr( new KoMacro::Variable(list, "@list") ) ); + this->appendChild( TDESharedPtr( new KoMacro::Variable(list, "@list") ) ); /*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 @@ -64,25 +64,25 @@ NavigateAction::NavigateAction() : KexiAction("navigate", i18n("Navigate")) { KoMacro::Variable* navvar = new NavigateVariable(this); - setVariable(KSharedPtr( navvar )); + setVariable(TDESharedPtr( navvar )); KoMacro::Variable* rowvar = new KexiVariable(this, "rownr", i18n("Row")); rowvar->setVariant(0); - setVariable(KSharedPtr(rowvar)); + setVariable(TDESharedPtr(rowvar)); KoMacro::Variable* colvar = new KexiVariable(this, "colnr", i18n("Column")); colvar->setVariant(0); - setVariable(KSharedPtr(colvar)); + setVariable(TDESharedPtr(colvar)); } NavigateAction::~NavigateAction() { } -bool NavigateAction::notifyUpdated(KSharedPtr macroitem, const TQString& name) +bool NavigateAction::notifyUpdated(TDESharedPtr macroitem, const TQString& name) { kdDebug()<<"NavigateAction::notifyUpdated() name="< variable = macroitem->variable(name, false); + TDESharedPtr variable = macroitem->variable(name, false); if(! variable) { kdWarning()<<"NavigateAction::notifyUpdated() No such variable="< macroitem, con const int colnr = macroitem->variant("colnr", true).toInt(); // e.g. "macro1" or "macro2" if objectvalue above is "macro" macroitem->variable("rownr", true)->setChildren( - KoMacro::Variable::List() << KSharedPtr(new KoMacro::Variable(rownr)) ); + KoMacro::Variable::List() << TDESharedPtr(new KoMacro::Variable(rownr)) ); macroitem->variable("colnr", true)->setChildren( - KoMacro::Variable::List() << KSharedPtr(new KoMacro::Variable(colnr)) ); + KoMacro::Variable::List() << TDESharedPtr(new KoMacro::Variable(colnr)) ); } return true; } -void NavigateAction::activate(KSharedPtr context) +void NavigateAction::activate(TDESharedPtr context) { KexiDialogBase* dialog = dynamic_cast( mainWin()->activeWindow() ); if(! dialog) { diff --git a/kexi/plugins/macros/kexiactions/navigateaction.h b/kexi/plugins/macros/kexiactions/navigateaction.h index 449a9459..0dcff98a 100644 --- a/kexi/plugins/macros/kexiactions/navigateaction.h +++ b/kexi/plugins/macros/kexiactions/navigateaction.h @@ -63,7 +63,7 @@ namespace KexiMacro { * @return true if the update was successfully else false * is returned. */ - virtual bool notifyUpdated(KSharedPtr macroitem, const TQString& name); + virtual bool notifyUpdated(TDESharedPtr macroitem, const TQString& name); public slots: @@ -71,7 +71,7 @@ namespace KexiMacro { * Called if the @a Action should be executed within the * defined @p context . */ - virtual void activate(KSharedPtr context); + virtual void activate(TDESharedPtr context); }; } diff --git a/kexi/plugins/macros/kexiactions/objectnamevariable.h b/kexi/plugins/macros/kexiactions/objectnamevariable.h index 1a0aabf8..03545f69 100644 --- a/kexi/plugins/macros/kexiactions/objectnamevariable.h +++ b/kexi/plugins/macros/kexiactions/objectnamevariable.h @@ -61,7 +61,7 @@ namespace KexiMacro { namelist << ""; for(TQStringList::Iterator it = namelist.begin(); it != namelist.end(); ++it) - this->appendChild( KSharedPtr(new KoMacro::Variable(*it)) ); + this->appendChild( TDESharedPtr(new KoMacro::Variable(*it)) ); this->setVariant( (name.isNull() || ! namelist.contains(name)) ? namelist[0] : name ); diff --git a/kexi/plugins/macros/kexiactions/objectvariable.h b/kexi/plugins/macros/kexiactions/objectvariable.h index c27f024b..65def3aa 100644 --- a/kexi/plugins/macros/kexiactions/objectvariable.h +++ b/kexi/plugins/macros/kexiactions/objectvariable.h @@ -67,7 +67,7 @@ namespace KexiMacro { continue; const TQString name = info->objectName(); //info->groupName(); - this->appendChild( KSharedPtr(new KoMacro::Variable(name)) ); + this->appendChild( TDESharedPtr(new KoMacro::Variable(name)) ); } if(! objectname.isNull()) diff --git a/kexi/plugins/macros/kexiactions/openaction.cpp b/kexi/plugins/macros/kexiactions/openaction.cpp index d7c4e7aa..f5206ff5 100644 --- a/kexi/plugins/macros/kexiactions/openaction.cpp +++ b/kexi/plugins/macros/kexiactions/openaction.cpp @@ -63,7 +63,7 @@ namespace KexiMacro { if(viewmodes & Kexi::TextViewMode) namelist << TEXTVIEW; for(TQStringList::Iterator it = namelist.begin(); it != namelist.end(); ++it) - this->children().append( KSharedPtr(new KoMacro::Variable(*it)) ); + this->children().append( TDESharedPtr(new KoMacro::Variable(*it)) ); } const TQString n = namelist.contains(viewname) @@ -81,21 +81,21 @@ OpenAction::OpenAction() { const int conditions = ObjectVariable::VisibleInNav; - KSharedPtr objvar = new ObjectVariable(this, conditions); + TDESharedPtr objvar = new ObjectVariable(this, conditions); setVariable(objvar); - setVariable(KSharedPtr( new ObjectNameVariable(this, objvar->variant().toString()) )); - setVariable(KSharedPtr( new ViewVariable(this, objvar->variant().toString()) )); + setVariable(TDESharedPtr( new ObjectNameVariable(this, objvar->variant().toString()) )); + setVariable(TDESharedPtr( new ViewVariable(this, objvar->variant().toString()) )); } OpenAction::~OpenAction() { } -bool OpenAction::notifyUpdated(KSharedPtr macroitem, const TQString& name) +bool OpenAction::notifyUpdated(TDESharedPtr macroitem, const TQString& name) { kdDebug()<<"OpenAction::notifyUpdated() name="< variable = macroitem->variable(name, false); + TDESharedPtr variable = macroitem->variable(name, false); if(! variable) { kdWarning()<<"OpenAction::notifyUpdated() No such variable="< macroitem, const T const TQString viewname = macroitem->variant(VIEW, true).toString(); // "data", "design" or "text" macroitem->variable(NAME, true)->setChildren( - KoMacro::Variable::List() << KSharedPtr(new ObjectNameVariable(this, objectvalue, objectname)) ); + KoMacro::Variable::List() << TDESharedPtr(new ObjectNameVariable(this, objectvalue, objectname)) ); macroitem->variable(VIEW, true)->setChildren( - KoMacro::Variable::List() << KSharedPtr(new ViewVariable(this, objectvalue, viewname)) ); + KoMacro::Variable::List() << TDESharedPtr(new ViewVariable(this, objectvalue, viewname)) ); } return true; } -void OpenAction::activate(KSharedPtr context) +void OpenAction::activate(TDESharedPtr context) { if(! mainWin()->project()) { throw KoMacro::Exception(i18n("No project loaded.")); diff --git a/kexi/plugins/macros/kexiactions/openaction.h b/kexi/plugins/macros/kexiactions/openaction.h index 092dc371..700b6ef6 100644 --- a/kexi/plugins/macros/kexiactions/openaction.h +++ b/kexi/plugins/macros/kexiactions/openaction.h @@ -64,7 +64,7 @@ namespace KexiMacro { * @return true if the update was successfully else false * is returned. */ - virtual bool notifyUpdated(KSharedPtr macroitem, const TQString& name); + virtual bool notifyUpdated(TDESharedPtr macroitem, const TQString& name); public slots: @@ -72,7 +72,7 @@ namespace KexiMacro { * Called if the @a Action should be executed within the * defined @p context . */ - virtual void activate(KSharedPtr context); + virtual void activate(TDESharedPtr context); }; } diff --git a/kexi/plugins/macros/kexipart/keximacrodesignview.cpp b/kexi/plugins/macros/kexipart/keximacrodesignview.cpp index 5406e8ca..dd8b9a92 100644 --- a/kexi/plugins/macros/kexipart/keximacrodesignview.cpp +++ b/kexi/plugins/macros/kexipart/keximacrodesignview.cpp @@ -137,7 +137,7 @@ KexiMacroDesignView::KexiMacroDesignView(KexiMainWindow *mainwin, TQWidget *pare TQStringList actionnames = KoMacro::Manager::self()->actionNames(); TQStringList::ConstIterator it, end( actionnames.constEnd() ); for( it = actionnames.constBegin(); it != end; ++it) { - KSharedPtr action = KoMacro::Manager::self()->action(*it); + TDESharedPtr action = KoMacro::Manager::self()->action(*it); items.append( action->text() ); } @@ -218,7 +218,7 @@ void KexiMacroDesignView::updateData() d->tabledata->append(tableitem); } // Set the action-column. - KSharedPtr action = (*it)->action(); + TDESharedPtr action = (*it)->action(); if(action.data()) { int i = actionnames.findIndex( action->name() ); 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 // items till we are able to access the item we like to use. for(int i = macro()->items().count(); i <= rowindex; i++) { - macro()->addItem( KSharedPtr( new KoMacro::MacroItem() ) ); + macro()->addItem( TDESharedPtr( new KoMacro::MacroItem() ) ); } // Get the matching MacroItem. - KSharedPtr macroitem = macro()->items()[rowindex]; + TDESharedPtr macroitem = macro()->items()[rowindex]; if(! macroitem.data()) { kdWarning() << "KexiMacroDesignView::beforeCellChanged() Invalid item for rowindex=" << rowindex << endl; return; @@ -293,7 +293,7 @@ void KexiMacroDesignView::beforeCellChanged(KexiTableItem* item, int colnum, TQV TQStringList actionnames = KoMacro::Manager::self()->actionNames(); actionname = actionnames[ selectedindex - 1 ]; // first item is empty } - KSharedPtr action = KoMacro::Manager::self()->action(actionname); + TDESharedPtr action = KoMacro::Manager::self()->action(actionname); macroitem->setAction(action); updateProperties(d->propertyset->currentRow(), d->propertyset->currentPropertySet(), macroitem); 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 // beforeCellChanged() anyway. kdDebug() << "KexiMacroDesignView::rowInserted() Inserting new MacroItem" << endl; - KSharedPtr macroitem = KSharedPtr( new KoMacro::MacroItem() ); + TDESharedPtr macroitem = TDESharedPtr( new KoMacro::MacroItem() ); KoMacro::MacroItem::List::Iterator it = macroitems.at(row); macroitems.insert(it, macroitem); } @@ -347,7 +347,7 @@ void KexiMacroDesignView::rowDeleted() macroitems.remove( macroitems.at(rowindex) ); } -bool KexiMacroDesignView::updateSet(KoProperty::Set* set, KSharedPtr macroitem, const TQString& variablename) +bool KexiMacroDesignView::updateSet(KoProperty::Set* set, TDESharedPtr macroitem, const TQString& variablename) { kdDebug() << "KexiMacroDesignView::updateSet() variablename=" << variablename << endl; KoProperty::Property* property = KexiMacroProperty::createProperty(macroitem, variablename); @@ -357,7 +357,7 @@ bool KexiMacroDesignView::updateSet(KoProperty::Set* set, KSharedPtr macroitem) +void KexiMacroDesignView::updateProperties(int row, KoProperty::Set* set, TDESharedPtr macroitem) { 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. } - KSharedPtr action = macroitem->action(); + TDESharedPtr action = macroitem->action(); if(! action.data()) { // don't display a propertyset if there is no action defined. d->propertyset->remove(row); @@ -395,7 +395,7 @@ void KexiMacroDesignView::updateProperties(int row, KoProperty::Set* set, KShare TQStringList varnames = action->variableNames(); for(TQStringList::Iterator it = varnames.begin(); it != varnames.end(); ++it) { if(updateSet(set, macroitem, *it)) { - KSharedPtr variable = macroitem->variable(*it, true); + TDESharedPtr variable = macroitem->variable(*it, true); kdDebug()<<"KexiMacroDesignView::updateProperties() name=" << *it << " variable=" << variable->variant().toString() << endl; #if 0 macroitem->setVariable(*it, variable); @@ -428,7 +428,7 @@ void KexiMacroDesignView::propertyChanged(KoProperty::Set& set, KoProperty::Prop setDirty(); if(reload) { // The MacroItem which should be changed. - KSharedPtr macroitem = macro()->items()[row]; + TDESharedPtr macroitem = macro()->items()[row]; // Update the properties. updateProperties(row, &set, macroitem); } @@ -442,11 +442,11 @@ void KexiMacroDesignView::propertyChanged(KoProperty::Set& set, KoProperty::Prop */ /* - TQStringList dirtyvarnames = macroitem->setVariable(name, KSharedPtr(pv)); + TQStringList dirtyvarnames = macroitem->setVariable(name, TDESharedPtr(pv)); bool dirty = false; bool reload = false; for(TQStringList::Iterator it = dirtyvarnames.begin(); it != dirtyvarnames.end(); ++it) { - KSharedPtr variable = macroitem->variable(*it); + TDESharedPtr variable = macroitem->variable(*it); if(! variable.data()) { kdDebug() << "KexiMacroDesignView::propertyChanged() name=" << name << " it=" << *it << " skipped cause such a variable is not known." << endl; continue; diff --git a/kexi/plugins/macros/kexipart/keximacrodesignview.h b/kexi/plugins/macros/kexipart/keximacrodesignview.h index eaa64f37..c23e31f9 100644 --- a/kexi/plugins/macros/kexipart/keximacrodesignview.h +++ b/kexi/plugins/macros/kexipart/keximacrodesignview.h @@ -118,13 +118,13 @@ class KexiMacroDesignView : public KexiMacroView * Update the \a KoProperty::Set set with the passed \a KoMacro::MacroItem * \p item and the variablename \p variablename . */ - bool updateSet(KoProperty::Set* set, KSharedPtr item, const TQString& variablename); + bool updateSet(KoProperty::Set* set, TDESharedPtr item, const TQString& variablename); /** * Update the properties of the \a KoProperty::Set \p set at * row-number \p row with the \a KoMacro::MacroItem \p macroitem . */ - void updateProperties(int row, KoProperty::Set* set, KSharedPtr macroitem); + void updateProperties(int row, KoProperty::Set* set, TDESharedPtr macroitem); }; #endif diff --git a/kexi/plugins/macros/kexipart/keximacroerror.cpp b/kexi/plugins/macros/kexipart/keximacroerror.cpp index 1b23fa50..6c35e8d7 100644 --- a/kexi/plugins/macros/kexipart/keximacroerror.cpp +++ b/kexi/plugins/macros/kexipart/keximacroerror.cpp @@ -34,7 +34,7 @@ class KexiMacroError::Private { public: KexiMainWindow* const mainwin; - KSharedPtr context; + TDESharedPtr context; Private(KexiMainWindow* const m, KoMacro::Context* const c) : mainwin(m) @@ -43,7 +43,7 @@ class KexiMacroError::Private } }; -KexiMacroError::KexiMacroError(KexiMainWindow* mainwin, KSharedPtr context) +KexiMacroError::KexiMacroError(KexiMainWindow* mainwin, TDESharedPtr context) : KexiMacroErrorBase(mainwin, "KexiMacroError" , /*WFlags*/ TQt::WDestructiveClose) , d(new Private(mainwin, context)) { @@ -62,7 +62,7 @@ KexiMacroError::KexiMacroError(KexiMainWindow* mainwin, KSharedPtrsetText(0,TQString("%1").arg(i++)); listviewitem->setText(1,i18n("Action")); - KSharedPtr macroitem = *mit; + TDESharedPtr macroitem = *mit; if (macroitem != 0 && macroitem->action() != 0) { @@ -103,7 +103,7 @@ void KexiMacroError::designbtnClicked() } // We need to determinate the KexiPart::Item which should be opened. - KSharedPtr macro = d->context->macro(); + TDESharedPtr macro = d->context->macro(); const TQString name = macro->name(); KexiPart::Item* item = d->mainwin->project()->itemForMimeType("kexi/macro", name); if(! item) { diff --git a/kexi/plugins/macros/kexipart/keximacroerror.h b/kexi/plugins/macros/kexipart/keximacroerror.h index f8fb5756..b3bfcad8 100644 --- a/kexi/plugins/macros/kexipart/keximacroerror.h +++ b/kexi/plugins/macros/kexipart/keximacroerror.h @@ -60,7 +60,7 @@ class KexiMacroError : public KexiMacroErrorBase * @param mainwin The parent @a KexiMainWindow instance. * @param context The @a KoMacro::Context where the error happened. */ - KexiMacroError(KexiMainWindow* mainwin, KSharedPtr context); + KexiMacroError(KexiMainWindow* mainwin, TDESharedPtr context); /** * Destructor. diff --git a/kexi/plugins/macros/kexipart/keximacropart.cpp b/kexi/plugins/macros/kexipart/keximacropart.cpp index 1459fffc..c189b8ca 100644 --- a/kexi/plugins/macros/kexipart/keximacropart.cpp +++ b/kexi/plugins/macros/kexipart/keximacropart.cpp @@ -129,7 +129,7 @@ KexiViewBase* KexiMacroPart::createView(TQWidget* parent, KexiDialogBase* dialog //kdDebug() << "KexiMacroPart::createView() itemname=" << itemname << endl; if(! itemname.isNull()) { - KSharedPtr macro = ::KoMacro::Manager::self()->getMacro(itemname); + TDESharedPtr macro = ::KoMacro::Manager::self()->getMacro(itemname); if(! macro) { // If we don't have a macro with that name yet, create one. macro = ::KoMacro::Manager::self()->createMacro(itemname); diff --git a/kexi/plugins/macros/kexipart/keximacroproperty.cpp b/kexi/plugins/macros/kexipart/keximacroproperty.cpp index 7934ec71..07c8f8e1 100644 --- a/kexi/plugins/macros/kexipart/keximacroproperty.cpp +++ b/kexi/plugins/macros/kexipart/keximacroproperty.cpp @@ -47,13 +47,13 @@ class KexiMacroProperty::Private /** The @a KoMacro::MacroItem the custom property uses internal. Together with the name we are able to identify the used variable at runtime. */ - KSharedPtr macroitem; + TDESharedPtr macroitem; /** The name the variable @a KoMacro::Variable is known as in the @a KoMacro::MacroItem defined above. */ TQString name; }; -KexiMacroProperty::KexiMacroProperty(KoProperty::Property* parent, KSharedPtr macroitem, const TQString& name) +KexiMacroProperty::KexiMacroProperty(KoProperty::Property* parent, TDESharedPtr macroitem, const TQString& name) : KoProperty::CustomProperty(parent) , d( new Private() ) { @@ -72,14 +72,14 @@ void KexiMacroProperty::init() Q_ASSERT( d->macroitem != 0 ); //kdDebug() << "--------- KexiMacroProperty::set() macroitem=" << d->macroitem->name() << " name=" << d->name << endl; - KSharedPtr action = d->macroitem->action(); - KSharedPtr actionvariable = action->variable(d->name); + TDESharedPtr action = d->macroitem->action(); + TDESharedPtr actionvariable = action->variable(d->name); if(! actionvariable.data()) { kdDebug() << "KexiMacroProperty::createProperty() Skipped cause there exists no such action=" << d->name << endl; return; } - KSharedPtr variable = d->macroitem->variable(d->name, true/*checkaction*/); + TDESharedPtr variable = d->macroitem->variable(d->name, true/*checkaction*/); if(! variable.data()) { kdDebug() << "KexiMacroProperty::createProperty() Skipped cause there exists no such variable=" << d->name << endl; return; @@ -121,7 +121,7 @@ void KexiMacroProperty::setValue(const TQVariant &value, bool rememberOldValue) TQVariant KexiMacroProperty::value() const { - KSharedPtr variable = d->macroitem->variable(d->name, true); + TDESharedPtr variable = d->macroitem->variable(d->name, true); Q_ASSERT( variable.data() != 0 ); 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. } -KSharedPtr KexiMacroProperty::macroItem() const +TDESharedPtr KexiMacroProperty::macroItem() const { return d->macroitem; } @@ -141,12 +141,12 @@ TQString KexiMacroProperty::name() const return d->name; } -KSharedPtr KexiMacroProperty::variable() const +TDESharedPtr KexiMacroProperty::variable() const { return d->macroitem->variable(d->name, true/*checkaction*/); } -KoProperty::Property* KexiMacroProperty::createProperty(KSharedPtr macroitem, const TQString& name) +KoProperty::Property* KexiMacroProperty::createProperty(TDESharedPtr macroitem, const TQString& name) { KoProperty::Property* property = new KoProperty::Property(); KexiMacroProperty* customproperty = new KexiMacroProperty(property, macroitem, name); @@ -184,7 +184,7 @@ KoProperty::CustomProperty* KexiMacroPropertyFactory::createCustomProperty(KoPro return 0; } - KSharedPtr macroitem = parentcustomproperty->macroItem(); + TDESharedPtr macroitem = parentcustomproperty->macroItem(); Q_ASSERT( macroitem.data() != 0 ); const TQString name = parentcustomproperty->name(); Q_ASSERT(! name.isEmpty()); @@ -266,7 +266,7 @@ class EditListBoxItem : public ListBoxItem } virtual TQString text() const { - KSharedPtr variable = m_macroproperty->variable(); + TDESharedPtr variable = m_macroproperty->variable(); Q_ASSERT( variable.data() ); //kdDebug()<<"EditListBoxItem::text() text="<toString()<toString() != TQString() ); @@ -274,9 +274,9 @@ class EditListBoxItem : public ListBoxItem } KoProperty::Widget* widget() const { return m_widget; } - KSharedPtr macroItem() const { return m_macroproperty->macroItem(); } - KSharedPtr variable() const { return m_macroproperty->variable(); } - KSharedPtr action() const { return m_macroproperty->macroItem()->action(); } + TDESharedPtr macroItem() const { return m_macroproperty->macroItem(); } + TDESharedPtr variable() const { return m_macroproperty->variable(); } + TDESharedPtr action() const { return m_macroproperty->macroItem()->action(); } protected: virtual void paint(TQPainter* p) { @@ -290,9 +290,9 @@ class EditListBoxItem : public ListBoxItem private: void init() { - KSharedPtr macroitem = m_macroproperty->macroItem(); + TDESharedPtr macroitem = m_macroproperty->macroItem(); Q_ASSERT( macroitem.data() ); - KSharedPtr action = m_macroproperty->macroItem()->action(); + TDESharedPtr action = m_macroproperty->macroItem()->action(); if(! action.data()) { kdWarning() << "EditListBoxItem::EditListBoxItem() Skipped cause there exists no action for macroproperty=" << m_macroproperty->name() << endl; return; @@ -302,7 +302,7 @@ class EditListBoxItem : public ListBoxItem kdWarning() << "EditListBoxItem::EditListBoxItem() No parentproperty defined" << endl; return; } - KSharedPtr variable = m_macroproperty->variable(); + TDESharedPtr variable = m_macroproperty->variable(); if(! variable.data()) { kdWarning() << "EditListBoxItem::EditListBoxItem() No variable defined for property=" << parentproperty->name() << endl; return; @@ -310,7 +310,7 @@ class EditListBoxItem : public ListBoxItem TQVariant variant = variable->variant(); - KSharedPtr actionvariable = action->variable(m_macroproperty->name()); + TDESharedPtr actionvariable = action->variable(m_macroproperty->name()); if(actionvariable.data()) { TQVariant actionvariant = actionvariable->variant(); Q_ASSERT( ! actionvariant.isNull() ); @@ -393,13 +393,13 @@ class ListBox : public TQListBox { KoMacro::Variable::List actionchildren; - KSharedPtr itemvar = m_macroproperty->macroItem()->variable(name,false); + TDESharedPtr itemvar = m_macroproperty->macroItem()->variable(name,false); //kdDebug() << "KexiMacroProperty::ListBox::update() itemvar="<<(itemvar.data() ? "name:"+itemvar->name()+" value:"+itemvar->toString() : "NULL")<children(); - KSharedPtr action = m_edititem->action(); - KSharedPtr actionvar = action.data() ? action->variable(name) : KSharedPtr(); + TDESharedPtr action = m_edititem->action(); + TDESharedPtr actionvar = action.data() ? action->variable(name) : TDESharedPtr(); //kdDebug() << "KexiMacroProperty::ListBox::update() actionvar="<<(actionvar.data() ? "name:"+actionvar->name()+" value:"+actionvar->toString() : "NULL")<children(); diff --git a/kexi/plugins/macros/kexipart/keximacroproperty.h b/kexi/plugins/macros/kexipart/keximacroproperty.h index 44ad8bd4..47f7a7e1 100644 --- a/kexi/plugins/macros/kexipart/keximacroproperty.h +++ b/kexi/plugins/macros/kexipart/keximacroproperty.h @@ -47,7 +47,7 @@ class KexiMacroProperty public: /** Constructor. */ - explicit KexiMacroProperty(KoProperty::Property* parent, KSharedPtr macroitem, const TQString& name); + explicit KexiMacroProperty(KoProperty::Property* parent, TDESharedPtr macroitem, const TQString& name); /** Destructor. */ virtual ~KexiMacroProperty(); @@ -73,7 +73,7 @@ class KexiMacroProperty /** \return the \a KoMacro::MacroItem this custom property has or NULL if there was no item provided. */ - KSharedPtr macroItem() const; + TDESharedPtr macroItem() const; /** \return the name the property has in the \a KoMacro::MacroItem 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() in the item @a macroItem() . If such a variable doesn't exists NULL is returned. */ - KSharedPtr variable() const; + TDESharedPtr variable() const; /** Factory function to create a new @a KoProperty::Property instance that will use a @a KexiMacroProperty as container. */ - static KoProperty::Property* createProperty(KSharedPtr macroitem, const TQString& name); + static KoProperty::Property* createProperty(TDESharedPtr macroitem, const TQString& name); signals: diff --git a/kexi/plugins/macros/kexipart/keximacroview.cpp b/kexi/plugins/macros/kexipart/keximacroview.cpp index 19e789f0..f0e7ea0b 100644 --- a/kexi/plugins/macros/kexipart/keximacroview.cpp +++ b/kexi/plugins/macros/kexipart/keximacroview.cpp @@ -47,7 +47,7 @@ class KexiMacroView::Private * The \a KoMacro::Manager instance used to access the * Macro Framework. */ - KSharedPtr macro; + TDESharedPtr macro; /** * Constructor. @@ -76,7 +76,7 @@ KexiMacroView::~KexiMacroView() delete d; } -KSharedPtr KexiMacroView::macro() const +TDESharedPtr KexiMacroView::macro() const { return d->macro; } @@ -161,7 +161,7 @@ tristate KexiMacroView::storeData(bool /*dontAsk*/) void KexiMacroView::execute(TQObject* sender) { - KSharedPtr context = d->macro->execute(sender); + TDESharedPtr context = d->macro->execute(sender); if(context->hadException()) { KexiMacroError* error = new KexiMacroError( mainWin(), // The parent KexiMainWindow diff --git a/kexi/plugins/macros/kexipart/keximacroview.h b/kexi/plugins/macros/kexipart/keximacroview.h index c11d48e8..ddff961f 100644 --- a/kexi/plugins/macros/kexipart/keximacroview.h +++ b/kexi/plugins/macros/kexipart/keximacroview.h @@ -63,7 +63,7 @@ class KexiMacroView : public KexiViewBase /** * \return the Macro instance. */ - KSharedPtr macro() const; + TDESharedPtr macro() const; /** * Load the data from XML source and fill the internally diff --git a/kexi/plugins/macros/lib/action.cpp b/kexi/plugins/macros/lib/action.cpp index fc729b57..3fc1adf6 100644 --- a/kexi/plugins/macros/lib/action.cpp +++ b/kexi/plugins/macros/lib/action.cpp @@ -68,7 +68,7 @@ namespace KoMacro { Action::Action(const TQString& name, const TQString& text) : TQObject() - , KShared() + , TDEShared() , d( new Private() ) // create the private d-pointer instance. { kdDebug() << "Action::Action() name=" << name << endl; @@ -76,7 +76,7 @@ Action::Action(const TQString& name, const TQString& text) setText(text); // Publish this action. - KoMacro::Manager::self()->publishAction( KSharedPtr(this) ); + KoMacro::Manager::self()->publishAction( TDESharedPtr(this) ); } Action::~Action() @@ -127,9 +127,9 @@ bool Action::hasVariable(const TQString& name) const return d->varmap.contains(name); } -KSharedPtr Action::variable(const TQString& name) const +TDESharedPtr Action::variable(const TQString& name) const { - return d->varmap.contains(name) ? d->varmap[name] : KSharedPtr(0); + return d->varmap.contains(name) ? d->varmap[name] : TDESharedPtr(0); } Variable::Map Action::variables() const @@ -142,7 +142,7 @@ TQStringList Action::variableNames() const return d->varnames; } -void Action::setVariable(KSharedPtr variable) +void Action::setVariable(TDESharedPtr variable) { const TQString name = variable->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->setName(name); variable->setText(text); - setVariable( KSharedPtr(variable) ); + setVariable( TDESharedPtr(variable) ); } void Action::removeVariable(const TQString& name) diff --git a/kexi/plugins/macros/lib/action.h b/kexi/plugins/macros/lib/action.h index 762e27ae..c779f21a 100644 --- a/kexi/plugins/macros/lib/action.h +++ b/kexi/plugins/macros/lib/action.h @@ -37,7 +37,7 @@ namespace KoMacro { */ class KOMACRO_EXPORT Action : public TQObject // TQt functionality like signals and slots - , public KShared // shared reference-counting + , public TDEShared // shared reference-counting { Q_OBJECT @@ -56,7 +56,7 @@ namespace KoMacro { /** * Shared pointer to implement reference-counting. */ - typedef TQMap > Map; + typedef TQMap > Map; /** * Constructor. @@ -118,7 +118,7 @@ namespace KoMacro { * name @p name . If there exists no @a Variable with * such a name, NULL is returned. */ - KSharedPtr variable(const TQString& name) const; + TDESharedPtr variable(const TQString& name) const; /** * @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 * this @a Action provides. */ - void setVariable(KSharedPtr variable); + void setVariable(TDESharedPtr variable); /** * Set the variable. @@ -162,7 +162,7 @@ namespace KoMacro { * @return true if the update was successfully else false * is returned. */ - virtual bool notifyUpdated(const KSharedPtr ¯oitem, const TQString& name) { + virtual bool notifyUpdated(const TDESharedPtr ¯oitem, const TQString& name) { Q_UNUSED(macroitem); Q_UNUSED(name); return true; // The default implementation does nothing. @@ -174,7 +174,7 @@ namespace KoMacro { * Called if the @a Action should be executed within the * defined @p context . */ - virtual void activate(KSharedPtr context) = 0; + virtual void activate(TDESharedPtr context) = 0; private: /// @internal d-pointer class. diff --git a/kexi/plugins/macros/lib/context.cpp b/kexi/plugins/macros/lib/context.cpp index c0eea250..a09704bd 100644 --- a/kexi/plugins/macros/lib/context.cpp +++ b/kexi/plugins/macros/lib/context.cpp @@ -41,25 +41,25 @@ namespace KoMacro { /** * The @a Macro instance that owns this @a Context . */ - KSharedPtr macro; + TDESharedPtr macro; /** * List of @a Action instances that are children of the * macro. */ - TQValueList > items; + TQValueList > items; /** * The currently selected @a MacroItem or NULL if there * is now @a MacroItem selected yet. */ - KSharedPtr macroitem; + TDESharedPtr macroitem; /** * Map of all @a Variable instance that are defined within * this context. */ - TQMap > variables; + TQMap > variables; /** * The @a Exception instance thrown at the last @a activate() @@ -68,7 +68,7 @@ namespace KoMacro { Exception* exception; /// Constructor. - explicit Private(KSharedPtr m) + explicit Private(TDESharedPtr m) : macro(m) // remember the macro , items(m->items()) // set d-pointer children to macro children , exception(0) // no exception yet. @@ -84,7 +84,7 @@ namespace KoMacro { } //Constructor with initialization of our Private.object (d-pointer) -Context::Context(KSharedPtr macro) +Context::Context(TDESharedPtr macro) : TQObject() , 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 -KSharedPtr Context::variable(const TQString& name) const +TDESharedPtr Context::variable(const TQString& name) const { //Use TQMap?s contains to check if a variable with name exists in context if (d->variables.contains(name)) { @@ -113,7 +113,7 @@ KSharedPtr Context::variable(const TQString& name) const } //if there is a macroitem try to get variable from it if(d->macroitem.data()) { - KSharedPtr v = d->macroitem->variable(name, true); + TDESharedPtr v = d->macroitem->variable(name, true); if(v.data()) { return v; } @@ -129,7 +129,7 @@ Variable::Map Context::variables() const } //set a variable -void Context::setVariable(const TQString& name, KSharedPtr variable) +void Context::setVariable(const TQString& name, TDESharedPtr variable) { //debuging infos 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) } //return the associated Macro -KSharedPtr Context::macro() const +TDESharedPtr Context::macro() const { return d->macro; } //return the currently selected MacroItem -KSharedPtr Context::macroItem() const +TDESharedPtr Context::macroItem() const { return d->macroitem; } @@ -162,18 +162,18 @@ Exception* Context::exception() const } //try to activate all action?s in this context -void Context::activate(TQValueList >::ConstIterator it) +void Context::activate(TQValueList >::ConstIterator it) { //debuging infos kdDebug() << "Context::activate()" << endl; //TQ_ASSIGN(d->macro); //set end to constEnd - TQValueList >::ConstIterator end(d->items.constEnd()); + TQValueList >::ConstIterator end(d->items.constEnd()); //loop through actions for(;it != end; ++it) { // fetch the MacroItem we are currently pointing to. - d->macroitem = KSharedPtr(*it); + d->macroitem = TDESharedPtr(*it); //skip empty macroitems if(! d->macroitem.data()) { kdDebug() << "Context::activate() Skipping empty MacroItem" << endl; @@ -181,7 +181,7 @@ void Context::activate(TQValueList >::ConstIterator it) } // fetch the Action, the MacroItem points to. - KSharedPtr action = d->macroitem->action(); + TDESharedPtr action = d->macroitem->action(); //skip macroitems without an action if(! action.data()) { kdDebug() << "Context::activate() Skipping MacroItem with no action" << endl; @@ -204,7 +204,7 @@ void Context::activate(TQValueList >::ConstIterator it) //and all variables wich belong to the action/macro TQStringList variables = action->variableNames(); for(TQStringList::Iterator vit = variables.begin(); vit != variables.end(); ++vit) { - KSharedPtr v = d->macroitem->variable(*vit, true); + TDESharedPtr v = d->macroitem->variable(*vit, true); d->exception->addTraceMessage( TQString("%1=%2").arg(*vit).arg(v->toString()) ); } return; // abort execution @@ -213,11 +213,11 @@ void Context::activate(TQValueList >::ConstIterator it) // 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. - d->macroitem = KSharedPtr(0); + d->macroitem = TDESharedPtr(0); } //try to activated an context -void Context::activate(KSharedPtr context) +void Context::activate(TDESharedPtr context) { //setup context delete d->exception; d->exception = 0; @@ -252,7 +252,7 @@ void Context::activateNext() } //find the macroitem from which to continue - TQValueList >::ConstIterator it = d->items.find(d->macroitem); + TQValueList >::ConstIterator it = d->items.find(d->macroitem); if (it != d->items.constEnd()) { activate(++it); // try to continue the execution. } diff --git a/kexi/plugins/macros/lib/context.h b/kexi/plugins/macros/lib/context.h index 4f9621cc..9bb0f5eb 100644 --- a/kexi/plugins/macros/lib/context.h +++ b/kexi/plugins/macros/lib/context.h @@ -40,7 +40,7 @@ namespace KoMacro { */ class KOMACRO_EXPORT Context : public TQObject - , public KShared + , public TDEShared { Q_OBJECT @@ -51,7 +51,7 @@ namespace KoMacro { * * @param macro The @a Macro this @a Context belongs to. */ - explicit Context(KSharedPtr macro); + explicit Context(TDESharedPtr macro); /** * Destructor. @@ -68,7 +68,7 @@ namespace KoMacro { * @return the @a Variable defined with name @p name or * NULL if there exists no such variable. */ - KSharedPtr variable(const TQString& name) const; + TDESharedPtr variable(const TQString& name) const; /** * @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 * there exists already a variable with that name replace it. */ - void setVariable(const TQString& name, KSharedPtr variable); + void setVariable(const TQString& name, TDESharedPtr variable); /** * @return the associated macro */ - KSharedPtr macro() const; + TDESharedPtr macro() const; /** * @return the currently selected @a MacroItem instance * or NULL if there is no @a MacroItem selected yet. */ - KSharedPtr macroItem() const; + TDESharedPtr macroItem() const; /** * @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 * calling this slot just activates those @a Action . */ - virtual void activate(TQValueList >::ConstIterator it); + virtual void activate(TQValueList >::ConstIterator it); public slots: @@ -123,7 +123,7 @@ namespace KoMacro { * @a Context @p context which will be used as * parent context for this context. */ - virtual void activate(KSharedPtr context); + virtual void activate(TDESharedPtr context); /** * This slot continues execution. diff --git a/kexi/plugins/macros/lib/macro.cpp b/kexi/plugins/macros/lib/macro.cpp index 808c4043..af29da57 100644 --- a/kexi/plugins/macros/lib/macro.cpp +++ b/kexi/plugins/macros/lib/macro.cpp @@ -41,7 +41,7 @@ namespace KoMacro { /** * A list of @a MacroItem instances. */ - TQValueList > itemlist; + TQValueList > itemlist; /** * The name the @a Macro has. @@ -55,7 +55,7 @@ namespace KoMacro { //constructor, initalize internal (d-pointer) name Macro::Macro(const TQString& name) : TQObject() - , KShared() + , TDEShared() , XMLHandler(this) , d( new Private() ) // create the private d-pointer instance. { @@ -88,13 +88,13 @@ const TQString Macro::toString() const } //get (d-pointer) itemlist -TQValueList >& Macro::items() const +TQValueList >& Macro::items() const { return d->itemlist; } //add a macroitem to internal (d-pointer) itemlist -void Macro::addItem(KSharedPtr item) +void Macro::addItem(TDESharedPtr item) { d->itemlist.append(item); } @@ -105,15 +105,15 @@ void Macro::clearItems() } //run our macro -KSharedPtr Macro::execute(TQObject* sender) +TDESharedPtr Macro::execute(TQObject* sender) { - kdDebug() << "Macro::execute(KSharedPtr)" << endl; + kdDebug() << "Macro::execute(TDESharedPtr)" << endl; //create context in which macro can/should run - KSharedPtr c = KSharedPtr( new Context(this) ); + TDESharedPtr c = TDESharedPtr( new Context(this) ); if(sender) { // set the sender-variable if we got a sender TQObject. - c->setVariable("[sender]", KSharedPtr( new Variable(sender) )); + c->setVariable("[sender]", TDESharedPtr( new Variable(sender) )); } //connect(context, TQT_SIGNAL(activated()), this, TQT_SIGNAL(activated())); diff --git a/kexi/plugins/macros/lib/macro.h b/kexi/plugins/macros/lib/macro.h index 80d50deb..cc1fd77e 100644 --- a/kexi/plugins/macros/lib/macro.h +++ b/kexi/plugins/macros/lib/macro.h @@ -40,7 +40,7 @@ namespace KoMacro { */ class KOMACRO_EXPORT Macro : 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 { Q_OBJECT @@ -53,7 +53,7 @@ namespace KoMacro { * class should use this typemap rather then the TQMap direct. That * way we are more flexible on future changes. */ - typedef TQMap > Map; + typedef TQMap > Map; /** * Constructor. @@ -87,13 +87,13 @@ namespace KoMacro { * @return a list of @a MacroItem instances which * are children of this @a Macro . */ - TQValueList< KSharedPtr >& items() const; + TQValueList< TDESharedPtr >& items() const; /** * Add the @a MacroItem @p item to the list of items * this @a Macro has. */ - void addItem(KSharedPtr item); + void addItem(TDESharedPtr item); /** * Removes all @a MacroItem instances this @a Macro has. @@ -117,7 +117,7 @@ namespace KoMacro { * @param context The @a Context this @a Macro should * be executed in. */ - virtual KSharedPtr execute(TQObject* sender); + virtual TDESharedPtr execute(TQObject* sender); private: /// @internal d-pointer class. diff --git a/kexi/plugins/macros/lib/macroitem.cpp b/kexi/plugins/macros/lib/macroitem.cpp index cf317fab..33e69c31 100644 --- a/kexi/plugins/macros/lib/macroitem.cpp +++ b/kexi/plugins/macros/lib/macroitem.cpp @@ -35,7 +35,7 @@ namespace KoMacro { /** * The @a Action this @a MacroItem has. */ - KSharedPtr action; + TDESharedPtr action; /** * The comment this @a MacroItem has. @@ -109,7 +109,7 @@ namespace KoMacro { } MacroItem::MacroItem() - : KShared() + : TDEShared() , d( new Private() ) { } @@ -129,29 +129,29 @@ void MacroItem::setComment(const TQString& comment) d->comment = comment; } -KSharedPtr MacroItem::action() const +TDESharedPtr MacroItem::action() const { return d->action; } -void MacroItem::setAction(KSharedPtr action) +void MacroItem::setAction(TDESharedPtr action) { d->action = action; } TQVariant MacroItem::variant(const TQString& name, bool checkaction) const { - KSharedPtr v = variable(name, checkaction); + TDESharedPtr v = variable(name, checkaction); return v.data() ? v->variant() : TQVariant(); } -KSharedPtr MacroItem::variable(const TQString& name, bool checkaction) const +TDESharedPtr MacroItem::variable(const TQString& name, bool checkaction) const { if(d->variables.contains(name)) return d->variables[name]; if(checkaction && d->action.data()) return d->action->variable(name); - return KSharedPtr(0); + return TDESharedPtr(0); } 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 // the case, we try to use that action to preserve the type of the variant. - KSharedPtr actionvariable = d->action ? d->action->variable(name) : KSharedPtr(0); + TDESharedPtr actionvariable = d->action ? d->action->variable(name) : TDESharedPtr(0); // 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). @@ -172,12 +172,12 @@ bool MacroItem::setVariant(const TQString& name, const TQVariant& variant) : variant; // don't cast anything, just leave the string-type... // Now let's try to determinate the variable which should be changed. - KSharedPtr variable = d->variables[name]; + TDESharedPtr variable = d->variables[name]; if(! variable.data()) { // if there exists no such variable yet, create one. kdDebug() << "MacroItem::setVariable() Creating new variable name=" << name << endl; - variable = KSharedPtr( new Variable() ); + variable = TDESharedPtr( new Variable() ); variable->setName(name); d->variables.replace(name, variable); } @@ -201,11 +201,11 @@ bool MacroItem::setVariant(const TQString& name, const TQVariant& variant) return true; } -KSharedPtr MacroItem::addVariable(const TQString& name, const TQVariant& variant) +TDESharedPtr MacroItem::addVariable(const TQString& name, const TQVariant& variant) { Q_ASSERT(! d->variables.contains(name) ); // Create a new Variable. - KSharedPtr variable = KSharedPtr( new Variable() ); + TDESharedPtr variable = TDESharedPtr( new Variable() ); variable->setName(name); // Put it into the Variable-map. diff --git a/kexi/plugins/macros/lib/macroitem.h b/kexi/plugins/macros/lib/macroitem.h index 6b996e70..210a9585 100644 --- a/kexi/plugins/macros/lib/macroitem.h +++ b/kexi/plugins/macros/lib/macroitem.h @@ -43,7 +43,7 @@ namespace KoMacro { * MacroItem choosen @a Action implementation) and holds the by the * 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: @@ -51,7 +51,7 @@ namespace KoMacro { /** * A list of \a MacroItem instances. */ - typedef TQValueList > List; + typedef TQValueList > List; /** * Constructor. @@ -81,12 +81,12 @@ namespace KoMacro { * no @a Action defined yet else the returned * @a Action will be used to implement the execution. */ - KSharedPtr action() const; + TDESharedPtr action() const; /** * Set the @a Action @param action this @a MacroItem points to. */ - void setAction(KSharedPtr action); + void setAction(TDESharedPtr action); /** * @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 * doesn't have such a name. */ - KSharedPtr variable(const TQString& name, bool checkaction = false) const; + TDESharedPtr variable(const TQString& name, bool checkaction = false) const; /** * @return a map of @a Variable instances. */ - TQMap > variables() const; + TQMap > variables() const; /** * 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 * @a TQVariant @param variant to our @a MacroItem instance. */ - KSharedPtr addVariable(const TQString& name, const TQVariant& variant); + TDESharedPtr addVariable(const TQString& name, const TQVariant& variant); private: /// @internal d-pointer class. diff --git a/kexi/plugins/macros/lib/manager.cpp b/kexi/plugins/macros/lib/manager.cpp index f73ddaa8..5ab431d5 100644 --- a/kexi/plugins/macros/lib/manager.cpp +++ b/kexi/plugins/macros/lib/manager.cpp @@ -41,10 +41,10 @@ namespace KoMacro { { public: KXMLGUIClient* const xmlguiclient; - TQMap > macros; + TQMap > macros; TQStringList actionnames; - TQMap > actions; + TQMap > actions; TQMap > objects; @@ -108,12 +108,12 @@ bool Manager::hasMacro(const TQString& macroname) return d->macros.contains(macroname); } -KSharedPtr Manager::getMacro(const TQString& macroname) +TDESharedPtr Manager::getMacro(const TQString& macroname) { return d->macros[macroname]; } -void Manager::addMacro(const TQString& macroname, KSharedPtr macro) +void Manager::addMacro(const TQString& macroname, TDESharedPtr macro) { d->macros.replace(macroname, macro); } @@ -123,13 +123,13 @@ void Manager::removeMacro(const TQString& macroname) d->macros.remove(macroname); } -KSharedPtr Manager::createMacro(const TQString& macroname) +TDESharedPtr Manager::createMacro(const TQString& macroname) { - KSharedPtr macro = KSharedPtr( new Macro(macroname) ); + TDESharedPtr macro = TDESharedPtr( new Macro(macroname) ); return macro; } -KSharedPtr Manager::action(const TQString& name) const +TDESharedPtr Manager::action(const TQString& name) const { return d->actions[name]; } @@ -144,7 +144,7 @@ TQStringList Manager::actionNames() const return d->actionnames; } -void Manager::publishAction(KSharedPtr action) +void Manager::publishAction(TDESharedPtr action) { const TQString name = action->name(); if(! d->actions.contains(name)) { diff --git a/kexi/plugins/macros/lib/manager.h b/kexi/plugins/macros/lib/manager.h index 733ffb75..5e3ce084 100644 --- a/kexi/plugins/macros/lib/manager.h +++ b/kexi/plugins/macros/lib/manager.h @@ -122,7 +122,7 @@ namespace KoMacro { * \return the \a Macro defined with \p macroname * or NULL if we don't have such a \a Macro. */ - KSharedPtr getMacro(const TQString& macroname); + TDESharedPtr getMacro(const TQString& macroname); /** * Add a new \a Macro to the list of known macros. If @@ -134,7 +134,7 @@ namespace KoMacro { * accessible as. * \param macro The \a Macro instance. */ - void addMacro(const TQString& macroname, KSharedPtr macro); + void addMacro(const TQString& macroname, TDESharedPtr macro); /** * 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 * \a Manager instance. */ - KSharedPtr createMacro(const TQString& macroname); + TDESharedPtr createMacro(const TQString& macroname); #if 0 /** @@ -164,20 +164,20 @@ namespace KoMacro { * * @deprecated Moved to common XMLReader/XMLWriter classes. Use Macro::xmlHandler() ! */ - KSharedPtr createAction(const TQDomElement& element); + TDESharedPtr createAction(const TQDomElement& element); #endif /** * @return the @a Action which was published under the - * name @p name or returns an empty @a KSharedPtr object + * name @p name or returns an empty @a TDESharedPtr object * if there was no such @a Action published. */ - KSharedPtr action(const TQString& name) const; + TDESharedPtr action(const TQString& name) const; /** * @return a map of all published actions. */ - TQMap > actions() const; + TQMap > actions() const; /** * @return a list of all published actions. @@ -188,7 +188,7 @@ namespace KoMacro { * Publish the @a Action @p action . The published @a Action * will be accessible via it's unique name. */ - void publishAction(KSharedPtr action); + void publishAction(TDESharedPtr action); /** * Publish the passed TQObject @p object. Those object will diff --git a/kexi/plugins/macros/lib/metamethod.cpp b/kexi/plugins/macros/lib/metamethod.cpp index 18839780..6642c706 100644 --- a/kexi/plugins/macros/lib/metamethod.cpp +++ b/kexi/plugins/macros/lib/metamethod.cpp @@ -70,7 +70,7 @@ namespace KoMacro { * if this @a MetaMethod doesn't belong to any @a MetaObject * yet. */ - KSharedPtr object; + TDESharedPtr object; /** * The @a MetaMethod::Type this method provides access @@ -81,8 +81,8 @@ namespace KoMacro { } -MetaMethod::MetaMethod(const TQString& signature, Type type, KSharedPtr object) - : KShared() +MetaMethod::MetaMethod(const TQString& signature, Type type, TDESharedPtr object) + : TDEShared() , d( new Private() ) // create the private d-pointer instance. { d->signature = signature; @@ -135,7 +135,7 @@ MetaMethod::~MetaMethod() delete d; } -KSharedPtr const MetaMethod::object() const +TDESharedPtr const MetaMethod::object() const { return d->object; } @@ -180,8 +180,8 @@ TQUObject* MetaMethod::toTQUObject(Variable::List arguments) uo[0] = TQUObject(); // empty placeholder for the returnvalue. for(uint i = 0; i < argsize; i++) { - KSharedPtr metaargument = d->arguments[i]; - KSharedPtr variable = arguments[i + 1]; + TDESharedPtr metaargument = d->arguments[i]; + TDESharedPtr variable = arguments[i + 1]; if ( !variable ) { throw Exception(TQString("Variable is undefined !")); @@ -254,7 +254,7 @@ TQUObject* MetaMethod::toTQUObject(Variable::List arguments) return uo; } -KSharedPtr MetaMethod::toVariable(TQUObject* uo) +TDESharedPtr MetaMethod::toVariable(TQUObject* uo) { const TQString desc( uo->type->desc() ); @@ -303,16 +303,16 @@ Variable::List MetaMethod::toVariableList(TQUObject* uo) return list; } -KSharedPtr MetaMethod::invoke(Variable::List arguments) +TDESharedPtr MetaMethod::invoke(Variable::List arguments) { - kdDebug() << "KSharedPtr MetaMethod::invoke(Variable::List arguments)" << endl; + kdDebug() << "TDESharedPtr MetaMethod::invoke(Variable::List arguments)" << endl; if(! d->object) { throw Exception("MetaObject is undefined."); } TQObject* obj = d->object->object(); - KSharedPtr returnvalue; + TDESharedPtr returnvalue; TQUObject* qu = 0; try { diff --git a/kexi/plugins/macros/lib/metamethod.h b/kexi/plugins/macros/lib/metamethod.h index daf7dfcb..8be7b556 100644 --- a/kexi/plugins/macros/lib/metamethod.h +++ b/kexi/plugins/macros/lib/metamethod.h @@ -43,7 +43,7 @@ namespace KoMacro { * The design tried to limit future porting to TQt4 by providing a * somewhat similar API to the TQt4 TQMeta* stuff. */ - class KOMACRO_EXPORT MetaMethod : public KShared + class KOMACRO_EXPORT MetaMethod : public TDEShared { public: @@ -69,7 +69,7 @@ namespace KoMacro { * belongs to. Each @a MethodMethod is associated with * exactly one @a MetaObject . */ - explicit MetaMethod(const TQString& signature, Type type = Unknown, KSharedPtr object = 0); + explicit MetaMethod(const TQString& signature, Type type = Unknown, TDESharedPtr object = 0); /** * Destructor. @@ -80,7 +80,7 @@ namespace KoMacro { * @return the @a MetaObject instance this @a MethodMethod * belongs to. */ - KSharedPtr const object() const; + TDESharedPtr const object() const; /** * @return the signature this @a MetaMethod has. It could @@ -112,31 +112,31 @@ namespace KoMacro { * @return the signature arguments as parsed list of * @a MetaParameter instances. */ - TQValueList< KSharedPtr > arguments() const; + TQValueList< TDESharedPtr > arguments() const; /** * Translate the passed @p arguments list of @a Variable instances * into a TQt3 TQUObject* array. */ - TQUObject* toTQUObject(TQValueList< KSharedPtr > arguments); + TQUObject* toTQUObject(TQValueList< TDESharedPtr > arguments); /** * Translate the passed @p uo TQUObject reference into an internal used * @a Variable instances. */ - KSharedPtr toVariable(TQUObject* uo); + TDESharedPtr toVariable(TQUObject* uo); /** * Translate the passed @p uo TQUObject array into an internal used * list of @a Variable instances. */ - TQValueList< KSharedPtr > toVariableList(TQUObject* uo); + TQValueList< TDESharedPtr > toVariableList(TQUObject* uo); /** * Invoke the @a MetaMethod with the optional arguments * @p arguments and return a variable. */ - KSharedPtr invoke(TQValueList< KSharedPtr > arguments); + TDESharedPtr invoke(TQValueList< TDESharedPtr > arguments); private: /// @internal d-pointer class. diff --git a/kexi/plugins/macros/lib/metaobject.cpp b/kexi/plugins/macros/lib/metaobject.cpp index ee865c82..deaf4974 100644 --- a/kexi/plugins/macros/lib/metaobject.cpp +++ b/kexi/plugins/macros/lib/metaobject.cpp @@ -56,7 +56,7 @@ namespace KoMacro { } MetaObject::MetaObject(TQObject* const object) - : KShared() + : TDEShared() , d( new Private(object) ) // create the private d-pointer instance. { } @@ -106,7 +106,7 @@ int MetaObject::indexOfSlot(const char* slot) const return slotid; } -KSharedPtr MetaObject::method(int index) +TDESharedPtr MetaObject::method(int index) { TQObject* obj = object(); MetaMethod::Type type = MetaMethod::Slot; @@ -131,20 +131,20 @@ KSharedPtr MetaObject::method(int index) return new MetaMethod(metadata->name, type, this); } -KSharedPtr MetaObject::signal(const char* signal) +TDESharedPtr MetaObject::signal(const char* signal) { return method( indexOfSignal(signal) ); } -KSharedPtr MetaObject::slot(const char* slot) +TDESharedPtr MetaObject::slot(const char* slot) { return method( indexOfSlot(slot) ); } -KSharedPtr MetaObject::invokeMethod(int index, Variable::List arguments) +TDESharedPtr MetaObject::invokeMethod(int index, Variable::List arguments) { // kdDebug() << "MetaObject::invokeMethod(int index, Variable::List arguments)" << endl; - KSharedPtr m = method(index); + TDESharedPtr m = method(index); // kdDebug() << "MetaObject::invokeMethod(int index, Variable::List arguments) return" << endl; return m->invoke(arguments); } diff --git a/kexi/plugins/macros/lib/metaobject.h b/kexi/plugins/macros/lib/metaobject.h index a1a52562..e3ae98a1 100644 --- a/kexi/plugins/macros/lib/metaobject.h +++ b/kexi/plugins/macros/lib/metaobject.h @@ -38,7 +38,7 @@ namespace KoMacro { * The design tried to limit future porting to TQt4 by providing a * somewhat similar API to the TQt4 TQMeta* stuff. */ - class KOMACRO_EXPORT MetaObject : public KShared + class KOMACRO_EXPORT MetaObject : public TDEShared { public: @@ -78,19 +78,19 @@ namespace KoMacro { * @return the @a MetaMethod that matches to the * index @p index . */ - KSharedPtr method(int index); + TDESharedPtr method(int index); /** * @return a @a MetaMethod for the signal @p signal . */ - KSharedPtr signal(const char* signal); + TDESharedPtr signal(const char* signal); /** * @return a @a MetaMethod for the slot @p slot . */ - KSharedPtr slot(const char* slot); + TDESharedPtr slot(const char* slot); -//KSharedPtr addSlot(const char* slot); +//TDESharedPtr addSlot(const char* slot); //void connectSignal(TQObject* obj, const char* signal); /** @@ -104,7 +104,7 @@ namespace KoMacro { * @return The returnvalue the method provides and that got * returned if the execution is done. */ - KSharedPtr invokeMethod(int index, TQValueList< KSharedPtr > arguments); + TDESharedPtr invokeMethod(int index, TQValueList< TDESharedPtr > arguments); private: /// @internal d-pointer class. diff --git a/kexi/plugins/macros/lib/metaparameter.cpp b/kexi/plugins/macros/lib/metaparameter.cpp index ed921cfe..68a48fc1 100644 --- a/kexi/plugins/macros/lib/metaparameter.cpp +++ b/kexi/plugins/macros/lib/metaparameter.cpp @@ -58,7 +58,7 @@ namespace KoMacro { } MetaParameter::MetaParameter(const TQString& signatureargument) - : KShared() + : TDEShared() , d( new Private() ) // create the private d-pointer instance. { d->type = TypeNone; @@ -137,7 +137,7 @@ void MetaParameter::setSignatureArgument(const TQString& signatureargument) } } -bool MetaParameter::validVariable(KSharedPtr variable) const +bool MetaParameter::validVariable(TDESharedPtr variable) const { if( type() != variable->type() ) { return false; diff --git a/kexi/plugins/macros/lib/metaparameter.h b/kexi/plugins/macros/lib/metaparameter.h index fa9df552..ec927c53 100644 --- a/kexi/plugins/macros/lib/metaparameter.h +++ b/kexi/plugins/macros/lib/metaparameter.h @@ -39,7 +39,7 @@ namespace KoMacro { * The design tried to limit future porting to TQt4 by providing a * 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. */ - typedef TQValueList > List; + typedef TQValueList > List; /** * Constructor. @@ -114,7 +114,7 @@ namespace KoMacro { * valid for this @a MetaParameter . Valid means, that * the variable has a castable type. */ - bool validVariable(KSharedPtr variable) const; + bool validVariable(TDESharedPtr variable) const; protected: diff --git a/kexi/plugins/macros/lib/variable.cpp b/kexi/plugins/macros/lib/variable.cpp index 3661ef9a..61e349df 100644 --- a/kexi/plugins/macros/lib/variable.cpp +++ b/kexi/plugins/macros/lib/variable.cpp @@ -218,7 +218,7 @@ Variable::List Variable::children() const return d->children; } -void Variable::appendChild(KSharedPtr variable) +void Variable::appendChild(TDESharedPtr variable) { d->children.append(variable); } diff --git a/kexi/plugins/macros/lib/variable.h b/kexi/plugins/macros/lib/variable.h index 14adf09c..cb7334aa 100644 --- a/kexi/plugins/macros/lib/variable.h +++ b/kexi/plugins/macros/lib/variable.h @@ -32,7 +32,7 @@ namespace KoMacro { /** * A variable value used to provide abstract access to variables. The * 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. */ class KOMACRO_EXPORT Variable : public MetaParameter @@ -58,12 +58,12 @@ namespace KoMacro { /** * A list of variables. */ - typedef TQValueList > List; + typedef TQValueList > List; /** * A map of variables. */ - typedef TQMap > Map; + typedef TQMap > Map; /** * Default constructor. @@ -185,7 +185,7 @@ namespace KoMacro { * Append a @a Variable to the list of children this * @a Variable has. */ - void appendChild(KSharedPtr variable); + void appendChild(TDESharedPtr variable); /** * Clear the list of children this @a Variable has. diff --git a/kexi/plugins/macros/lib/xmlhandler.cpp b/kexi/plugins/macros/lib/xmlhandler.cpp index 5b53d51b..65f1a4cf 100644 --- a/kexi/plugins/macros/lib/xmlhandler.cpp +++ b/kexi/plugins/macros/lib/xmlhandler.cpp @@ -99,7 +99,7 @@ bool XMLHandler::parseXML(const TQDomElement& element) const TQDomElement itemelem = itemnode.toElement(); // Create a new MacroItem - KSharedPtr item = new MacroItem(); + TDESharedPtr item = new MacroItem(); // Add the new item to our Macro. d->macro->addItem( item ); @@ -107,7 +107,7 @@ bool XMLHandler::parseXML(const TQDomElement& element) // Each MacroItem may point to an Action instance. We // try to determinate this action now and if it's defined // and available, we set it. - KSharedPtr action = Manager::self()->action( itemelem.attribute("action") ); + TDESharedPtr action = Manager::self()->action( itemelem.attribute("action") ); if(action.data()) { item->setAction(action); } @@ -157,14 +157,14 @@ TQDomElement XMLHandler::toXML() //macroelem.setAttribute("name",d->macro->name()); // The list of MacroItem-children a Macro provides. - TQValueList > items = d->macro->items(); + TQValueList > items = d->macro->items(); // Create an iterator... - TQValueList >::ConstIterator it(items.constBegin()), end(items.constEnd()); + TQValueList >::ConstIterator it(items.constBegin()), end(items.constEnd()); // ...and iterate over the list of children the Macro provides. for(;it != end; ++it) { // We are iterating over MacroItem instances. - KSharedPtr item = *it; + TDESharedPtr item = *it; // Flag to determinate if we really need to remember this item what // is only the case if comment or action is defined. @@ -174,7 +174,7 @@ TQDomElement XMLHandler::toXML() TQDomElement itemelem = document.createElement("item"); // Each MacroItem could point to an Action provided by the Manager. - const KSharedPtr action = item->action(); + const TDESharedPtr action = item->action(); if( action ) { append = true; @@ -184,10 +184,10 @@ TQDomElement XMLHandler::toXML() // Each MacroItem could have a list of variables. We // iterate through that list and build a element // for each single variable. - TQMap > varmap = item->variables(); + TQMap > varmap = item->variables(); - for(TQMap >::ConstIterator vit = varmap.constBegin(); vit != varmap.constEnd(); ++vit) { - const KSharedPtr v = vit.data(); + for(TQMap >::ConstIterator vit = varmap.constBegin(); vit != varmap.constEnd(); ++vit) { + const TDESharedPtr v = vit.data(); if(! v.data()) { // skip if the variable is NULL. continue; diff --git a/kexi/plugins/macros/tests/actiontests.cpp b/kexi/plugins/macros/tests/actiontests.cpp index 26e38b32..912d9ff3 100644 --- a/kexi/plugins/macros/tests/actiontests.cpp +++ b/kexi/plugins/macros/tests/actiontests.cpp @@ -73,11 +73,11 @@ namespace KoMacroTest { TQDomDocument* doomdocument; - KSharedPtr macro; + TDESharedPtr macro; - TQValueList< KSharedPtr > items; + TQValueList< TDESharedPtr > items; - KSharedPtr actionptr; + TDESharedPtr actionptr; Private() : xmlguiclient(0) @@ -90,7 +90,7 @@ namespace KoMacroTest { }; } -typedef TQValueList< KSharedPtr >::size_type sizetype; +typedef TQValueList< TDESharedPtr >::size_type sizetype; ActionTests::ActionTests() @@ -147,7 +147,7 @@ void ActionTests::testMacro() kdDebug()<<"===================== testMacro() ======================" << endl; //fetch Items and .. - //TQValueList< KSharedPtr >& items = d->macro->items(); + //TQValueList< TDESharedPtr >& items = d->macro->items(); //... check that there is one KOMACROTEST_XASSERT( d->items.count(), sizetype(0) ); @@ -158,7 +158,7 @@ void ActionTests::testAction() kdDebug()<<"===================== testAction() ======================" << endl; //get it - //KSharedPtr actionptr = d->items[0]->action(); + //TDESharedPtr actionptr = d->items[0]->action(); //-> check that it is not null KOMACROTEST_XASSERT(sizetype(d->actionptr.data()), sizetype(0)); } @@ -167,7 +167,7 @@ void ActionTests::testText() { kdDebug()<<"===================== testText() ======================" << endl; - //KSharedPtr actionptr = items[0]->action(); + //TDESharedPtr actionptr = items[0]->action(); const TQString leetSpeech = "']['3 $']['"; @@ -184,7 +184,7 @@ void ActionTests::testName() { kdDebug()<<"===================== testName() ======================" << endl; - //KSharedPtr actionptr = items[0]->action(); + //TDESharedPtr actionptr = items[0]->action(); //check name KOMACROTEST_ASSERT(d->actionptr->name(),TQString("testaction")); @@ -198,7 +198,7 @@ void ActionTests::testComment() { kdDebug()<<"===================== testComment() ======================" << endl; - //KSharedPtr actionptr = items[0]->action(); + //TDESharedPtr actionptr = items[0]->action(); //check comment KOMACROTEST_XASSERT(d->actionptr->comment(),TQString("No Comment!")); diff --git a/kexi/plugins/macros/tests/commontests.cpp b/kexi/plugins/macros/tests/commontests.cpp index 41234eca..9d43ac41 100644 --- a/kexi/plugins/macros/tests/commontests.cpp +++ b/kexi/plugins/macros/tests/commontests.cpp @@ -94,7 +94,7 @@ namespace KoMacroTest { } -typedef TQValueList< KSharedPtr >::size_type sizetype; +typedef TQValueList< TDESharedPtr >::size_type sizetype; CommonTests::CommonTests() : KUnitTest::SlotTester() @@ -164,7 +164,7 @@ void CommonTests::testAction() TQDomElement const domelement = d->doomdocument->documentElement(); - KSharedPtr macro = KoMacro::Manager::self()->createMacro("testMacro"); + TDESharedPtr macro = KoMacro::Manager::self()->createMacro("testMacro"); //Is our XML parseable ? KOMACROTEST_ASSERT(macro->parseXML(domelement),true); @@ -172,19 +172,19 @@ void CommonTests::testAction() //?? macro->execute(this); - //create list of KSharedPtr from the childs of the macro - TQValueList< KSharedPtr >& items = macro->items(); + //create list of TDESharedPtr from the childs of the macro + TQValueList< TDESharedPtr >& items = macro->items(); //check that there is one KOMACROTEST_ASSERT( items.count(), sizetype(1) ); //fetch the first one - KSharedPtr actionptr = items[0]->action(); + TDESharedPtr actionptr = items[0]->action(); //How do we know that an action exist ? //-> check that it is not null KOMACROTEST_XASSERT(sizetype(actionptr.data()), sizetype(0)); //fetch the "teststring"-variable - KSharedPtr variableptr = actionptr->variable("teststring"); + TDESharedPtr variableptr = actionptr->variable("teststring"); //check that it is not null KOMACROTEST_XASSERT(sizetype(variableptr.data()), sizetype(0)); //check that it is " " @@ -249,7 +249,7 @@ void 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 - //../lib/macroitem.h:131: note: candidates are: TQStringList KoMacro::MacroItem::setVariable(const TQString&, KSharedPtr) + //../lib/macroitem.h:131: note: candidates are: TQStringList KoMacro::MacroItem::setVariable(const TQString&, TDESharedPtr) //../lib/macroitem.h:137: note: TQStringList KoMacro::MacroItem::setVariable(const TQString&, const TQVariant&) macroitem->setVariable("testint",(int) 0); @@ -285,7 +285,7 @@ void CommonTests::testXmlhandler() kdDebug()<<"===================== testXmlhandler() ======================" << endl; // Local Init - KSharedPtr macro = KoMacro::Manager::self()->createMacro("testMacro"); + TDESharedPtr macro = KoMacro::Manager::self()->createMacro("testMacro"); TQDomElement domelement; // Save old doomdocument @@ -428,9 +428,9 @@ void CommonTests::testFunction() "" )); - //create an KomacroFunction with our data, and put it into a KSharedPtr - KSharedPtr functionptr = ::KoMacro::Manager::self()->createAction( domdocument.documentElement() ); - //cast KSharedPtr to KoMacro-"Function" + //create an KomacroFunction with our data, and put it into a TDESharedPtr + TDESharedPtr functionptr = ::KoMacro::Manager::self()->createAction( domdocument.documentElement() ); + //cast TDESharedPtr to KoMacro-"Function" KoMacro::Function* func = dynamic_cast( functionptr.data() ); //check that function is not null KOMACROTEST_XASSERT((int) func, 0); @@ -449,12 +449,12 @@ void CommonTests::testFunction() KOMACROTEST_ASSERT( TQString(func->slot()), TQString("myslot(const TQString&,int)") ); //create KoMacro-MetaObject from receiverObject - KSharedPtr receivermetaobject = func->receiverObject(); + TDESharedPtr receivermetaobject = func->receiverObject(); //check that receivermetaobject.data is not null KOMACROTEST_XASSERT((int) receivermetaobject.data(), 0); //create KoMacro-MetaMethod from receiverObject - KSharedPtr receivermetamethod = receivermetaobject->slot( func->slot().latin1() ); + TDESharedPtr receivermetamethod = receivermetaobject->slot( func->slot().latin1() ); //check that receivermetamethod.data is not null KOMACROTEST_XASSERT((int) receivermetamethod.data(), 0); @@ -469,7 +469,7 @@ void CommonTests::testFunction() // firstrun we have a TQString, secondrun we have an int switch(i) { case 0: { // returnvalue - KOMACROTEST_ASSERT(*it, KSharedPtr(NULL)); + KOMACROTEST_ASSERT(*it, TDESharedPtr(NULL)); } break; case 1: { // first parameter //check first variable of func is the same as argument1 @@ -491,10 +491,10 @@ void CommonTests::testFunction() KOMACROTEST_ASSERT( funcvariables.count(), uint(3) ); // check that the first argument (the returnvalue) is empty - KOMACROTEST_ASSERT( funcvariables[0], KSharedPtr(NULL) ); + KOMACROTEST_ASSERT( funcvariables[0], TDESharedPtr(NULL) ); //create a KoMacro-Variable-Ptr from first func argument - KSharedPtr stringvar = funcvariables[1]; + TDESharedPtr stringvar = funcvariables[1]; //check that it is not null KOMACROTEST_XASSERT((int) stringvar.data(),0); //check via TQVariant type that stringvar is from Type Variant @@ -505,7 +505,7 @@ void CommonTests::testFunction() KOMACROTEST_ASSERT( stringvar->toString(), argument1 ); //create a KoMacro-Variable-Ptr from second func argument - KSharedPtr intvar = funcvariables[2]; + TDESharedPtr intvar = funcvariables[2]; //check that it is not null KOMACROTEST_XASSERT((int) intvar.data(), 0); //check via TQVariant type that stringvar is from Type Variant @@ -516,7 +516,7 @@ void CommonTests::testFunction() KOMACROTEST_ASSERT( intvar->toInt(), argument2 ); //returnvalue see testobject .... - KSharedPtr funcreturnvalue = receivermetamethod->invoke( funcvariables ); + TDESharedPtr funcreturnvalue = receivermetamethod->invoke( funcvariables ); kdDebug() << "CommonTests::testFunction() RETURNVALUE =====> " << funcreturnvalue->toString() << endl; KOMACROTEST_ASSERT( funcreturnvalue->toInt(), argument2 ); @@ -543,8 +543,8 @@ void CommonTests::testIntFunction() "" )); - //create an KomacroFunction with our data, and put it into a KSharedPtr - KSharedPtr functionptr = ::KoMacro::Manager::self()->createAction( domdocument.documentElement() ); + //create an KomacroFunction with our data, and put it into a TDESharedPtr + TDESharedPtr functionptr = ::KoMacro::Manager::self()->createAction( domdocument.documentElement() ); //Cast data to function KoMacro::Function* func = dynamic_cast( functionptr.data() ); //check that it is not null @@ -573,8 +573,8 @@ void CommonTests::testDoubleFunction() "" )); - //create an KomacroFunction with our data, and put it into a KSharedPtr - KSharedPtr functionptr = ::KoMacro::Manager::self()->createAction( domdocument.documentElement() ); + //create an KomacroFunction with our data, and put it into a TDESharedPtr + TDESharedPtr functionptr = ::KoMacro::Manager::self()->createAction( domdocument.documentElement() ); //Cast data to function KoMacro::Function* func = dynamic_cast( functionptr.data() ); //check that it is not null @@ -602,8 +602,8 @@ void CommonTests::testTQStringFunction() "" )); - //create an KomacroFunction with our data, and put it into a KSharedPtr - KSharedPtr functionptr = ::KoMacro::Manager::self()->createAction( domdocument.documentElement() ); + //create an KomacroFunction with our data, and put it into a TDESharedPtr + TDESharedPtr functionptr = ::KoMacro::Manager::self()->createAction( domdocument.documentElement() ); //Cast data to function KoMacro::Function* func = dynamic_cast( functionptr.data() ); //check that it is not null @@ -621,7 +621,7 @@ void CommonTests::testMacro() TQDomElement const domelement = d->doomdocument->documentElement(); - KSharedPtr macro = KoMacro::Manager::self()->createMacro("testMacro"); + TDESharedPtr macro = KoMacro::Manager::self()->createMacro("testMacro"); //Is our XML parseable ? KOMACROTEST_ASSERT(macro->parseXML(domelement),true); @@ -639,7 +639,7 @@ void CommonTests::testMacro() // )); // // //create Macro -// // KSharedPtr macroptr = ::KoMacro::Manager::self()->createAction( domdocument.documentElement() ); +// // TDESharedPtr macroptr = ::KoMacro::Manager::self()->createAction( domdocument.documentElement() ); // //cast data to Macro // KoMacro::Macro* macro = dynamic_cast( macroptr.data() ); //check that it is not null @@ -661,11 +661,11 @@ void CommonTests::testMacro() */ //create list of KsharedPtr from the childs of the macro - TQValueList< KSharedPtr >& items = macro->items(); + TQValueList< TDESharedPtr >& items = macro->items(); //check that there is one KOMACROTEST_ASSERT( items.count(), sizetype(1) ); //fetch the first one - KSharedPtr actionptr = items[0]->action(); + TDESharedPtr actionptr = items[0]->action(); //How do we know that an action exist ? //-> check that it is not null KOMACROTEST_XASSERT(sizetype(actionptr.data()), sizetype(0)); @@ -677,7 +677,7 @@ void CommonTests::testMacro() // KOMACROTEST_ASSERT( actionptr->comment(), TQString("") ); /* //fetch the second one - KSharedPtr myfuncptr = children[1]; + TDESharedPtr myfuncptr = children[1]; //cast it to function KoMacro::Function* myfunc = dynamic_cast( myfuncptr.data() ); @@ -700,12 +700,12 @@ void CommonTests::testMacro() myfunc->activate(); */ //create another macro - KSharedPtr yanMacro = KoMacro::Manager::self()->createMacro("testMacro2"); + TDESharedPtr yanMacro = KoMacro::Manager::self()->createMacro("testMacro2"); KOMACROTEST_ASSERT(yanMacro->parseXML(domelement),true); //create two more macros - //KSharedPtr yanActionptr2 = ::KoMacro::Manager::self()->createAction( domdocument.documentElement() ); - //KSharedPtr yanActionptr3 = ::KoMacro::Manager::self()->createAction( domdocument.documentElement() ); + //TDESharedPtr yanActionptr2 = ::KoMacro::Manager::self()->createAction( domdocument.documentElement() ); + //TDESharedPtr yanActionptr3 = ::KoMacro::Manager::self()->createAction( domdocument.documentElement() ); //check that they aren?t null KOMACROTEST_XASSERT(sizetype(yanMacro.data()), sizetype(0)); @@ -713,7 +713,7 @@ void CommonTests::testMacro() //KOMACROTEST_XASSERT((int) yanActionptr3.data(), 0); //create a list of the children from yanMacro - //TQValueList< KSharedPtr > yanChildren = yanMacro->children(); + //TQValueList< TDESharedPtr > yanChildren = yanMacro->children(); //check that there are two //KOMACROTEST_ASSERT(yanChildren.count(), uint(2)); /* @@ -769,7 +769,7 @@ void CommonTests::testDom() { "" )); //create functiom - KSharedPtr macroptr = ::KoMacro::Manager::self()->createAction( domdocument.documentElement() ); + TDESharedPtr macroptr = ::KoMacro::Manager::self()->createAction( domdocument.documentElement() ); //try to execute function and catch exception KOMACROTEST_ASSERTEXCEPTION(KoMacro::Exception&, macroptr->activate()); @@ -853,21 +853,21 @@ void CommonTests::testVariables() )); //create an macro - KSharedPtr macroptr = ::KoMacro::Manager::self()->createAction( domdocument.documentElement() ); + TDESharedPtr macroptr = ::KoMacro::Manager::self()->createAction( domdocument.documentElement() ); //cast data to macro KoMacro::Macro* macro = dynamic_cast( macroptr.data() ); //check that it is not null KOMACROTEST_XASSERT((int) macro, 0); //create a list of its children - TQValueList< KSharedPtr > children = macro->children(); + TQValueList< TDESharedPtr > children = macro->children(); //Check that there are two children. The first child is always the returnvalue. KOMACROTEST_ASSERT( children.count(), uint(2) ); //fetch the children - KSharedPtr func1ptr = children[1]; + TDESharedPtr func1ptr = children[1]; //create new context - KSharedPtr context = new KoMacro::Context(macroptr); + TDESharedPtr context = new KoMacro::Context(macroptr); { //try to execute function with non-functional variable @@ -882,7 +882,7 @@ void CommonTests::testVariables() //execute function func1ptr->activate(context); //fetch return value - KSharedPtr returnvariable = context->variable("$MyReturnVariable"); + TDESharedPtr returnvariable = context->variable("$MyReturnVariable"); //check that it is not null KOMACROTEST_XASSERT( (int) returnvariable.data(), 0); //check that it is "Some String" @@ -895,7 +895,7 @@ void CommonTests::testVariables() //execute function func1ptr->activate(context); //fetch return value - KSharedPtr returnvariable = context->variable("$MyReturnVariable"); + TDESharedPtr returnvariable = context->variable("$MyReturnVariable"); //check that it is not null KOMACROTEST_XASSERT( (int) returnvariable.data(), 0); //check that it is 12345 diff --git a/kexi/plugins/macros/tests/macroitemtests.cpp b/kexi/plugins/macros/tests/macroitemtests.cpp index 0ac780b0..044808d7 100644 --- a/kexi/plugins/macros/tests/macroitemtests.cpp +++ b/kexi/plugins/macros/tests/macroitemtests.cpp @@ -71,7 +71,7 @@ namespace KoMacroTest { TQDomDocument* doomdocument; - KSharedPtr macro; + TDESharedPtr macro; Private() : xmlguiclient(0) @@ -83,7 +83,7 @@ namespace KoMacroTest { }; } -typedef TQValueList< KSharedPtr >::size_type sizetype; +typedef TQValueList< TDESharedPtr >::size_type sizetype; MacroitemTests::MacroitemTests() : KUnitTest::SlotTester() @@ -136,7 +136,7 @@ void MacroitemTests::testMacro() kdDebug()<<"===================== testMacro() ======================" << endl; //fetch Items and .. - TQValueList< KSharedPtr >& items = d->macro->items(); + TQValueList< TDESharedPtr >& items = d->macro->items(); //... check that there is one KOMACROTEST_XASSERT( items.count(), sizetype(0) ); @@ -148,9 +148,9 @@ void MacroitemTests::testMacroItemString() kdDebug()<<"===================== testMacroItemString() ======================" << endl; - TQValueList< KSharedPtr >& items = d->macro->items(); - KSharedPtr actionptr = items[0]->action(); - KSharedPtr variableptr = actionptr->variable(TESTSTRING); + TQValueList< TDESharedPtr >& items = d->macro->items(); + TDESharedPtr actionptr = items[0]->action(); + TDESharedPtr variableptr = actionptr->variable(TESTSTRING); //create new macroitem for testing KoMacro::MacroItem* macroitem = new KoMacro::MacroItem(); @@ -185,8 +185,8 @@ void MacroitemTests::testMacroItemInt() kdDebug()<<"===================== testMacroItemInt() ======================" << endl; - TQValueList< KSharedPtr >& items = d->macro->items(); - KSharedPtr actionptr = items[0]->action(); + TQValueList< TDESharedPtr >& items = d->macro->items(); + TDESharedPtr actionptr = items[0]->action(); //create new macroitem for testing KoMacro::MacroItem* macroitem = new KoMacro::MacroItem(); @@ -195,7 +195,7 @@ void MacroitemTests::testMacroItemInt() items.append(macroitem); macroitem->setVariable(TESTINT,INT_MIN); - KSharedPtr variableptr = macroitem->variable(TESTINT); + TDESharedPtr variableptr = macroitem->variable(TESTINT); KOMACROTEST_XASSERT(sizetype(variableptr.data()), sizetype(0)); KOMACROTEST_ASSERT(sizetype(variableptr->variant().toInt()),sizetype(INT_MIN)); @@ -226,8 +226,8 @@ void MacroitemTests::testMacroItemBool() kdDebug()<<"===================== testMacroItemBool() ======================" << endl; - TQValueList< KSharedPtr >& items = d->macro->items(); - KSharedPtr actionptr = items[0]->action(); + TQValueList< TDESharedPtr >& items = d->macro->items(); + TDESharedPtr actionptr = items[0]->action(); //create new macroitem for testing KoMacro::MacroItem* macroitem = new KoMacro::MacroItem(); @@ -236,7 +236,7 @@ void MacroitemTests::testMacroItemBool() items.append(macroitem); macroitem->setVariable(TESTBOOL,"false"); - KSharedPtr variableptr = macroitem->variable(TESTBOOL); + TDESharedPtr variableptr = macroitem->variable(TESTBOOL); KOMACROTEST_XASSERT(sizetype(variableptr.data()), sizetype(0)); KOMACROTEST_ASSERT(variableptr->variant().toBool(),false); } diff --git a/kexi/plugins/macros/tests/macrotests.cpp b/kexi/plugins/macros/tests/macrotests.cpp index d5d2c2af..7a5f30d0 100644 --- a/kexi/plugins/macros/tests/macrotests.cpp +++ b/kexi/plugins/macros/tests/macrotests.cpp @@ -83,7 +83,7 @@ namespace KoMacroTest { }; } -typedef TQValueList< KSharedPtr >::size_type sizetype; +typedef TQValueList< TDESharedPtr >::size_type sizetype; MacroTests::MacroTests() @@ -136,8 +136,8 @@ void MacroTests::testMacro() TQDomElement const domelement = d->doomdocument->documentElement(); - KSharedPtr macro1 = KoMacro::Manager::self()->createMacro("testMacro"); - KSharedPtr macro2 = KoMacro::Manager::self()->createMacro("testMacro"); + TDESharedPtr macro1 = KoMacro::Manager::self()->createMacro("testMacro"); + TDESharedPtr macro2 = KoMacro::Manager::self()->createMacro("testMacro"); //Is our XML parseable ? KOMACROTEST_ASSERT(macro1->parseXML(domelement),true); KOMACROTEST_ASSERT(macro2->parseXML(domelement),true); @@ -150,8 +150,8 @@ void MacroTests::testMacro() KOMACROTEST_ASSERT(macro1->name(), macro2->name() ); //create list of KsharedPtr from the childs of the macro - TQValueList< KSharedPtr >& items1 = macro1->items(); - TQValueList< KSharedPtr >& items2 = macro2->items(); + TQValueList< TDESharedPtr >& items1 = macro1->items(); + TQValueList< TDESharedPtr >& items2 = macro2->items(); //check that there is one KOMACROTEST_XASSERT( items1.count(), sizetype(0) ); @@ -174,7 +174,7 @@ void MacroTests::testMacro() } //fetch the first one - KSharedPtr actionptr = items1[0]->action(); + TDESharedPtr actionptr = items1[0]->action(); //check that it is not null KOMACROTEST_XASSERT(sizetype(actionptr.data()), sizetype(0)); //check that it has the right name diff --git a/kexi/plugins/macros/tests/testaction.cpp b/kexi/plugins/macros/tests/testaction.cpp index 845acd5f..4e7bb67b 100644 --- a/kexi/plugins/macros/tests/testaction.cpp +++ b/kexi/plugins/macros/tests/testaction.cpp @@ -43,16 +43,16 @@ TestAction::~TestAction() { } -bool TestAction::notifyUpdated(KSharedPtr macroitem, const TQString& name) +bool TestAction::notifyUpdated(TDESharedPtr macroitem, const TQString& name) { Q_UNUSED(macroitem); Q_UNUSED(name); return true; } -void TestAction::activate(KSharedPtr context) +void TestAction::activate(TDESharedPtr context) { - kdDebug() << "TestAction::activate(KSharedPtr)" << endl; + kdDebug() << "TestAction::activate(TDESharedPtr)" << endl; const TQString teststring = context->variable("teststring")->variant().toString(); const int testint = context->variable("testint")->variant().toInt(); const bool testbool = context->variable("testbool")->variant().toBool(); diff --git a/kexi/plugins/macros/tests/testaction.h b/kexi/plugins/macros/tests/testaction.h index 43ce74bb..bb41e5fb 100644 --- a/kexi/plugins/macros/tests/testaction.h +++ b/kexi/plugins/macros/tests/testaction.h @@ -63,7 +63,7 @@ namespace KoMacroTest { * @return true if the update was successfully else false * is returned. */ - virtual bool notifyUpdated(KSharedPtr macroitem, const TQString& name); + virtual bool notifyUpdated(TDESharedPtr macroitem, const TQString& name); public slots: @@ -71,7 +71,7 @@ namespace KoMacroTest { * Called if the @a Action should be executed within the * defined @p context . */ - virtual void activate(KSharedPtr context); + virtual void activate(TDESharedPtr context); }; } diff --git a/kexi/plugins/macros/tests/variabletests.cpp b/kexi/plugins/macros/tests/variabletests.cpp index c9724639..4efe3953 100644 --- a/kexi/plugins/macros/tests/variabletests.cpp +++ b/kexi/plugins/macros/tests/variabletests.cpp @@ -73,7 +73,7 @@ namespace KoMacroTest { TQDomDocument* doomdocument; - KSharedPtr macro; + TDESharedPtr macro; Private() : xmlguiclient(0) @@ -85,7 +85,7 @@ namespace KoMacroTest { }; } -typedef TQValueList< KSharedPtr >::size_type sizetype; +typedef TQValueList< TDESharedPtr >::size_type sizetype; /****************************************************************************** * This is an xtra big TODO: @@ -144,7 +144,7 @@ void VariableTests::testMacro() kdDebug()<<"===================== testMacro() ======================" << endl; //fetch Items and .. - TQValueList< KSharedPtr >& items = d->macro->items(); + TQValueList< TDESharedPtr >& items = d->macro->items(); //... check that there is one KOMACROTEST_XASSERT( items.count(), sizetype(0) ); @@ -152,11 +152,11 @@ void VariableTests::testMacro() void VariableTests::testVariableString() { kdDebug()<<"===================== testVariableString() ======================" << endl; - TQValueList< KSharedPtr >& items = d->macro->items(); - KSharedPtr actionptr = items[0]->action(); + TQValueList< TDESharedPtr >& items = d->macro->items(); + TDESharedPtr actionptr = items[0]->action(); //fetch the "teststring"-variable - KSharedPtr variableptr = actionptr->variable(TESTSTRING); + TDESharedPtr variableptr = actionptr->variable(TESTSTRING); //So there is a variable, does hasVariable() work ? KOMACROTEST_ASSERT(actionptr->hasVariable(TESTSTRING),true); //check count of variables @@ -185,11 +185,11 @@ void VariableTests::testVariableString() { void VariableTests::testVariableInt() { kdDebug()<<"===================== testVariableInt() ======================" << endl; - TQValueList< KSharedPtr >& items = d->macro->items(); - KSharedPtr actionptr = items[0]->action(); + TQValueList< TDESharedPtr >& items = d->macro->items(); + TDESharedPtr actionptr = items[0]->action(); //fetch the "testint"-variable - KSharedPtr variableptr = actionptr->variable(TESTINT); + TDESharedPtr variableptr = actionptr->variable(TESTINT); //check that it is not null KOMACROTEST_XASSERT(sizetype(variableptr.data()), sizetype(0)); //check that it is 0 @@ -218,11 +218,11 @@ void VariableTests::testVariableInt() { void VariableTests::testVariableBool() { kdDebug()<<"===================== testVariableBool() ======================" << endl; - TQValueList< KSharedPtr >& items = d->macro->items(); - KSharedPtr actionptr = items[0]->action(); + TQValueList< TDESharedPtr >& items = d->macro->items(); + TDESharedPtr actionptr = items[0]->action(); //fetch the "testbool"-variable - KSharedPtr variableptr = actionptr->variable(TESTBOOL); + TDESharedPtr variableptr = actionptr->variable(TESTBOOL); //check that it is not null KOMACROTEST_XASSERT(sizetype(variableptr.data()), sizetype(0)); //check that it is " " diff --git a/kexi/plugins/macros/tests/xmlhandlertests.cpp b/kexi/plugins/macros/tests/xmlhandlertests.cpp index 9627a00b..971c85db 100644 --- a/kexi/plugins/macros/tests/xmlhandlertests.cpp +++ b/kexi/plugins/macros/tests/xmlhandlertests.cpp @@ -61,7 +61,7 @@ namespace KoMacroTest { * handling and communication with from TQObject * inheritated instances. */ - KSharedPtr testaction; + TDESharedPtr testaction; Private() : xmlguiclient(0) @@ -143,7 +143,7 @@ void XMLHandlerTests::testParseAndToXML() void XMLHandlerTests::testCorrectDomElement() { // Local Init - KSharedPtr macro = KoMacro::Manager::self()->createMacro("testMacro"); + TDESharedPtr macro = KoMacro::Manager::self()->createMacro("testMacro"); TQDomDocument doomdocument; // Part 1: From XML to a Macro. @@ -184,7 +184,7 @@ void XMLHandlerTests::testCorrectDomElement() // 2.Test - XML-document with bad root element. void XMLHandlerTests::testBadRoot() { - KSharedPtr macro = KoMacro::Manager::self()->createMacro("testMacro"); + TDESharedPtr macro = KoMacro::Manager::self()->createMacro("testMacro"); TQDomDocument doomdocument; const TQString xml = TQString("" @@ -210,7 +210,7 @@ void XMLHandlerTests::testBadRoot() // 3.Test - XML-document with a missing Variable. void XMLHandlerTests::testMissingVariable() { - KSharedPtr macro = KoMacro::Manager::self()->createMacro("testMacro"); + TDESharedPtr macro = KoMacro::Manager::self()->createMacro("testMacro"); TQDomDocument doomdocument; const TQString xml = TQString("" @@ -238,7 +238,7 @@ void XMLHandlerTests::testMissingVariable() // 4.Test - One more Variable in XML-Document. void XMLHandlerTests::testMoreVariables() { - KSharedPtr macro = KoMacro::Manager::self()->createMacro("testMacro"); + TDESharedPtr macro = KoMacro::Manager::self()->createMacro("testMacro"); TQDomDocument doomdocument; const TQString xml = TQString("" @@ -270,7 +270,7 @@ void XMLHandlerTests::testMoreVariables() // 5.Test - XML-document with wrong macro-xmlversion. void XMLHandlerTests::testWrongVersion() { - KSharedPtr macro = KoMacro::Manager::self()->createMacro("testMacro"); + TDESharedPtr macro = KoMacro::Manager::self()->createMacro("testMacro"); TQDomDocument doomdocument; const TQString xml = TQString("" @@ -297,7 +297,7 @@ void XMLHandlerTests::testWrongVersion() // or missing end tag. void XMLHandlerTests::testWrongXMLStruct() { - KSharedPtr macro = KoMacro::Manager::self()->createMacro("testMacro"); + TDESharedPtr macro = KoMacro::Manager::self()->createMacro("testMacro"); TQDomDocument doomdocument; const TQString xml = TQString("" @@ -321,7 +321,7 @@ void XMLHandlerTests::testWrongXMLStruct() // 7.Test-XML-document with maximum field-size. void XMLHandlerTests::testMaxNum() { - KSharedPtr macro = KoMacro::Manager::self()->createMacro("testMacro"); + TDESharedPtr macro = KoMacro::Manager::self()->createMacro("testMacro"); TQDomDocument doomdocument; const TQString xml = TQString("" @@ -351,7 +351,7 @@ void XMLHandlerTests::testMaxNum() // 8.Test-XML-document with maximum+1 field-size. void XMLHandlerTests::testMaxNum2() { - KSharedPtr macro = KoMacro::Manager::self()->createMacro("testMacro"); + TDESharedPtr macro = KoMacro::Manager::self()->createMacro("testMacro"); TQDomDocument doomdocument; const TQString xml = TQString("" @@ -381,7 +381,7 @@ void XMLHandlerTests::testMaxNum2() // 9.Test-XML-document with minimum field-size. void XMLHandlerTests::testMinNum() { - KSharedPtr macro = KoMacro::Manager::self()->createMacro("testMacro"); + TDESharedPtr macro = KoMacro::Manager::self()->createMacro("testMacro"); TQDomDocument doomdocument; const TQString xml = TQString("" @@ -411,7 +411,7 @@ void XMLHandlerTests::testMinNum() // 10.Test-XML-document with minimum+1 field-size. void XMLHandlerTests::testMinNum2() { - KSharedPtr macro = KoMacro::Manager::self()->createMacro("testMacro"); + TDESharedPtr macro = KoMacro::Manager::self()->createMacro("testMacro"); TQDomDocument doomdocument; const TQString xml = TQString("" @@ -441,7 +441,7 @@ void XMLHandlerTests::testMinNum2() // 11.Test - With a to big number. void XMLHandlerTests::testBigNumber() { - KSharedPtr macro = KoMacro::Manager::self()->createMacro("testMacro"); + TDESharedPtr macro = KoMacro::Manager::self()->createMacro("testMacro"); TQDomDocument doomdocument; const TQString xml = TQString("" @@ -471,7 +471,7 @@ void XMLHandlerTests::testBigNumber() // 12.Test - With two MacroItems. void XMLHandlerTests::testTwoMacroItems() { - KSharedPtr macro = KoMacro::Manager::self()->createMacro("testMacro"); + TDESharedPtr macro = KoMacro::Manager::self()->createMacro("testMacro"); TQDomDocument doomdocument; const TQString xml = TQString("" @@ -517,15 +517,15 @@ void XMLHandlerTests::testTwoMacroItems() * @p isactionset Bool for expectation that the @a Action -names are equal. * @p isvariableok TQMap of Bools for comparing each @a Variable . */ -void XMLHandlerTests::assertMacroContentEqToXML(const KSharedPtr macro, +void XMLHandlerTests::assertMacroContentEqToXML(const TDESharedPtr macro, const TQDomElement& elem, const bool isitemsempty, const bool isactionset, const TQMap isvariableok) { // Make an Iterator over the MacroItems of the Macro. - const TQValueList > macroitems = macro->items(); - TQValueList >::ConstIterator + const TQValueList > macroitems = macro->items(); + TQValueList >::ConstIterator mit(macroitems.constBegin()), end(macroitems.constEnd()); //1.comparison - Is the MacroItem-list empty? @@ -545,7 +545,7 @@ void XMLHandlerTests::assertMacroContentEqToXML(const KSharedPtr // Iterate over the MacroItems and item-elements. while(mit != end && ! itemnode.isNull()) { - const KSharedPtr macroitem = *mit; + const TDESharedPtr macroitem = *mit; const TQDomElement itemelem = itemnode.toElement(); //2.comparison - Is the Action-name equal? @@ -563,12 +563,12 @@ void XMLHandlerTests::assertMacroContentEqToXML(const KSharedPtr } // Go down to MacroItem->Variable and item->variable and compare them. - TQMap > mvariables = macroitem->variables(); + TQMap > mvariables = macroitem->variables(); TQDomNode varnode = itemelem.firstChild(); while ( ! varnode.isNull()) { const TQDomElement varelem = varnode.toElement(); - const KSharedPtr varitem = mvariables.find(varelem.attribute("name")).data(); + const TDESharedPtr varitem = mvariables.find(varelem.attribute("name")).data(); //3.comparison - Is the content of the Variable // in the MacroItem and and item equal? @@ -605,10 +605,10 @@ void XMLHandlerTests::assertMacroContentEqToXML(const KSharedPtr } // Prints a TQMap of Variables to kdDebug(). -void XMLHandlerTests::printMvariables(const TQMap > mvariables, const TQString s) +void XMLHandlerTests::printMvariables(const TQMap > mvariables, const TQString s) { //TQValueList::ConstIterator kit (keys.constBegin()), end(keys.constEnd()); - TQMap >::ConstIterator mvit (mvariables.constBegin()), end(mvariables.constEnd()); + TQMap >::ConstIterator mvit (mvariables.constBegin()), end(mvariables.constEnd()); while(mvit != end){ const KoMacro::Variable * v = *mvit; kdDebug() << s << ": " << v->name() << endl; diff --git a/kexi/plugins/macros/tests/xmlhandlertests.h b/kexi/plugins/macros/tests/xmlhandlertests.h index 521f9ee5..062b24b1 100644 --- a/kexi/plugins/macros/tests/xmlhandlertests.h +++ b/kexi/plugins/macros/tests/xmlhandlertests.h @@ -77,14 +77,14 @@ namespace KoMacroTest { * @p isactionset Bool for expectation that the @a Action -names are equal. * @p isvariableok TQMap of Bools for comparing each @a Variable . */ - void assertMacroContentEqToXML(const KSharedPtr macro, + void assertMacroContentEqToXML(const TDESharedPtr macro, const TQDomElement& elem, const bool isitemsempty, const bool isactionset, const TQMap isvariableok); // Prints a TQMap of Variables to kdDebug(). - void printMvariables(const TQMap > mvariables, const TQString s); + void printMvariables(const TQMap > mvariables, const TQString s); /** * Sub-methods of testParseXML() and testToXML(). diff --git a/kexi/plugins/macros/tests/xmlhandlertests2.cpp b/kexi/plugins/macros/tests/xmlhandlertests2.cpp index cc38c077..8e990d11 100644 --- a/kexi/plugins/macros/tests/xmlhandlertests2.cpp +++ b/kexi/plugins/macros/tests/xmlhandlertests2.cpp @@ -59,39 +59,39 @@ namespace KoMacroTest { /** * @a Macro instance as a container for the macroitems; */ - KSharedPtr macro; // container for manually created items - KSharedPtr macro2; // container for parsen items - KSharedPtr macro3; // container for parsen items after back-converting by toXML() and again parseXML() + TDESharedPtr macro; // container for manually created items + TDESharedPtr macro2; // container for parsen items + TDESharedPtr macro3; // container for parsen items after back-converting by toXML() and again parseXML() /** * An @a TestObject instance used internaly to test * handling and communication with from TQObject * inheritated instances. */ - KSharedPtr testaction; - KSharedPtr action2; // action of the parsen macro2 - KSharedPtr action3; // action of the parsen macro3 - KSharedPtr testaction_2; // for test12 - KSharedPtr action2_2; // action of the parsen macro2, for test12 - KSharedPtr action3_2; // action of the parsen macro3, for test12 + TDESharedPtr testaction; + TDESharedPtr action2; // action of the parsen macro2 + TDESharedPtr action3; // action of the parsen macro3 + TDESharedPtr testaction_2; // for test12 + TDESharedPtr action2_2; // action of the parsen macro2, for test12 + TDESharedPtr action3_2; // action of the parsen macro3, for test12 /** * Represents a @a TQValuList of @a MacroItem which are parsen in the * correspondig @a Macro . */ - TQValueList > macroitems2; // items of macro2 - TQValueList > macroitems3; // items of macro3 + TQValueList > macroitems2; // items of macro2 + TQValueList > macroitems3; // items of macro3 /** * @a MacroItem instances which ist fillen manually from the given XML * and parsen by the @a XMLHandler over the XML. */ - KSharedPtr macroitem; // created manually from XML - KSharedPtr macroitem2; // parsen from XML in macro2 - KSharedPtr macroitem3; // parsen from XML in macro3 - KSharedPtr macroitem_2; // created manually from XML, for test12 - KSharedPtr macroitem2_2;// parsen from XML in macro2, for test12 - KSharedPtr macroitem3_2;// parsen from XML in macro3, for test12 + TDESharedPtr macroitem; // created manually from XML + TDESharedPtr macroitem2; // parsen from XML in macro2 + TDESharedPtr macroitem3; // parsen from XML in macro3 + TDESharedPtr macroitem_2; // created manually from XML, for test12 + TDESharedPtr macroitem2_2;// parsen from XML in macro2, for test12 + TDESharedPtr macroitem3_2;// parsen from XML in macro3, for test12 Private() : xmlguiclient(0) @@ -207,10 +207,10 @@ void XMLHandlerTests2::testCorrectDomElement() d->macroitem->setAction(d->testaction); // Push the Variables into the macroitem. - KSharedPtr varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); - KSharedPtr varint = d->macroitem->addVariable("testint",TQVariant(0)); - KSharedPtr varbool = d->macroitem->addVariable("testbool",TQVariant(true)); - KSharedPtr vardouble = d->macroitem->addVariable("testdouble",TQVariant(0.6)); + TDESharedPtr varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); + TDESharedPtr varint = d->macroitem->addVariable("testint",TQVariant(0)); + TDESharedPtr varbool = d->macroitem->addVariable("testbool",TQVariant(true)); + TDESharedPtr vardouble = d->macroitem->addVariable("testdouble",TQVariant(0.6)); // Is our XML parseable into a 2. Macro by calling parseXML()? KOMACROTEST_ASSERT(d->macro2->parseXML(elem),true); @@ -300,10 +300,10 @@ void XMLHandlerTests2::testBadRoot() d->macroitem->setAction(d->testaction); // Push the Variables into the macroitem. - KSharedPtr varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); - KSharedPtr varint = d->macroitem->addVariable("testint",TQVariant(0)); - KSharedPtr varbool = d->macroitem->addVariable("testbool",TQVariant(true)); - KSharedPtr vardouble = d->macroitem->addVariable("testdouble",TQVariant(0.6)); + TDESharedPtr varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); + TDESharedPtr varint = d->macroitem->addVariable("testint",TQVariant(0)); + TDESharedPtr varbool = d->macroitem->addVariable("testbool",TQVariant(true)); + TDESharedPtr vardouble = d->macroitem->addVariable("testdouble",TQVariant(0.6)); // Is our XML parseable into a 2. Macro by calling parseXML()? KOMACROTEST_XASSERT(d->macro2->parseXML(elem),true); @@ -339,9 +339,9 @@ void XMLHandlerTests2::testMissingVariable() d->macroitem->setAction(d->testaction); // Push the Variables into the macroitem. - KSharedPtr varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); - KSharedPtr varint = d->macroitem->addVariable("testint",TQVariant(0)); - KSharedPtr vardouble = d->macroitem->addVariable("testdouble",TQVariant(0.6)); + TDESharedPtr varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); + TDESharedPtr varint = d->macroitem->addVariable("testint",TQVariant(0)); + TDESharedPtr vardouble = d->macroitem->addVariable("testdouble",TQVariant(0.6)); // Is our XML parseable into a 2. Macro by calling parseXML()? KOMACROTEST_ASSERT(d->macro2->parseXML(elem),true); @@ -425,11 +425,11 @@ void XMLHandlerTests2::testMoreVariables() d->macroitem->setAction(d->testaction); // Push the Variables into the macroitem. - KSharedPtr varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); - KSharedPtr varint = d->macroitem->addVariable("testint",TQVariant(0)); - KSharedPtr varbool = d->macroitem->addVariable("testbool",TQVariant(true)); - KSharedPtr vardouble = d->macroitem->addVariable("testdouble",TQVariant(0.6)); - KSharedPtr varbla = d->macroitem->addVariable("testbla","somethingwrong"); + TDESharedPtr varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); + TDESharedPtr varint = d->macroitem->addVariable("testint",TQVariant(0)); + TDESharedPtr varbool = d->macroitem->addVariable("testbool",TQVariant(true)); + TDESharedPtr vardouble = d->macroitem->addVariable("testdouble",TQVariant(0.6)); + TDESharedPtr varbla = d->macroitem->addVariable("testbla","somethingwrong"); // Is our XML parseable into a 2. Macro by calling parseXML()? KOMACROTEST_ASSERT(d->macro2->parseXML(elem),true); @@ -517,10 +517,10 @@ void XMLHandlerTests2::testWrongVersion() d->macroitem->setAction(d->testaction); // Push the Variables into the macroitem. - KSharedPtr varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); - KSharedPtr varint = d->macroitem->addVariable("testint",TQVariant(0)); - KSharedPtr varbool = d->macroitem->addVariable("testbool",TQVariant(true)); - KSharedPtr vardouble = d->macroitem->addVariable("testdouble",TQVariant(0.6)); + TDESharedPtr varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); + TDESharedPtr varint = d->macroitem->addVariable("testint",TQVariant(0)); + TDESharedPtr varbool = d->macroitem->addVariable("testbool",TQVariant(true)); + TDESharedPtr vardouble = d->macroitem->addVariable("testdouble",TQVariant(0.6)); // Is our XML parseable into a 2. Macro by calling parseXML()? KOMACROTEST_XASSERT(d->macro2->parseXML(elem),true); @@ -559,10 +559,10 @@ void XMLHandlerTests2::testWrongXMLStruct() d->macroitem->setAction(d->testaction); // Push the Variables into the macroitem. - KSharedPtr varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); - KSharedPtr varint = d->macroitem->addVariable("testint",TQVariant(0)); - KSharedPtr varbool = d->macroitem->addVariable("testbool",TQVariant(true)); - KSharedPtr vardouble = d->macroitem->addVariable("testdouble",TQVariant(0.6)); + TDESharedPtr varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); + TDESharedPtr varint = d->macroitem->addVariable("testint",TQVariant(0)); + TDESharedPtr varbool = d->macroitem->addVariable("testbool",TQVariant(true)); + TDESharedPtr vardouble = d->macroitem->addVariable("testdouble",TQVariant(0.6)); // Is our XML parseable into a 2. Macro by calling parseXML()? KOMACROTEST_XASSERT(d->macro2->parseXML(elem),true); @@ -599,10 +599,10 @@ void XMLHandlerTests2::testMaxNum() d->macroitem->setAction(d->testaction); // Push the Variables into the macroitem. - KSharedPtr varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); - KSharedPtr varint = d->macroitem->addVariable("testint",TQVariant(INT_MAX)); - KSharedPtr varbool = d->macroitem->addVariable("testbool",TQVariant(true)); - KSharedPtr vardouble = d->macroitem->addVariable("testdouble",TQVariant(DBL_MAX)); + TDESharedPtr varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); + TDESharedPtr varint = d->macroitem->addVariable("testint",TQVariant(INT_MAX)); + TDESharedPtr varbool = d->macroitem->addVariable("testbool",TQVariant(true)); + TDESharedPtr vardouble = d->macroitem->addVariable("testdouble",TQVariant(DBL_MAX)); // Is our XML parseable into a 2. Macro by calling parseXML()? KOMACROTEST_ASSERT(d->macro2->parseXML(elem),true); @@ -687,10 +687,10 @@ void XMLHandlerTests2::testMaxNum2() d->macroitem->setAction(d->testaction); // Push the Variables into the macroitem. - KSharedPtr varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); - KSharedPtr varint = d->macroitem->addVariable("testint",TQVariant(INT_MAX+1)); - KSharedPtr varbool = d->macroitem->addVariable("testbool",TQVariant(true)); - KSharedPtr vardouble = d->macroitem->addVariable("testdouble",TQVariant(DBL_MAX+1)); + TDESharedPtr varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); + TDESharedPtr varint = d->macroitem->addVariable("testint",TQVariant(INT_MAX+1)); + TDESharedPtr varbool = d->macroitem->addVariable("testbool",TQVariant(true)); + TDESharedPtr vardouble = d->macroitem->addVariable("testdouble",TQVariant(DBL_MAX+1)); // Is our XML parseable into a 2. Macro by calling parseXML()? KOMACROTEST_ASSERT(d->macro2->parseXML(elem),true); @@ -775,10 +775,10 @@ void XMLHandlerTests2::testMinNum() d->macroitem->setAction(d->testaction); // Push the Variables into the macroitem. - KSharedPtr varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); - KSharedPtr varint = d->macroitem->addVariable("testint",TQVariant(INT_MIN)); - KSharedPtr varbool = d->macroitem->addVariable("testbool",TQVariant(true)); - KSharedPtr vardouble = d->macroitem->addVariable("testdouble",TQVariant(DBL_MIN)); + TDESharedPtr varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); + TDESharedPtr varint = d->macroitem->addVariable("testint",TQVariant(INT_MIN)); + TDESharedPtr varbool = d->macroitem->addVariable("testbool",TQVariant(true)); + TDESharedPtr vardouble = d->macroitem->addVariable("testdouble",TQVariant(DBL_MIN)); // Is our XML parseable into a 2. Macro by calling parseXML()? KOMACROTEST_ASSERT(d->macro2->parseXML(elem),true); @@ -863,10 +863,10 @@ void XMLHandlerTests2::testMinNum2() d->macroitem->setAction(d->testaction); // Push the Variables into the macroitem. - KSharedPtr varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); - KSharedPtr varint = d->macroitem->addVariable("testint",TQVariant(INT_MIN-1)); - KSharedPtr varbool = d->macroitem->addVariable("testbool",TQVariant(true)); - KSharedPtr vardouble = d->macroitem->addVariable("testdouble",TQVariant(DBL_MIN-1)); + TDESharedPtr varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); + TDESharedPtr varint = d->macroitem->addVariable("testint",TQVariant(INT_MIN-1)); + TDESharedPtr varbool = d->macroitem->addVariable("testbool",TQVariant(true)); + TDESharedPtr vardouble = d->macroitem->addVariable("testdouble",TQVariant(DBL_MIN-1)); // Is our XML parseable into a 2. Macro by calling parseXML()? KOMACROTEST_ASSERT(d->macro2->parseXML(elem),true); @@ -951,10 +951,10 @@ void XMLHandlerTests2::testBigNumber() d->macroitem->setAction(d->testaction); // Push the Variables into the macroitem. - KSharedPtr varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); - //TODO //KSharedPtr varint = d->macroitem->addVariable("testint",TQVariant(0123456789012345678901234567890123456789)); - KSharedPtr varbool = d->macroitem->addVariable("testbool",TQVariant(true)); - KSharedPtr vardouble = d->macroitem->addVariable("testdouble",TQVariant(0.6)); + TDESharedPtr varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); + //TODO //TDESharedPtr varint = d->macroitem->addVariable("testint",TQVariant(0123456789012345678901234567890123456789)); + TDESharedPtr varbool = d->macroitem->addVariable("testbool",TQVariant(true)); + TDESharedPtr vardouble = d->macroitem->addVariable("testdouble",TQVariant(0.6)); // Is our XML parseable into a 2. Macro by calling parseXML()? KOMACROTEST_ASSERT(d->macro2->parseXML(elem),true); @@ -1050,18 +1050,18 @@ void XMLHandlerTests2::testTwoMacroItems() d->macroitem_2->setAction(d->testaction_2); // Push the Variables into the macroitem. - KSharedPtr varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); - KSharedPtr varint = d->macroitem->addVariable("testint",TQVariant(0)); - KSharedPtr varbool = d->macroitem->addVariable("testbool",TQVariant(true)); - KSharedPtr vardouble = d->macroitem->addVariable("testdouble",TQVariant(0.6)); - KSharedPtr varbla = d->macroitem->addVariable("testbla","somethingwrong"); + TDESharedPtr varstring = d->macroitem->addVariable("teststring",TQVariant("test_string")); + TDESharedPtr varint = d->macroitem->addVariable("testint",TQVariant(0)); + TDESharedPtr varbool = d->macroitem->addVariable("testbool",TQVariant(true)); + TDESharedPtr vardouble = d->macroitem->addVariable("testdouble",TQVariant(0.6)); + TDESharedPtr varbla = d->macroitem->addVariable("testbla","somethingwrong"); // Push the Variables into the macroitem4. - KSharedPtr varstring_2 = d->macroitem_2->addVariable("teststring",TQVariant("testString2")); - KSharedPtr varint_2 = d->macroitem_2->addVariable("testint",TQVariant(4)); - KSharedPtr varbool_2 = d->macroitem_2->addVariable("testbool",TQVariant(false)); - KSharedPtr vardouble_2 = d->macroitem_2->addVariable("testdouble",TQVariant(0.7)); - KSharedPtr varbla_2 = d->macroitem_2->addVariable("testbla","somethingwrong2"); + TDESharedPtr varstring_2 = d->macroitem_2->addVariable("teststring",TQVariant("testString2")); + TDESharedPtr varint_2 = d->macroitem_2->addVariable("testint",TQVariant(4)); + TDESharedPtr varbool_2 = d->macroitem_2->addVariable("testbool",TQVariant(false)); + TDESharedPtr vardouble_2 = d->macroitem_2->addVariable("testdouble",TQVariant(0.7)); + TDESharedPtr varbla_2 = d->macroitem_2->addVariable("testbla","somethingwrong2"); // Is our XML parseable into a 2. Macro by calling parseXML()? KOMACROTEST_ASSERT(d->macro2->parseXML(elem),true); @@ -1072,7 +1072,7 @@ void XMLHandlerTests2::testTwoMacroItems() KOMACROTEST_ASSERT(d->macroitems2.size(),(sizetypelist)2); { - TQValueList >::ConstIterator mit2(d->macroitems2.constBegin()); + TQValueList >::ConstIterator mit2(d->macroitems2.constBegin()); // 2a.comparison - Test if the Action is correct? d->macroitem2 = *mit2; mit2++; @@ -1111,7 +1111,7 @@ void XMLHandlerTests2::testTwoMacroItems() KOMACROTEST_ASSERT(d->macroitems3.size(),(sizetypelist)2); { - TQValueList >::ConstIterator mit3(d->macroitems3.constBegin()); + TQValueList >::ConstIterator mit3(d->macroitems3.constBegin()); // 2b.comparison - Test if the Action is correct? d->macroitem3 = *mit3; mit3++; @@ -1145,14 +1145,14 @@ void XMLHandlerTests2::testTwoMacroItems() * End of Sub-methos of testParseAndToXML2(). ***************************************************************************/ -bool XMLHandlerTests2::assertActionsEqual(KSharedPtr action, - KSharedPtr action2) +bool XMLHandlerTests2::assertActionsEqual(TDESharedPtr action, + TDESharedPtr action2) { return action->name() == action2->name(); } -bool XMLHandlerTests2::assertVariablesEqual(KSharedPtr var, - KSharedPtr var2) +bool XMLHandlerTests2::assertVariablesEqual(TDESharedPtr var, + TDESharedPtr var2) { if ( var->variant() != var2->variant() ) kdDebug() << "Variable1: " << var->variant() << " and Variable2: " << var2->variant() << endl; return var->variant() == var2->variant(); diff --git a/kexi/plugins/macros/tests/xmlhandlertests2.h b/kexi/plugins/macros/tests/xmlhandlertests2.h index 376d7b08..3fd59609 100644 --- a/kexi/plugins/macros/tests/xmlhandlertests2.h +++ b/kexi/plugins/macros/tests/xmlhandlertests2.h @@ -70,7 +70,7 @@ namespace KoMacroTest { Private* const d; typedef TQMap::size_type sizetypemap; - typedef TQValueList >::size_type sizetypelist; + typedef TQValueList >::size_type sizetypelist; /** * 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 isvariableok TQMap of Bools for comparing each @a Variable . */ -/* void assertMacroContentEqToXML(const KSharedPtr macro, +/* void assertMacroContentEqToXML(const TDESharedPtr macro, const TQDomElement& elem, const bool isitemsempty, const bool isactionset, const TQMap isvariableok); // Prints a TQMap of Variables to kdDebug(). - void printMvariables(const TQMap > mvariables, const TQString s); + void printMvariables(const TQMap > mvariables, const TQString s); */ /** * Sub-methods of testParseXML() and testToXML(). @@ -122,11 +122,11 @@ namespace KoMacroTest { void testTwoMacroItems(); - bool assertActionsEqual(KSharedPtr action, - KSharedPtr action2); + bool assertActionsEqual(TDESharedPtr action, + TDESharedPtr action2); - bool assertVariablesEqual(KSharedPtr var, - KSharedPtr var2); + bool assertVariablesEqual(TDESharedPtr var, + TDESharedPtr var2); }; } diff --git a/kexi/plugins/scripting/kexidb/kexidbconnection.h b/kexi/plugins/scripting/kexidb/kexidbconnection.h index 925a6e8e..846f2b2c 100644 --- a/kexi/plugins/scripting/kexidb/kexidbconnection.h +++ b/kexi/plugins/scripting/kexidb/kexidbconnection.h @@ -180,8 +180,8 @@ namespace Kross { namespace KexiDB { ::KexiDB::Connection* connection() const; ::KexiDB::Connection* m_connection; - KSharedPtr m_connectiondata; - KSharedPtr m_driver; + TDESharedPtr m_connectiondata; + TDESharedPtr m_driver; /// Initialize the class instance. void initialize(); diff --git a/kpresenter/KPrBgSpellCheck.cpp b/kpresenter/KPrBgSpellCheck.cpp index 0bd3ce40..0493c64d 100644 --- a/kpresenter/KPrBgSpellCheck.cpp +++ b/kpresenter/KPrBgSpellCheck.cpp @@ -35,7 +35,7 @@ using namespace KSpell2; #include KPrBgSpellCheck::KPrBgSpellCheck(KPrDocument *_doc) - : KoBgSpellCheck(Broker::openBroker( KSharedConfig::openConfig( "kpresenterrc" ) ), _doc ) + : KoBgSpellCheck(Broker::openBroker( TDESharedConfig::openConfig( "kpresenterrc" ) ), _doc ) { m_doc=_doc; m_currentObj=0L; diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp index e932bcdd..bf57df2e 100644 --- a/kpresenter/KPrView.cpp +++ b/kpresenter/KPrView.cpp @@ -326,7 +326,7 @@ KPrView::KPrView( KPrDocument* _doc, TQWidget *_parent, const char *_name ) m_spell.textIterator = 0L; m_spell.macroCmdSpellCheck = 0L; m_spell.dlg = 0; - m_broker = Broker::openBroker( KSharedConfig::openConfig( "kpresenterrc" ) ); + m_broker = Broker::openBroker( TDESharedConfig::openConfig( "kpresenterrc" ) ); m_autoPresTimerConnected = false; m_actionList.setAutoDelete( true ); diff --git a/kword/KWBgSpellCheck.cpp b/kword/KWBgSpellCheck.cpp index 7b352e09..a1bd1f5c 100644 --- a/kword/KWBgSpellCheck.cpp +++ b/kword/KWBgSpellCheck.cpp @@ -36,7 +36,7 @@ using namespace KSpell2; KWBgSpellCheck::KWBgSpellCheck(KWDocument *_doc) - : KoBgSpellCheck( Broker::openBroker( KSharedConfig::openConfig( "kwordrc" ) ), + : KoBgSpellCheck( Broker::openBroker( TDESharedConfig::openConfig( "kwordrc" ) ), _doc ) { m_doc=_doc; diff --git a/kword/KWView.cpp b/kword/KWView.cpp index 068e0da6..941c0562 100644 --- a/kword/KWView.cpp +++ b/kword/KWView.cpp @@ -235,7 +235,7 @@ KWView::KWView( const TQString& viewMode, TQWidget *parent, const char *name, KW m_fsInline=0; m_spell.kospell = 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.textIterator = 0L; m_currentPage = m_doc->pageManager()->page(m_doc->startPage()); diff --git a/lib/kofficecore/KoFilterChain.h b/lib/kofficecore/KoFilterChain.h index a044eebe..a1f3d239 100644 --- a/lib/kofficecore/KoFilterChain.h +++ b/lib/kofficecore/KoFilterChain.h @@ -47,7 +47,7 @@ namespace KOffice { * @author Werner Trobin * @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 // add chain links. @@ -55,7 +55,7 @@ class KOFFICECORE_EXPORT KoFilterChain : public KShared friend class KoFilterManager; public: - typedef KSharedPtr Ptr; + typedef TDESharedPtr Ptr; virtual ~KoFilterChain(); diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp index 483ff683..12e0013d 100644 --- a/lib/kofficecore/KoMainWindow.cpp +++ b/lib/kofficecore/KoMainWindow.cpp @@ -180,7 +180,7 @@ public: TQCString m_lastExportFormat; int m_lastExportSpecialOutputFlag; - KSharedPtr m_koSpeaker; + TDESharedPtr m_koSpeaker; }; KoMainWindow::KoMainWindow( TDEInstance *instance, const char* name ) diff --git a/lib/kofficecore/KoQueryTrader.h b/lib/kofficecore/KoQueryTrader.h index 8f81e323..e7afc23a 100644 --- a/lib/kofficecore/KoQueryTrader.h +++ b/lib/kofficecore/KoQueryTrader.h @@ -116,11 +116,11 @@ private: /** * Represents an available filter. */ -class KoFilterEntry : public KShared +class KoFilterEntry : public TDEShared { public: - typedef KSharedPtr Ptr; + typedef TDESharedPtr Ptr; KoFilterEntry() : weight( 0 ) { m_service = 0L; } // for TQValueList KoFilterEntry( KService::Ptr service ); diff --git a/lib/kofficecore/KoSpeaker.h b/lib/kofficecore/KoSpeaker.h index c4ab8786..7376e4ca 100644 --- a/lib/kofficecore/KoSpeaker.h +++ b/lib/kofficecore/KoSpeaker.h @@ -60,7 +60,7 @@ class KoSpeakerPrivate; * * 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 diff --git a/lib/kross/api/callable.h b/lib/kross/api/callable.h index 0e3dd3a6..99e3dadf 100644 --- a/lib/kross/api/callable.h +++ b/lib/kross/api/callable.h @@ -43,7 +43,7 @@ namespace Kross { namespace Api { /** * Shared pointer to implement reference-counting. */ - typedef KSharedPtr Ptr; + typedef TDESharedPtr Ptr; /** * Constructor. diff --git a/lib/kross/api/class.h b/lib/kross/api/class.h index 6224a61a..5fd7e746 100644 --- a/lib/kross/api/class.h +++ b/lib/kross/api/class.h @@ -48,7 +48,7 @@ namespace Kross { namespace Api { /** * Shared pointer to implement reference-counting. */ - typedef KSharedPtr Ptr; + typedef TDESharedPtr Ptr; /** * Constructor. diff --git a/lib/kross/api/eventaction.h b/lib/kross/api/eventaction.h index 659240fa..e20656df 100644 --- a/lib/kross/api/eventaction.h +++ b/lib/kross/api/eventaction.h @@ -45,7 +45,7 @@ namespace Kross { namespace Api { /** * Shared pointer to implement reference-counting. */ - typedef KSharedPtr Ptr; + typedef TDESharedPtr Ptr; /** * Constructor. @@ -61,7 +61,7 @@ namespace Kross { namespace Api { virtual const TQString getClassName() const; /// \see Kross::Api::Event::call() - //virtual Object::Ptr call(const TQString& name, KSharedPtr arguments); + //virtual Object::Ptr call(const TQString& name, TDESharedPtr arguments); private: KAction* m_action; diff --git a/lib/kross/api/eventscript.cpp b/lib/kross/api/eventscript.cpp index f9fe9f9a..3b730536 100644 --- a/lib/kross/api/eventscript.cpp +++ b/lib/kross/api/eventscript.cpp @@ -38,7 +38,7 @@ const TQString EventScript::getClassName() const return "Kross::Api::EventScript"; } -Object::Ptr EventScript::call(const TQString& name, KSharedPtr arguments) +Object::Ptr EventScript::call(const TQString& name, TDESharedPtr arguments) { krossdebug( TQString("EventScript::call() name=%1 arguments=%2").arg(name).arg(arguments->toString()) ); //TODO diff --git a/lib/kross/api/eventscript.h b/lib/kross/api/eventscript.h index 0f62ddfc..b255874d 100644 --- a/lib/kross/api/eventscript.h +++ b/lib/kross/api/eventscript.h @@ -38,7 +38,7 @@ namespace Kross { namespace Api { /** * Shared pointer to implement reference-counting. */ - typedef KSharedPtr Ptr; + typedef TDESharedPtr Ptr; /** * Constructor. @@ -52,7 +52,7 @@ namespace Kross { namespace Api { virtual const TQString getClassName() const; - virtual Object::Ptr call(const TQString& name, KSharedPtr arguments); + virtual Object::Ptr call(const TQString& name, TDESharedPtr arguments); private: //ScriptContainer* m_scriptcontainer; diff --git a/lib/kross/api/eventsignal.cpp b/lib/kross/api/eventsignal.cpp index 2a711a0b..c462f6cd 100644 --- a/lib/kross/api/eventsignal.cpp +++ b/lib/kross/api/eventsignal.cpp @@ -43,7 +43,7 @@ const TQString EventSignal::getClassName() const return "Kross::Api::EventSignal"; } -Object::Ptr EventSignal::call(const TQString& /*name*/, KSharedPtr arguments) +Object::Ptr EventSignal::call(const TQString& /*name*/, TDESharedPtr arguments) { #ifdef KROSS_API_EVENTSIGNAL_CALL_DEBUG krossdebug( TQString("EventSignal::call() m_signal=%1 arguments=%2").arg(m_signal).arg(arguments->toString()) ); diff --git a/lib/kross/api/eventsignal.h b/lib/kross/api/eventsignal.h index 6117014e..ec360b7d 100644 --- a/lib/kross/api/eventsignal.h +++ b/lib/kross/api/eventsignal.h @@ -45,7 +45,7 @@ namespace Kross { namespace Api { /** * Shared pointer to implement reference-counting. */ - typedef KSharedPtr Ptr; + typedef TDESharedPtr Ptr; /** * Constructor. @@ -59,7 +59,7 @@ namespace Kross { namespace Api { virtual const TQString getClassName() const; - virtual Object::Ptr call(const TQString& name, KSharedPtr arguments); + virtual Object::Ptr call(const TQString& name, TDESharedPtr arguments); /* signals: diff --git a/lib/kross/api/eventslot.h b/lib/kross/api/eventslot.h index aaf1ebba..7bc66327 100644 --- a/lib/kross/api/eventslot.h +++ b/lib/kross/api/eventslot.h @@ -40,7 +40,7 @@ namespace Kross { namespace Api { /** * Shared pointer to implement reference-counting. */ - typedef KSharedPtr Ptr; + typedef TDESharedPtr Ptr; /** * Constructor. @@ -63,7 +63,7 @@ namespace Kross { namespace Api { virtual const TQString getClassName() const; /// \see Kross::Api::Event::call() - virtual Object::Ptr call(const TQString& name, KSharedPtr arguments); + virtual Object::Ptr call(const TQString& name, TDESharedPtr arguments); /* private: diff --git a/lib/kross/api/exception.h b/lib/kross/api/exception.h index b0699bfb..f58496d7 100644 --- a/lib/kross/api/exception.h +++ b/lib/kross/api/exception.h @@ -42,7 +42,7 @@ namespace Kross { namespace Api { /** * Shared pointer to implement reference-counting. */ - typedef KSharedPtr Ptr; + typedef TDESharedPtr Ptr; /** * Constructor. diff --git a/lib/kross/api/list.h b/lib/kross/api/list.h index 2620c688..77ea7ea1 100644 --- a/lib/kross/api/list.h +++ b/lib/kross/api/list.h @@ -41,7 +41,7 @@ namespace Kross { namespace Api { /** * Shared pointer to implement reference-counting. */ - typedef KSharedPtr Ptr; + typedef TDESharedPtr Ptr; /* operator TQStringList () { diff --git a/lib/kross/api/module.h b/lib/kross/api/module.h index f27bdf5c..25d35274 100644 --- a/lib/kross/api/module.h +++ b/lib/kross/api/module.h @@ -38,7 +38,7 @@ namespace Kross { namespace Api { /** * Shared pointer to implement reference-counting. */ - typedef KSharedPtr Ptr; + typedef TDESharedPtr Ptr; /** * Constructor. diff --git a/lib/kross/api/object.cpp b/lib/kross/api/object.cpp index 43fa8b4b..a9599f6d 100644 --- a/lib/kross/api/object.cpp +++ b/lib/kross/api/object.cpp @@ -27,19 +27,19 @@ using namespace Kross::Api; Object::Object() - : KShared() + : TDEShared() { #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 } Object::~Object() { #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 - //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() diff --git a/lib/kross/api/object.h b/lib/kross/api/object.h index f23a6179..8a9f32af 100644 --- a/lib/kross/api/object.h +++ b/lib/kross/api/object.h @@ -47,14 +47,14 @@ namespace Kross { namespace Api { * This class implementates reference counting for shared * objects. So, no need to take care of freeing objects. */ - class Object : public KShared + class Object : public TDEShared { public: /** * Shared pointer to implement reference-counting. */ - typedef KSharedPtr Ptr; + typedef TDESharedPtr Ptr; /** * Constructor. @@ -99,7 +99,7 @@ namespace Kross { namespace Api { * \return The call-result as \a Object::Ptr instance or * NULL if the call has no result. */ - virtual Object::Ptr call(const TQString& name, KSharedPtr arguments); + virtual Object::Ptr call(const TQString& name, TDESharedPtr arguments); /** * Return a list of supported callable objects. @@ -142,7 +142,7 @@ template inline T* Object::fromObject(Object::Ptr object) { T* t = (T*) object.data(); if(! t) - throw KSharedPtr( new Exception(TQString("Object \"%1\" invalid.").arg(object ? object->getClassName() : "")) ); + throw TDESharedPtr( new Exception(TQString("Object \"%1\" invalid.").arg(object ? object->getClassName() : "")) ); return t; } diff --git a/lib/kross/api/proxy.h b/lib/kross/api/proxy.h index a7d37380..1e0f3850 100644 --- a/lib/kross/api/proxy.h +++ b/lib/kross/api/proxy.h @@ -111,13 +111,13 @@ namespace Kross { namespace Api { const METHOD m_method; /// First default argument. - KSharedPtr m_defarg1; + TDESharedPtr m_defarg1; /// Second default argument. - KSharedPtr m_defarg2; + TDESharedPtr m_defarg2; /// Theird default argument. - KSharedPtr m_defarg3; + TDESharedPtr m_defarg3; /// Forth default argument. - KSharedPtr m_defarg4; + TDESharedPtr m_defarg4; /** * \internal used struct that does the execution of the wrapped @@ -187,9 +187,9 @@ namespace Kross { namespace Api { private: INSTANCE* m_instance; const METHOD m_method; - KSharedPtr m_defarg1; - KSharedPtr m_defarg2; - KSharedPtr m_defarg3; + TDESharedPtr m_defarg1; + TDESharedPtr m_defarg2; + TDESharedPtr m_defarg3; template struct ProxyFunctionCaller { @@ -229,8 +229,8 @@ namespace Kross { namespace Api { private: INSTANCE* m_instance; const METHOD m_method; - KSharedPtr m_defarg1; - KSharedPtr m_defarg2; + TDESharedPtr m_defarg1; + TDESharedPtr m_defarg2; template struct ProxyFunctionCaller { @@ -270,7 +270,7 @@ namespace Kross { namespace Api { private: INSTANCE* m_instance; const METHOD m_method; - KSharedPtr m_defarg1; + TDESharedPtr m_defarg1; template struct ProxyFunctionCaller { diff --git a/lib/kross/api/qtobject.h b/lib/kross/api/qtobject.h index 119a579e..22829f02 100644 --- a/lib/kross/api/qtobject.h +++ b/lib/kross/api/qtobject.h @@ -49,7 +49,7 @@ namespace Kross { namespace Api { /** * Shared pointer to implement reference-counting. */ - typedef KSharedPtr Ptr; + typedef TDESharedPtr Ptr; /** * Constructor. diff --git a/lib/kross/api/value.h b/lib/kross/api/value.h index db3854be..94a9aa0d 100644 --- a/lib/kross/api/value.h +++ b/lib/kross/api/value.h @@ -72,7 +72,7 @@ namespace Kross { namespace Api { /** * Set the value. * 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 * it from disappearing. * diff --git a/lib/kross/main/mainmodule.h b/lib/kross/main/mainmodule.h index bc7efc45..96abd06d 100644 --- a/lib/kross/main/mainmodule.h +++ b/lib/kross/main/mainmodule.h @@ -55,7 +55,7 @@ namespace Kross { namespace Api { public: /// Shared pointer to implement reference-counting. - typedef KSharedPtr Ptr; + typedef TDESharedPtr Ptr; /** * Constructor. diff --git a/lib/kross/main/manager.cpp b/lib/kross/main/manager.cpp index 156eb2ac..21ee1eca 100644 --- a/lib/kross/main/manager.cpp +++ b/lib/kross/main/manager.cpp @@ -60,7 +60,7 @@ namespace Kross { namespace Api { * The Manager-singleton instance is NULL by default till the * Manager::scriptManager() method got called first time. */ - static KSharedPtr m_manager = KSharedPtr(0); + static TDESharedPtr m_manager = TDESharedPtr(0); }} @@ -68,7 +68,7 @@ Manager* Manager::scriptManager() { if(! m_manager.data()) { // Create the Manager-singleton on demand. - m_manager = KSharedPtr( new Manager() ); + m_manager = TDESharedPtr( new Manager() ); } // and finally return the singleton. diff --git a/lib/kross/main/manager.h b/lib/kross/main/manager.h index fe815e7c..5e7c43f4 100644 --- a/lib/kross/main/manager.h +++ b/lib/kross/main/manager.h @@ -116,7 +116,7 @@ namespace Kross { namespace Api { * \return The \a ScriptContainer instance matching to * scriptname. */ - KSharedPtr getScriptContainer(const TQString& scriptname); + TDESharedPtr getScriptContainer(const TQString& scriptname); /** * Return the \a Interpreter instance defined by diff --git a/lib/kross/main/scriptaction.h b/lib/kross/main/scriptaction.h index e6b17c73..3d6e890b 100644 --- a/lib/kross/main/scriptaction.h +++ b/lib/kross/main/scriptaction.h @@ -58,7 +58,7 @@ namespace Kross { namespace Api { public: /// Shared pointer to implement reference-counting. - typedef KSharedPtr Ptr; + typedef TDESharedPtr Ptr; /// A list of \a ScriptAction instances. //typedef TQValueList List; diff --git a/lib/kross/main/scriptcontainer.h b/lib/kross/main/scriptcontainer.h index 5d2b38d0..e838317d 100644 --- a/lib/kross/main/scriptcontainer.h +++ b/lib/kross/main/scriptcontainer.h @@ -72,7 +72,7 @@ namespace Kross { namespace Api { public: /// Shared pointer to implement reference-counting. - typedef KSharedPtr Ptr; + typedef TDESharedPtr Ptr; /** * Destructor. @@ -171,7 +171,7 @@ namespace Kross { namespace Api { * \return \a Object instance representing * the functioncall returnvalue. */ - KSharedPtr callFunction(const TQString& functionname, KSharedPtr arguments = 0); + TDESharedPtr callFunction(const TQString& functionname, TDESharedPtr arguments = 0); /** * Return a list of classes. @@ -181,7 +181,7 @@ namespace Kross { namespace Api { /** * Create and return a new class instance. */ - KSharedPtr classInstance(const TQString& classname); + TDESharedPtr classInstance(const TQString& classname); /** * Initialize the \a Script instance. diff --git a/lib/kross/ruby/rubyextension.cpp b/lib/kross/ruby/rubyextension.cpp index 89c73b1a..589a0b27 100644 --- a/lib/kross/ruby/rubyextension.cpp +++ b/lib/kross/ruby/rubyextension.cpp @@ -126,7 +126,7 @@ void RubyExtension::delete_object(void* object) void RubyExtension::delete_exception(void* object) { Kross::Api::Exception* exc = static_cast(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); } - exc->_KShared_ref(); + exc->_TDEShared_ref(); return Data_Wrap_Struct(RubyExtensionPrivate::s_krossException, 0, RubyExtension::delete_exception, exc.data() ); }