Browse Source

Rename KShared

tags/r14.0.0
Timothy Pearson 7 years ago
parent
commit
f705567476
100 changed files with 549 additions and 549 deletions
  1. +1
    -1
      chalk/chalkcolor/kis_channelinfo.h
  2. +2
    -2
      chalk/chalkcolor/kis_histogram_producer.h
  3. +1
    -1
      chalk/core/kis_alpha_mask.h
  4. +1
    -1
      chalk/core/kis_background.cc
  5. +1
    -1
      chalk/core/kis_background.h
  6. +2
    -2
      chalk/core/kis_convolution_painter.h
  7. +1
    -1
      chalk/core/kis_filter.h
  8. +1
    -1
      chalk/core/kis_histogram.h
  9. +2
    -2
      chalk/core/kis_image.cc
  10. +1
    -1
      chalk/core/kis_image.h
  11. +3
    -3
      chalk/core/kis_iterator.h
  12. +2
    -2
      chalk/core/kis_layer.cc
  13. +1
    -1
      chalk/core/kis_layer.h
  14. +2
    -2
      chalk/core/kis_merge_visitor.h
  15. +3
    -3
      chalk/core/kis_paint_device.cc
  16. +3
    -3
      chalk/core/kis_paint_device.h
  17. +1
    -1
      chalk/core/kis_paint_layer.h
  18. +2
    -2
      chalk/core/kis_paintop.h
  19. +2
    -2
      chalk/core/kis_perspective_grid.h
  20. +1
    -1
      chalk/core/kis_random_accessor.h
  21. +2
    -2
      chalk/core/kis_substrate.h
  22. +15
    -15
      chalk/core/kis_types.h
  23. +1
    -1
      chalk/core/tiles/kis_memento.cc
  24. +2
    -2
      chalk/core/tiles/kis_memento.h
  25. +1
    -1
      chalk/core/tiles/kis_tiled_random_accessor.h
  26. +1
    -1
      chalk/core/tiles/kis_tileddatamanager.cc
  27. +5
    -5
      chalk/core/tiles/kis_tileddatamanager.h
  28. +1
    -1
      chalk/core/tiles/kis_tilediterator.cc
  29. +1
    -1
      chalk/core/tiles/kis_tilediterator.h
  30. +9
    -9
      chalk/doc/colorspaces.xmi
  31. +22
    -22
      chalk/doc/controller.xmi
  32. +1
    -1
      chalk/doc/histograms.xmi
  33. +2
    -2
      chalk/plugins/viewplugins/substrate/kis_repeating_substrate.h
  34. +2
    -2
      chalk/sdk/kis_annotation.h
  35. +5
    -5
      chalk/sdk/kis_shared_ptr_vector.h
  36. +2
    -2
      chalk/ui/kis_opengl_image_context.h
  37. +1
    -1
      chalk/ui/kis_tool.h
  38. +1
    -1
      chalk/ui/kis_tool_factory.h
  39. +2
    -2
      chalk/ui/kis_tool_types.h
  40. +2
    -2
      kexi/core/kexi.cpp
  41. +1
    -1
      kexi/core/kexiactioncategories.h
  42. +1
    -1
      kexi/formeditor/scripting/formscript.h
  43. +1
    -1
      kexi/kexidb/preparedstatement.cpp
  44. +2
    -2
      kexi/kexidb/preparedstatement.h
  45. +12
    -12
      kexi/plugins/macros/kexiactions/datatableaction.cpp
  46. +2
    -2
      kexi/plugins/macros/kexiactions/datatableaction.h
  47. +7
    -7
      kexi/plugins/macros/kexiactions/executeaction.cpp
  48. +2
    -2
      kexi/plugins/macros/kexiactions/executeaction.h
  49. +2
    -2
      kexi/plugins/macros/kexiactions/messageaction.cpp
  50. +1
    -1
      kexi/plugins/macros/kexiactions/messageaction.h
  51. +9
    -9
      kexi/plugins/macros/kexiactions/navigateaction.cpp
  52. +2
    -2
      kexi/plugins/macros/kexiactions/navigateaction.h
  53. +1
    -1
      kexi/plugins/macros/kexiactions/objectnamevariable.h
  54. +1
    -1
      kexi/plugins/macros/kexiactions/objectvariable.h
  55. +9
    -9
      kexi/plugins/macros/kexiactions/openaction.cpp
  56. +2
    -2
      kexi/plugins/macros/kexiactions/openaction.h
  57. +13
    -13
      kexi/plugins/macros/kexipart/keximacrodesignview.cpp
  58. +2
    -2
      kexi/plugins/macros/kexipart/keximacrodesignview.h
  59. +4
    -4
      kexi/plugins/macros/kexipart/keximacroerror.cpp
  60. +1
    -1
      kexi/plugins/macros/kexipart/keximacroerror.h
  61. +1
    -1
      kexi/plugins/macros/kexipart/keximacropart.cpp
  62. +21
    -21
      kexi/plugins/macros/kexipart/keximacroproperty.cpp
  63. +4
    -4
      kexi/plugins/macros/kexipart/keximacroproperty.h
  64. +3
    -3
      kexi/plugins/macros/kexipart/keximacroview.cpp
  65. +1
    -1
      kexi/plugins/macros/kexipart/keximacroview.h
  66. +6
    -6
      kexi/plugins/macros/lib/action.cpp
  67. +6
    -6
      kexi/plugins/macros/lib/action.h
  68. +19
    -19
      kexi/plugins/macros/lib/context.cpp
  69. +8
    -8
      kexi/plugins/macros/lib/context.h
  70. +8
    -8
      kexi/plugins/macros/lib/macro.cpp
  71. +5
    -5
      kexi/plugins/macros/lib/macro.h
  72. +12
    -12
      kexi/plugins/macros/lib/macroitem.cpp
  73. +7
    -7
      kexi/plugins/macros/lib/macroitem.h
  74. +8
    -8
      kexi/plugins/macros/lib/manager.cpp
  75. +8
    -8
      kexi/plugins/macros/lib/manager.h
  76. +10
    -10
      kexi/plugins/macros/lib/metamethod.cpp
  77. +8
    -8
      kexi/plugins/macros/lib/metamethod.h
  78. +6
    -6
      kexi/plugins/macros/lib/metaobject.cpp
  79. +6
    -6
      kexi/plugins/macros/lib/metaobject.h
  80. +2
    -2
      kexi/plugins/macros/lib/metaparameter.cpp
  81. +3
    -3
      kexi/plugins/macros/lib/metaparameter.h
  82. +1
    -1
      kexi/plugins/macros/lib/variable.cpp
  83. +4
    -4
      kexi/plugins/macros/lib/variable.h
  84. +9
    -9
      kexi/plugins/macros/lib/xmlhandler.cpp
  85. +9
    -9
      kexi/plugins/macros/tests/actiontests.cpp
  86. +40
    -40
      kexi/plugins/macros/tests/commontests.cpp
  87. +12
    -12
      kexi/plugins/macros/tests/macroitemtests.cpp
  88. +6
    -6
      kexi/plugins/macros/tests/macrotests.cpp
  89. +3
    -3
      kexi/plugins/macros/tests/testaction.cpp
  90. +2
    -2
      kexi/plugins/macros/tests/testaction.h
  91. +12
    -12
      kexi/plugins/macros/tests/variabletests.cpp
  92. +21
    -21
      kexi/plugins/macros/tests/xmlhandlertests.cpp
  93. +2
    -2
      kexi/plugins/macros/tests/xmlhandlertests.h
  94. +77
    -77
      kexi/plugins/macros/tests/xmlhandlertests2.cpp
  95. +7
    -7
      kexi/plugins/macros/tests/xmlhandlertests2.h
  96. +2
    -2
      kexi/plugins/scripting/kexidb/kexidbconnection.h
  97. +1
    -1
      kpresenter/KPrBgSpellCheck.cpp
  98. +1
    -1
      kpresenter/KPrView.cpp
  99. +1
    -1
      kword/KWBgSpellCheck.cpp
  100. +1
    -1
      kword/KWView.cpp

+ 1
- 1
chalk/chalkcolor/kis_channelinfo.h View File

@@ -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


+ 2
- 2
chalk/chalkcolor/kis_histogram_producer.h View File

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

typedef KSharedPtr<KisHistogramProducer> KisHistogramProducerSP;
typedef TDESharedPtr<KisHistogramProducer> KisHistogramProducerSP;

class KisHistogramProducerFactory {
public:


+ 1
- 1
chalk/core/kis_alpha_mask.h View File

@@ -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:
/**


+ 1
- 1
chalk/core/kis_background.cc View File

@@ -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);


+ 1
- 1
chalk/core/kis_background.h View File

@@ -22,7 +22,7 @@

#include <ksharedptr.h>

class KisBackground : public KShared {
class KisBackground : public TDEShared {

public:
KisBackground();


+ 2
- 2
chalk/core/kis_convolution_painter.h View File

@@ -35,9 +35,9 @@ enum KisConvolutionBorderOp {
};

class KisKernel;
typedef KSharedPtr<KisKernel> KisKernelSP;
typedef TDESharedPtr<KisKernel> KisKernelSP;

class KisKernel : public KShared
class KisKernel : public TDEShared
{

public:


+ 1
- 1
chalk/core/kis_filter.h View File

@@ -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:


+ 1
- 1
chalk/core/kis_histogram.h View File

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


+ 2
- 2
chalk/core/kis_image.cc View File

@@ -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) {


+ 1
- 1
chalk/core/kis_image.h View File

@@ -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



+ 3
- 3
chalk/core/kis_iterator.h View File

@@ -23,13 +23,13 @@
#include <ksharedptr.h>

class KisTiledRectIterator;
typedef KSharedPtr<KisTiledRectIterator> KisTiledRectIteratorSP;
typedef TDESharedPtr<KisTiledRectIterator> KisTiledRectIteratorSP;

class KisTiledVLineIterator;
typedef KSharedPtr<KisTiledVLineIterator> KisTiledVLineIteratorSP;
typedef TDESharedPtr<KisTiledVLineIterator> KisTiledVLineIteratorSP;

class KisTiledHLineIterator;
typedef KSharedPtr<KisTiledHLineIterator> KisTiledHLineIteratorSP;
typedef TDESharedPtr<KisTiledHLineIterator> KisTiledHLineIteratorSP;

class KisDataManager;



+ 2
- 2
chalk/core/kis_layer.cc View File

@@ -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();


+ 1
- 1
chalk/core/kis_layer.h View File

@@ -38,7 +38,7 @@ class KisGroupLayer;
* is at the top of the group in the layerlist, using next will iterate to the bottom to last,
* 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


+ 2
- 2
chalk/core/kis_merge_visitor.h View File

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


+ 3
- 3
chalk/core/kis_paint_device.cc View File

@@ -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;


+ 3
- 3
chalk/core/kis_paint_device.h View File

@@ -57,10 +57,10 @@ class KisRandomSubAccessorPixel;
class KisUndoAdapter;
class KisFilter;
class KisDataManager;
typedef KSharedPtr<KisDataManager> KisDataManagerSP;
typedef TDESharedPtr<KisDataManager> KisDataManagerSP;

class KisMemento;
typedef KSharedPtr<KisMemento> KisMementoSP;
typedef TDESharedPtr<KisMemento> KisMementoSP;


/**
@@ -72,7 +72,7 @@ typedef KSharedPtr<KisMemento> KisMementoSP;
*/
class KRITACORE_EXPORT KisPaintDevice
: public TQObject
, public KShared
, public TDEShared
{

Q_OBJECT


+ 1
- 1
chalk/core/kis_paint_layer.h View File

@@ -151,7 +151,7 @@ private:
bool m_editMask;
};

typedef KSharedPtr<KisPaintLayer> KisPaintLayerSP;
typedef TDESharedPtr<KisPaintLayer> KisPaintLayerSP;

#endif // KIS_PAINT_LAYER_H_


+ 2
- 2
chalk/core/kis_paintop.h View File

@@ -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:


+ 2
- 2
chalk/core/kis_perspective_grid.h View File

@@ -27,12 +27,12 @@
#include <kis_point.h>
#include <ksharedptr.h>

class KisPerspectiveGridNode : public KisPoint, public KShared {
class KisPerspectiveGridNode : public KisPoint, public TDEShared {
public:
inline KisPerspectiveGridNode(double x, double y) : KisPoint(x,y) { }
inline KisPerspectiveGridNode(KisPoint p) : KisPoint(p) { }
};
typedef KSharedPtr<KisPerspectiveGridNode> KisPerspectiveGridNodeSP;
typedef TDESharedPtr<KisPerspectiveGridNode> KisPerspectiveGridNodeSP;

class KisSubPerspectiveGrid {
public:


+ 1
- 1
chalk/core/kis_random_accessor.h View File

@@ -25,7 +25,7 @@
#include <kis_global.h>

class KisTiledRandomAccessor;
typedef KSharedPtr<KisTiledRandomAccessor> KisTiledRandomAccessorSP;
typedef TDESharedPtr<KisTiledRandomAccessor> KisTiledRandomAccessorSP;

class KisTiledDataManager;



+ 2
- 2
chalk/core/kis_substrate.h View File

@@ -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() {};




+ 15
- 15
chalk/core/kis_types.h View File

@@ -35,56 +35,56 @@
*/

class KisImage;
typedef KSharedPtr<KisImage> KisImageSP;
typedef TDESharedPtr<KisImage> KisImageSP;

class KisPaintDevice;
typedef KSharedPtr<KisPaintDevice> KisPaintDeviceSP;
typedef TDESharedPtr<KisPaintDevice> KisPaintDeviceSP;
typedef KisSharedPtrVector<KisPaintDevice> vKisPaintDeviceSP;
typedef vKisPaintDeviceSP::iterator vKisPaintDeviceSP_it;
typedef vKisPaintDeviceSP::const_iterator vKisPaintDeviceSP_cit;

class KisLayer;
typedef KSharedPtr<KisLayer> KisLayerSP;
typedef TDESharedPtr<KisLayer> KisLayerSP;
typedef KisSharedPtrVector<KisLayer> vKisLayerSP;
typedef vKisLayerSP::iterator vKisLayerSP_it;
typedef vKisLayerSP::const_iterator vKisLayerSP_cit;

class KisPartLayer;
typedef KSharedPtr<KisPartLayer> KisPartLayerSP;
typedef TDESharedPtr<KisPartLayer> KisPartLayerSP;

class KisPaintLayer;
typedef KSharedPtr<KisPaintLayer> KisPaintLayerSP;
typedef TDESharedPtr<KisPaintLayer> KisPaintLayerSP;

class KisAdjustmentLayer;
typedef KSharedPtr<KisAdjustmentLayer> KisAdjustmentLayerSP;
typedef TDESharedPtr<KisAdjustmentLayer> KisAdjustmentLayerSP;

class KisGroupLayer;
typedef KSharedPtr<KisGroupLayer> KisGroupLayerSP;
typedef TDESharedPtr<KisGroupLayer> KisGroupLayerSP;

class KisSelection;
typedef KSharedPtr<KisSelection> KisSelectionSP;
typedef TDESharedPtr<KisSelection> KisSelectionSP;

class KisBackground;
typedef KSharedPtr<KisBackground> KisBackgroundSP;
typedef TDESharedPtr<KisBackground> KisBackgroundSP;

class KisSubstrate;
typedef KSharedPtr<KisSubstrate> KisSubstrateSP;
typedef TDESharedPtr<KisSubstrate> KisSubstrateSP;

class KisHistogram;
typedef KSharedPtr<KisHistogram> KisHistogramSP;
typedef TDESharedPtr<KisHistogram> KisHistogramSP;

class KisPaintOpFactory;
typedef KSharedPtr<KisPaintOpFactory> KisPaintOpFactorySP;
typedef TDESharedPtr<KisPaintOpFactory> KisPaintOpFactorySP;

typedef TQValueVector<TQPoint> vKisSegments;

//class KisGuide;
//typedef KSharedPtr<KisGuide> KisGuideSP;
//typedef TDESharedPtr<KisGuide> KisGuideSP;

class KisAlphaMask;
typedef KSharedPtr<KisAlphaMask> KisAlphaMaskSP;
typedef TDESharedPtr<KisAlphaMask> KisAlphaMaskSP;

class KisFilter;
typedef KSharedPtr<KisFilter> KisFilterSP;
typedef TDESharedPtr<KisFilter> KisFilterSP;

#endif // KISTYPES_H_

+ 1
- 1
chalk/core/tiles/kis_memento.cc View File

@@ -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);


+ 2
- 2
chalk/core/tiles/kis_memento.h View File

@@ -28,9 +28,9 @@ class KisTile;
class KisTiledDataManager;

class KisMemento;
typedef KSharedPtr<KisMemento> KisMementoSP;
typedef TDESharedPtr<KisMemento> KisMementoSP;

class KisMemento : public KShared
class KisMemento : public TDEShared
{
public:
KisMemento(TQ_UINT32 pixelSize);


+ 1
- 1
chalk/core/tiles/kis_tiled_random_accessor.h View File

@@ -27,7 +27,7 @@

class KisTile;

class KisTiledRandomAccessor : public KShared {
class KisTiledRandomAccessor : public TDEShared {
struct KisTileInfo {
KisTile* tile;
KisTile* oldtile;


+ 1
- 1
chalk/core/tiles/kis_tileddatamanager.cc View File

@@ -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;



+ 5
- 5
chalk/core/tiles/kis_tileddatamanager.h View File

@@ -28,16 +28,16 @@
#include "kis_memento.h"

class KisTiledDataManager;
typedef KSharedPtr<KisTiledDataManager> KisTiledDataManagerSP;
typedef TDESharedPtr<KisTiledDataManager> KisTiledDataManagerSP;

class KisDataManager;
typedef KSharedPtr<KisDataManager> KisDataManagerSP;
typedef TDESharedPtr<KisDataManager> KisDataManagerSP;

class KisTiledIterator;
class KisTiledRandomAccessor;
class KoStore;

class KisTileDataWrapper : public KShared {
class KisTileDataWrapper : public TDEShared {
KisTile* m_tile;
TQ_INT32 m_offset;
public:
@@ -46,7 +46,7 @@ public:
TQ_UINT8* data() const { return m_tile->data() + m_offset; }
};

typedef KSharedPtr<KisTileDataWrapper> KisTileDataWrapperSP;
typedef TDESharedPtr<KisTileDataWrapper> KisTileDataWrapperSP;

/**
* KisTiledDataManager implements the interface that KisDataManager defines
@@ -64,7 +64,7 @@ typedef KSharedPtr<KisTileDataWrapper> KisTileDataWrapperSP;
* how many TQ_UINT8's a single pixel takes.
*/

class KisTiledDataManager : public KShared {
class KisTiledDataManager : public TDEShared {

protected:
KisTiledDataManager(TQ_UINT32 pixelSize, const TQ_UINT8 *defPixel);


+ 1
- 1
chalk/core/tiles/kis_tilediterator.cc View File

@@ -44,7 +44,7 @@ KisTiledIterator::~KisTiledIterator( )
}

KisTiledIterator::KisTiledIterator(const KisTiledIterator& rhs)
: KShared()
: TDEShared()
{
if (this != &rhs) {
m_ktm = rhs.m_ktm;


+ 1
- 1
chalk/core/tiles/kis_tilediterator.h View File

@@ -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;


+ 9
- 9
chalk/doc/colorspaces.xmi View File

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


+ 22
- 22
chalk/doc/controller.xmi View File

@@ -2055,7 +2055,7 @@ That last bit has not been solved yet.
</UML:Operation>
</UML:Classifier.feature>
</UML:Class>
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="542" isRoot="false" isAbstract="false" name="KShared" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="542" isRoot="false" isAbstract="false" name="TDEShared" />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="548" isRoot="false" isAbstract="false" name=TQSTRING_OBJECT_NAME_STRING />
<UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="558" isRoot="false" isAbstract="false" name="bool" />
<UML:Class stereotype="362" isSpecification="false" isLeaf="false" visibility="public" xmi.id="570" isRoot="false" isAbstract="false" name="KisIDList" />
@@ -7942,7 +7942,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
<header>
<codecomment tag="" />
</header>
<ccfdeclarationcodeblock parent_id="964" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KShared = new KShared ( );" >
<ccfdeclarationcodeblock parent_id="964" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public TDEShared = new TDEShared ( );" >
<header>
<codecomment tag="" writeOutText="false" indentLevel="1" />
</header>
@@ -7959,12 +7959,12 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
</codeaccessormethod>
<codeaccessormethod accessType="2" parent_id="964" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="964" role_id="0" text=".add(value);" >
<header>
<javacodedocumentation tag="" indentLevel="1" text="Add an object of type KShared to the List &amp;#010;&amp;#010;@return void" />
<javacodedocumentation tag="" indentLevel="1" text="Add an object of type TDEShared to the List &amp;#010;&amp;#010;@return void" />
</header>
</codeaccessormethod>
<codeaccessormethod accessType="3" parent_id="964" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="964" role_id="0" text=".remove(value);" >
<header>
<javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KShared from the List &amp;#010;" />
<javacodedocumentation tag="" indentLevel="1" text="Remove an object of type TDEShared from the List &amp;#010;" />
</header>
</codeaccessormethod>
<codeaccessormethod accessType="4" parent_id="964" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="964" role_id="0" text="return (List) ;" >
@@ -9436,7 +9436,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
<header>
<codecomment tag="" />
</header>
<ccfdeclarationcodeblock parent_id="1436" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KShared = new KShared ( );" >
<ccfdeclarationcodeblock parent_id="1436" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public TDEShared = new TDEShared ( );" >
<header>
<codecomment tag="" writeOutText="false" indentLevel="1" />
</header>
@@ -9453,12 +9453,12 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
</codeaccessormethod>
<codeaccessormethod accessType="2" parent_id="1436" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1436" role_id="0" text=".add(value);" >
<header>
<javacodedocumentation tag="" indentLevel="1" text="Add an object of type KShared to the List &amp;#010;&amp;#010;@return void" />
<javacodedocumentation tag="" indentLevel="1" text="Add an object of type TDEShared to the List &amp;#010;&amp;#010;@return void" />
</header>
</codeaccessormethod>
<codeaccessormethod accessType="3" parent_id="1436" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1436" role_id="0" text=".remove(value);" >
<header>
<javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KShared from the List &amp;#010;" />
<javacodedocumentation tag="" indentLevel="1" text="Remove an object of type TDEShared from the List &amp;#010;" />
</header>
</codeaccessormethod>
<codeaccessormethod accessType="4" parent_id="1436" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1436" role_id="0" text="return (List) ;" >
@@ -13261,7 +13261,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
<header>
<codecomment tag="" />
</header>
<ccfdeclarationcodeblock parent_id="673" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KShared = new KShared ( );" >
<ccfdeclarationcodeblock parent_id="673" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public TDEShared = new TDEShared ( );" >
<header>
<codecomment tag="" writeOutText="false" indentLevel="1" />
</header>
@@ -13278,12 +13278,12 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
</codeaccessormethod>
<codeaccessormethod accessType="2" parent_id="673" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="673" role_id="0" text=".add(value);" >
<header>
<javacodedocumentation tag="" indentLevel="1" text="Add an object of type KShared to the List &amp;#010;&amp;#010;@return void" />
<javacodedocumentation tag="" indentLevel="1" text="Add an object of type TDEShared to the List &amp;#010;&amp;#010;@return void" />
</header>
</codeaccessormethod>
<codeaccessormethod accessType="3" parent_id="673" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="673" role_id="0" text=".remove(value);" >
<header>
<javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KShared from the List &amp;#010;" />
<javacodedocumentation tag="" indentLevel="1" text="Remove an object of type TDEShared from the List &amp;#010;" />
</header>
</codeaccessormethod>
<codeaccessormethod accessType="4" parent_id="673" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="673" role_id="0" text="return (List) ;" >
@@ -14235,7 +14235,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
<header>
<codecomment tag="" />
</header>
<ccfdeclarationcodeblock parent_id="920" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KShared = new KShared ( );" >
<ccfdeclarationcodeblock parent_id="920" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public TDEShared = new TDEShared ( );" >
<header>
<codecomment tag="" writeOutText="false" indentLevel="1" />
</header>
@@ -14252,12 +14252,12 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
</codeaccessormethod>
<codeaccessormethod accessType="2" parent_id="920" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="920" role_id="0" text=".add(value);" >
<header>
<javacodedocumentation tag="" indentLevel="1" text="Add an object of type KShared to the List &amp;#010;&amp;#010;@return void" />
<javacodedocumentation tag="" indentLevel="1" text="Add an object of type TDEShared to the List &amp;#010;&amp;#010;@return void" />
</header>
</codeaccessormethod>
<codeaccessormethod accessType="3" parent_id="920" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="920" role_id="0" text=".remove(value);" >
<header>
<javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KShared from the List &amp;#010;" />
<javacodedocumentation tag="" indentLevel="1" text="Remove an object of type TDEShared from the List &amp;#010;" />
</header>
</codeaccessormethod>
<codeaccessormethod accessType="4" parent_id="920" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="920" role_id="0" text="return (List) ;" >
@@ -15099,7 +15099,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
<header>
<codecomment tag="" />
</header>
<ccfdeclarationcodeblock parent_id="656" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KShared = new KShared ( );" >
<ccfdeclarationcodeblock parent_id="656" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public TDEShared = new TDEShared ( );" >
<header>
<codecomment tag="" writeOutText="false" indentLevel="1" />
</header>
@@ -15116,12 +15116,12 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
</codeaccessormethod>
<codeaccessormethod accessType="2" parent_id="656" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="656" role_id="0" text=".add(value);" >
<header>
<javacodedocumentation tag="" indentLevel="1" text="Add an object of type KShared to the List &amp;#010;&amp;#010;@return void" />
<javacodedocumentation tag="" indentLevel="1" text="Add an object of type TDEShared to the List &amp;#010;&amp;#010;@return void" />
</header>
</codeaccessormethod>
<codeaccessormethod accessType="3" parent_id="656" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="656" role_id="0" text=".remove(value);" >
<header>
<javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KShared from the List &amp;#010;" />
<javacodedocumentation tag="" indentLevel="1" text="Remove an object of type TDEShared from the List &amp;#010;" />
</header>
</codeaccessormethod>
<codeaccessormethod accessType="4" parent_id="656" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="656" role_id="0" text="return (List) ;" >
@@ -17605,7 +17605,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
<header>
<codecomment tag="" />
</header>
<ccfdeclarationcodeblock parent_id="543" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KShared = new KShared ( );" >
<ccfdeclarationcodeblock parent_id="543" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public TDEShared = new TDEShared ( );" >
<header>
<codecomment tag="" writeOutText="false" indentLevel="1" />
</header>
@@ -17622,12 +17622,12 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
</codeaccessormethod>
<codeaccessormethod accessType="2" parent_id="543" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="543" role_id="0" text=".add(value);" >
<header>
<javacodedocumentation tag="" indentLevel="1" text="Add an object of type KShared to the List &amp;#010;&amp;#010;@return void" />
<javacodedocumentation tag="" indentLevel="1" text="Add an object of type TDEShared to the List &amp;#010;&amp;#010;@return void" />
</header>
</codeaccessormethod>
<codeaccessormethod accessType="3" parent_id="543" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="543" role_id="0" text=".remove(value);" >
<header>
<javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KShared from the List &amp;#010;" />
<javacodedocumentation tag="" indentLevel="1" text="Remove an object of type TDEShared from the List &amp;#010;" />
</header>
</codeaccessormethod>
<codeaccessormethod accessType="4" parent_id="543" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="543" role_id="0" text="return (List) ;" >
@@ -17678,7 +17678,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
</codeclassfield>
</classfields>
</classifiercodedocument>
<classifiercodedocument writeOutCode="true" package="" id="542" parent_class="542" fileExt=".java" fileName="KShared" >
<classifiercodedocument writeOutCode="true" package="" id="542" parent_class="542" fileExt=".java" fileName="TDEShared" >
<textblocks>
<codeblockwithcomments tag="packages" writeOutText="false" >
<header>
@@ -17692,7 +17692,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
</codeblockwithcomments>
<javaclassdeclarationblock parent_id="542" tag="ClassDeclBlock" canDelete="false" >
<header>
<javacodedocumentation tag="" text="Class KShared&amp;#010;" />
<javacodedocumentation tag="" text="Class TDEShared&amp;#010;" />
</header>
<textblocks>
<hierarchicalcodeblock tag="fieldsDecl" canDelete="false" indentLevel="1" >
@@ -17711,7 +17711,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
<codecomment tag="" indentLevel="1" text="Constructors" />
</header>
<textblocks>
<codeblockwithcomments tag="emptyconstructor" writeOutText="false" indentLevel="1" text="public KShared ( ) { }" >
<codeblockwithcomments tag="emptyconstructor" writeOutText="false" indentLevel="1" text="public TDEShared ( ) { }" >
<header>
<codecomment tag="" indentLevel="1" text="Empty Constructor" />
</header>


+ 1
- 1
chalk/doc/histograms.xmi View File

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


+ 2
- 2
chalk/plugins/viewplugins/substrate/kis_repeating_substrate.h View File

@@ -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() {};




+ 2
- 2
chalk/sdk/kis_annotation.h View File

@@ -40,7 +40,7 @@
*
* Examples of annotations are EXIF data and ICC profiles.
*/
class KisAnnotation : public KShared {
class KisAnnotation : public TDEShared {


public:
@@ -81,7 +81,7 @@ private:

};

typedef KSharedPtr<KisAnnotation> KisAnnotationSP;
typedef TDESharedPtr<KisAnnotation> KisAnnotationSP;
typedef KisSharedPtrVector<KisAnnotation> vKisAnnotationSP;
typedef vKisAnnotationSP::iterator vKisAnnotationSP_it;
typedef vKisAnnotationSP::const_iterator vKisAnnotationSP_cit;


+ 5
- 5
chalk/sdk/kis_shared_ptr_vector.h View File

@@ -25,15 +25,15 @@

/**
* TQValueVector does not always destroy an element when it is erased.
* If the items it is holding are KSharedPtr, this can result in hidden
* If the items it is holding are TDESharedPtr, this can result in hidden
* references to objects that cannot be accounted for. This class
* sets the KSharedPtr to 0 on erase, which dereferences the object as
* sets the TDESharedPtr to 0 on erase, which dereferences the object as
* expected.
*/
template <class T>
class KisSharedPtrVector : public TQValueVector< KSharedPtr<T> >
class KisSharedPtrVector : public TQValueVector< TDESharedPtr<T> >
{
typedef TQValueVector< KSharedPtr<T> > super;
typedef TQValueVector< TDESharedPtr<T> > super;
public:
KisSharedPtrVector() {}

@@ -57,7 +57,7 @@ public:
return super::erase(first, last);
}

bool contains(KSharedPtr<T> ptr) const
bool contains(TDESharedPtr<T> ptr) const
{
for (int i = 0, n = super::count(); i < n; ++i)
if (super::at(i) == ptr)


+ 2
- 2
chalk/ui/kis_opengl_image_context.h View File

@@ -37,10 +37,10 @@
class TQRegion;

class KisOpenGLImageContext;
typedef KSharedPtr<KisOpenGLImageContext> KisOpenGLImageContextSP;
typedef TDESharedPtr<KisOpenGLImageContext> KisOpenGLImageContextSP;
class KisColorSpace;

class KRITACORE_EXPORT KisOpenGLImageContext : public TQObject , public KShared {
class KRITACORE_EXPORT KisOpenGLImageContext : public TQObject , public TDEShared {

Q_OBJECT


+ 1
- 1
chalk/ui/kis_tool.h View File

@@ -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



+ 1
- 1
chalk/ui/kis_tool_factory.h View File

@@ -25,7 +25,7 @@
#include "kis_types.h"
#include "kactioncollection.h"

class KisToolFactory : public KShared
class KisToolFactory : public TDEShared
{

public:


+ 2
- 2
chalk/ui/kis_tool_types.h View File

@@ -23,12 +23,12 @@


class KisTool;
typedef KSharedPtr<KisTool> KisToolSP;
typedef TDESharedPtr<KisTool> KisToolSP;
typedef KisSharedPtrVector<KisTool> vKisTool;
typedef vKisTool::iterator vKisTool_it;
typedef vKisTool::const_iterator vKisTool_cit;

class KisToolFactory;
typedef KSharedPtr<KisToolFactory> KisToolFactorySP;
typedef TDESharedPtr<KisToolFactory> KisToolFactorySP;

#endif // KIS_TOOL_TYPES_H_

+ 2
- 2
kexi/core/kexi.cpp View File

@@ -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)
{


+ 1
- 1
kexi/core/kexiactioncategories.h View File

@@ -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();


+ 1
- 1
kexi/formeditor/scripting/formscript.h View File

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



+ 1
- 1
kexi/kexidb/preparedstatement.cpp View File

@@ -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)


+ 2
- 2
kexi/kexidb/preparedstatement.h View File

@@ -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<PreparedStatement> Ptr;
typedef TDESharedPtr<PreparedStatement> Ptr;

//! Defines type of the prepared statement.
enum StatementType {


+ 12
- 12
kexi/plugins/macros/kexiactions/datatableaction.cpp View File

@@ -46,7 +46,7 @@ namespace KexiMacro {
{
TQStringList list;
list << "import" << "export";
this->appendChild( KSharedPtr<KoMacro::Variable>( new KoMacro::Variable(list, "@list") ) );
this->appendChild( TDESharedPtr<KoMacro::Variable>( new KoMacro::Variable(list, "@list") ) );

this->setVariant( list[0] );
}
@@ -61,7 +61,7 @@ namespace KexiMacro {
{
TQStringList list;
list << "file" << "clipboard";
this->appendChild( KSharedPtr<KoMacro::Variable>( new KoMacro::Variable(list, "@list") ) );
this->appendChild( TDESharedPtr<KoMacro::Variable>( new KoMacro::Variable(list, "@list") ) );

this->setVariant( list[0] );
}
@@ -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<KoMacro::Variable>(new KoMacro::Variable(*it)) );
this->appendChild( TDESharedPtr<KoMacro::Variable>(new KoMacro::Variable(*it)) );

//const TQString name = info->objectName(); //info->groupName();
//this->appendChild( KSharedPtr<KoMacro::Variable>(new KoMacro::Variable(name)) );
//this->appendChild( TDESharedPtr<KoMacro::Variable>(new KoMacro::Variable(name)) );
}
const TQString n =
namelist.contains(partitem)
@@ -106,20 +106,20 @@ namespace KexiMacro {
DataTableAction::DataTableAction()
: KexiAction("datatable", i18n("Data Table"))
{
setVariable(KSharedPtr<KoMacro::Variable>( new MethodVariable<DataTableAction>(this) ));
setVariable(KSharedPtr<KoMacro::Variable>( new TypeVariable<DataTableAction>(this) ));
setVariable(KSharedPtr<KoMacro::Variable>( new PartItemVariable<DataTableAction>(this) ));
setVariable(TDESharedPtr<KoMacro::Variable>( new MethodVariable<DataTableAction>(this) ));
setVariable(TDESharedPtr<KoMacro::Variable>( new TypeVariable<DataTableAction>(this) ));
setVariable(TDESharedPtr<KoMacro::Variable>( new PartItemVariable<DataTableAction>(this) ));
}

DataTableAction::~DataTableAction()
{
}

bool DataTableAction::notifyUpdated(KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name)
bool DataTableAction::notifyUpdated(TDESharedPtr<KoMacro::MacroItem> macroitem, const TQString& name)
{
kdDebug()<<"DataTableAction::notifyUpdated() name="<<name<<" macroitem.action="<<(macroitem->action() ? macroitem->action()->name() : "NOACTION")<<endl;
/*
KSharedPtr<KoMacro::Variable> variable = macroitem->variable(name, false);
TDESharedPtr<KoMacro::Variable> variable = macroitem->variable(name, false);
if(! variable) {
kdWarning()<<"DataTableAction::notifyUpdated() No such variable="<<name<<" in macroitem."<<endl;
return false;
@@ -128,16 +128,16 @@ bool DataTableAction::notifyUpdated(KSharedPtr<KoMacro::MacroItem> macroitem, co
if(name == "method") {
const int partitem = macroitem->variant(OBJECT, true).toString();
macroitem->variable(OBJECT, true)->setChildren(
KoMacro::Variable::List() << KSharedPtr<KoMacro::Variable>(new ObjectVariable<ExecuteAction>(this, partitem)) );
KoMacro::Variable::List() << TDESharedPtr<KoMacro::Variable>(new ObjectVariable<ExecuteAction>(this, partitem)) );
}
*/
return true;
}

void DataTableAction::activate(KSharedPtr<KoMacro::Context> context)
void DataTableAction::activate(TDESharedPtr<KoMacro::Context> context)
{
if(! mainWin()->project()) {
kdWarning() << "ExecuteAction::activate(KSharedPtr<KoMacro::Context>) Invalid project" << endl;
kdWarning() << "ExecuteAction::activate(TDESharedPtr<KoMacro::Context>) Invalid project" << endl;
return;
}



+ 2
- 2
kexi/plugins/macros/kexiactions/datatableaction.h View File

@@ -61,7 +61,7 @@ namespace KexiMacro {
* @return true if the update was successfully else false
* is returned.
*/
virtual bool notifyUpdated(KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name);
virtual bool notifyUpdated(TDESharedPtr<KoMacro::MacroItem> 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<KoMacro::Context> context);
virtual void activate(TDESharedPtr<KoMacro::Context> context);

};
}


+ 7
- 7
kexi/plugins/macros/kexiactions/executeaction.cpp View File

@@ -40,20 +40,20 @@ ExecuteAction::ExecuteAction()
: KexiAction("execute", i18n("Execute"))
{
int conditions = ObjectVariable<ExecuteAction>::VisibleInNav | ObjectVariable<ExecuteAction>::Executable;
KSharedPtr<KoMacro::Variable> objvar = new ObjectVariable<ExecuteAction>(this, conditions);
TDESharedPtr<KoMacro::Variable> objvar = new ObjectVariable<ExecuteAction>(this, conditions);
setVariable(objvar);

setVariable(KSharedPtr<KoMacro::Variable>( new ObjectNameVariable<ExecuteAction>(this, objvar->variant().toString()) ));
setVariable(TDESharedPtr<KoMacro::Variable>( new ObjectNameVariable<ExecuteAction>(this, objvar->variant().toString()) ));
}

ExecuteAction::~ExecuteAction()
{
}

bool ExecuteAction::notifyUpdated(KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name)
bool ExecuteAction::notifyUpdated(TDESharedPtr<KoMacro::MacroItem> macroitem, const TQString& name)
{
kdDebug()<<"ExecuteAction::notifyUpdated() name="<<name<<" macroitem.action="<<(macroitem->action() ? macroitem->action()->name() : "NOACTION")<<endl;
KSharedPtr<KoMacro::Variable> variable = macroitem->variable(name, false);
TDESharedPtr<KoMacro::Variable> variable = macroitem->variable(name, false);
if(! variable) {
kdWarning()<<"ExecuteAction::notifyUpdated() No such variable="<<name<<" in macroitem."<<endl;
return false;
@@ -64,16 +64,16 @@ bool ExecuteAction::notifyUpdated(KSharedPtr<KoMacro::MacroItem> macroitem, cons
const TQString objectvalue = macroitem->variant(OBJECT, true).toString(); // e.g. "macro" or "script"
const TQString 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<KoMacro::Variable>(new ObjectNameVariable<ExecuteAction>(this, objectvalue, objectname)) );
KoMacro::Variable::List() << TDESharedPtr<KoMacro::Variable>(new ObjectNameVariable<ExecuteAction>(this, objectvalue, objectname)) );
}

return true;
}

void ExecuteAction::activate(KSharedPtr<KoMacro::Context> context)
void ExecuteAction::activate(TDESharedPtr<KoMacro::Context> context)
{
if(! mainWin()->project()) {
kdWarning() << "ExecuteAction::activate(KSharedPtr<KoMacro::Context>) Invalid project" << endl;
kdWarning() << "ExecuteAction::activate(TDESharedPtr<KoMacro::Context>) Invalid project" << endl;
return;
}



+ 2
- 2
kexi/plugins/macros/kexiactions/executeaction.h View File

@@ -63,7 +63,7 @@ namespace KexiMacro {
* @return true if the update was successfully else false
* is returned.
*/
virtual bool notifyUpdated(KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name);
virtual bool notifyUpdated(TDESharedPtr<KoMacro::MacroItem> 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<KoMacro::Context> context);
virtual void activate(TDESharedPtr<KoMacro::Context> context);

};
}


+ 2
- 2
kexi/plugins/macros/kexiactions/messageaction.cpp View File

@@ -39,9 +39,9 @@ MessageAction::~MessageAction()
{
}

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


+ 1
- 1
kexi/plugins/macros/kexiactions/messageaction.h View File

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

};
}


+ 9
- 9
kexi/plugins/macros/kexiactions/navigateaction.cpp View File

@@ -47,7 +47,7 @@ namespace KexiMacro {
{
TQStringList list;
list << "first" << "previous" << "next" << "last" << "goto";
this->appendChild( KSharedPtr<KoMacro::Variable>( new KoMacro::Variable(list, "@list") ) );
this->appendChild( TDESharedPtr<KoMacro::Variable>( new KoMacro::Variable(list, "@list") ) );

/*TODO should this actions belong to navigate? maybe it would be more wise to have
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<NavigateAction>(this);
setVariable(KSharedPtr<KoMacro::Variable>( navvar ));
setVariable(TDESharedPtr<KoMacro::Variable>( navvar ));

KoMacro::Variable* rowvar = new KexiVariable<NavigateAction>(this, "rownr", i18n("Row"));
rowvar->setVariant(0);
setVariable(KSharedPtr<KoMacro::Variable>(rowvar));
setVariable(TDESharedPtr<KoMacro::Variable>(rowvar));

KoMacro::Variable* colvar = new KexiVariable<NavigateAction>(this, "colnr", i18n("Column"));
colvar->setVariant(0);
setVariable(KSharedPtr<KoMacro::Variable>(colvar));
setVariable(TDESharedPtr<KoMacro::Variable>(colvar));
}

NavigateAction::~NavigateAction()
{
}

bool NavigateAction::notifyUpdated(KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name)
bool NavigateAction::notifyUpdated(TDESharedPtr<KoMacro::MacroItem> macroitem, const TQString& name)
{
kdDebug()<<"NavigateAction::notifyUpdated() name="<<name<<" macroitem.action="<<(macroitem->action() ? macroitem->action()->name() : "NOACTION")<<endl;
KSharedPtr<KoMacro::Variable> variable = macroitem->variable(name, false);
TDESharedPtr<KoMacro::Variable> variable = macroitem->variable(name, false);
if(! variable) {
kdWarning()<<"NavigateAction::notifyUpdated() No such variable="<<name<<" in macroitem."<<endl;
return false;
@@ -94,15 +94,15 @@ bool NavigateAction::notifyUpdated(KSharedPtr<KoMacro::MacroItem> macroitem, con
const int colnr = macroitem->variant("colnr", true).toInt(); // e.g. "macro1" or "macro2" if objectvalue above is "macro"

macroitem->variable("rownr", true)->setChildren(
KoMacro::Variable::List() << KSharedPtr<KoMacro::Variable>(new KoMacro::Variable(rownr)) );
KoMacro::Variable::List() << TDESharedPtr<KoMacro::Variable>(new KoMacro::Variable(rownr)) );
macroitem->variable("colnr", true)->setChildren(
KoMacro::Variable::List() << KSharedPtr<KoMacro::Variable>(new KoMacro::Variable(colnr)) );
KoMacro::Variable::List() << TDESharedPtr<KoMacro::Variable>(new KoMacro::Variable(colnr)) );
}

return true;
}

void NavigateAction::activate(KSharedPtr<KoMacro::Context> context)
void NavigateAction::activate(TDESharedPtr<KoMacro::Context> context)
{
KexiDialogBase* dialog = dynamic_cast<KexiDialogBase*>( mainWin()->activeWindow() );
if(! dialog) {


+ 2
- 2
kexi/plugins/macros/kexiactions/navigateaction.h View File

@@ -63,7 +63,7 @@ namespace KexiMacro {
* @return true if the update was successfully else false
* is returned.
*/
virtual bool notifyUpdated(KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name);
virtual bool notifyUpdated(TDESharedPtr<KoMacro::MacroItem> 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<KoMacro::Context> context);
virtual void activate(TDESharedPtr<KoMacro::Context> context);

};
}


+ 1
- 1
kexi/plugins/macros/kexiactions/objectnamevariable.h View File

@@ -61,7 +61,7 @@ namespace KexiMacro {
namelist << "";

for(TQStringList::Iterator it = namelist.begin(); it != namelist.end(); ++it)
this->appendChild( KSharedPtr<KoMacro::Variable>(new KoMacro::Variable(*it)) );
this->appendChild( TDESharedPtr<KoMacro::Variable>(new KoMacro::Variable(*it)) );

this->setVariant( (name.isNull() || ! namelist.contains(name)) ? namelist[0] : name );



+ 1
- 1
kexi/plugins/macros/kexiactions/objectvariable.h View File

@@ -67,7 +67,7 @@ namespace KexiMacro {
continue;

const TQString name = info->objectName(); //info->groupName();
this->appendChild( KSharedPtr<KoMacro::Variable>(new KoMacro::Variable(name)) );
this->appendChild( TDESharedPtr<KoMacro::Variable>(new KoMacro::Variable(name)) );
}

if(! objectname.isNull())


+ 9
- 9
kexi/plugins/macros/kexiactions/openaction.cpp View File

@@ -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<KoMacro::Variable>(new KoMacro::Variable(*it)) );
this->children().append( TDESharedPtr<KoMacro::Variable>(new KoMacro::Variable(*it)) );
}
const TQString n =
namelist.contains(viewname)
@@ -81,21 +81,21 @@ OpenAction::OpenAction()
{
const int conditions = ObjectVariable<OpenAction>::VisibleInNav;
KSharedPtr<KoMacro::Variable> objvar = new ObjectVariable<OpenAction>(this, conditions);
TDESharedPtr<KoMacro::Variable> objvar = new ObjectVariable<OpenAction>(this, conditions);
setVariable(objvar);

setVariable(KSharedPtr<KoMacro::Variable>( new ObjectNameVariable<OpenAction>(this, objvar->variant().toString()) ));
setVariable(KSharedPtr<KoMacro::Variable>( new ViewVariable<OpenAction>(this, objvar->variant().toString()) ));
setVariable(TDESharedPtr<KoMacro::Variable>( new ObjectNameVariable<OpenAction>(this, objvar->variant().toString()) ));
setVariable(TDESharedPtr<KoMacro::Variable>( new ViewVariable<OpenAction>(this, objvar->variant().toString()) ));
}

OpenAction::~OpenAction()
{
}

bool OpenAction::notifyUpdated(KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name)
bool OpenAction::notifyUpdated(TDESharedPtr<KoMacro::MacroItem> macroitem, const TQString& name)
{
kdDebug()<<"OpenAction::notifyUpdated() name="<<name<<" macroitem.action="<<(macroitem->action() ? macroitem->action()->name() : "NOACTION")<<endl;
KSharedPtr<KoMacro::Variable> variable = macroitem->variable(name, false);
TDESharedPtr<KoMacro::Variable> variable = macroitem->variable(name, false);
if(! variable) {
kdWarning()<<"OpenAction::notifyUpdated() No such variable="<<name<<" in macroitem."<<endl;
return false;
@@ -108,15 +108,15 @@ bool OpenAction::notifyUpdated(KSharedPtr<KoMacro::MacroItem> macroitem, const T
const TQString viewname = macroitem->variant(VIEW, true).toString(); // "data", "design" or "text"

macroitem->variable(NAME, true)->setChildren(
KoMacro::Variable::List() << KSharedPtr<KoMacro::Variable>(new ObjectNameVariable<OpenAction>(this, objectvalue, objectname)) );
KoMacro::Variable::List() << TDESharedPtr<KoMacro::Variable>(new ObjectNameVariable<OpenAction>(this, objectvalue, objectname)) );
macroitem->variable(VIEW, true)->setChildren(
KoMacro::Variable::List() << KSharedPtr<KoMacro::Variable>(new ViewVariable<OpenAction>(this, objectvalue, viewname)) );
KoMacro::Variable::List() << TDESharedPtr<KoMacro::Variable>(new ViewVariable<OpenAction>(this, objectvalue, viewname)) );
}

return true;
}

void OpenAction::activate(KSharedPtr<KoMacro::Context> context)
void OpenAction::activate(TDESharedPtr<KoMacro::Context> context)
{
if(! mainWin()->project()) {
throw KoMacro::Exception(i18n("No project loaded."));


+ 2
- 2
kexi/plugins/macros/kexiactions/openaction.h View File

@@ -64,7 +64,7 @@ namespace KexiMacro {
* @return true if the update was successfully else false
* is returned.
*/
virtual bool notifyUpdated(KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name);
virtual bool notifyUpdated(TDESharedPtr<KoMacro::MacroItem> 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<KoMacro::Context> context);
virtual void activate(TDESharedPtr<KoMacro::Context> context);

};
}


+ 13
- 13
kexi/plugins/macros/kexipart/keximacrodesignview.cpp View File

@@ -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<KoMacro::Action> action = KoMacro::Manager::self()->action(*it);
TDESharedPtr<KoMacro::Action> 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<KoMacro::Action> action = (*it)->action();
TDESharedPtr<KoMacro::Action> 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<KoMacro::MacroItem>( new KoMacro::MacroItem() ) );
macro()->addItem( TDESharedPtr<KoMacro::MacroItem>( new KoMacro::MacroItem() ) );
}

// Get the matching MacroItem.
KSharedPtr<KoMacro::MacroItem> macroitem = macro()->items()[rowindex];
TDESharedPtr<KoMacro::MacroItem> 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<KoMacro::Action> action = KoMacro::Manager::self()->action(actionname);
TDESharedPtr<KoMacro::Action> 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<KoMacro::MacroItem> macroitem = KSharedPtr<KoMacro::MacroItem>( new KoMacro::MacroItem() );
TDESharedPtr<KoMacro::MacroItem> macroitem = TDESharedPtr<KoMacro::MacroItem>( new KoMacro::MacroItem() );
KoMacro::MacroItem::List::Iterator it = macroitems.at(row);
macroitems.insert(it, macroitem);
}
@@ -347,7 +347,7 @@ void KexiMacroDesignView::rowDeleted()
macroitems.remove( macroitems.at(rowindex) );
}

bool KexiMacroDesignView::updateSet(KoProperty::Set* set, KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& variablename)
bool KexiMacroDesignView::updateSet(KoProperty::Set* set, TDESharedPtr<KoMacro::MacroItem> macroitem, const TQString& variablename)
{
kdDebug() << "KexiMacroDesignView::updateSet() variablename=" << variablename << endl;
KoProperty::Property* property = KexiMacroProperty::createProperty(macroitem, variablename);
@@ -357,7 +357,7 @@ bool KexiMacroDesignView::updateSet(KoProperty::Set* set, KSharedPtr<KoMacro::Ma
return true;
}

void KexiMacroDesignView::updateProperties(int row, KoProperty::Set* set, KSharedPtr<KoMacro::MacroItem> macroitem)
void KexiMacroDesignView::updateProperties(int row, KoProperty::Set* set, TDESharedPtr<KoMacro::MacroItem> macroitem)
{
kdDebug() << "KexiMacroDesignView::updateProperties() row=" << row << endl;

@@ -365,7 +365,7 @@ void KexiMacroDesignView::updateProperties(int row, KoProperty::Set* set, KShare
return; // ignore invalid rows and avoid infinite recursion.
}

KSharedPtr<KoMacro::Action> action = macroitem->action();
TDESharedPtr<KoMacro::Action> 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<KoMacro::Variable> variable = macroitem->variable(*it, true);
TDESharedPtr<KoMacro::Variable> variable = macroitem->variable(*it, true);
kdDebug()<<"KexiMacroDesignView::updateProperties() name=" << *it << " variable=" << variable->variant().toString() << endl;
#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<KoMacro::MacroItem> macroitem = macro()->items()[row];
TDESharedPtr<KoMacro::MacroItem> 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<KoMacro::Variable>(pv));
TQStringList dirtyvarnames = macroitem->setVariable(name, TDESharedPtr<KoMacro::Variable>(pv));
bool dirty = false;
bool reload = false;
for(TQStringList::Iterator it = dirtyvarnames.begin(); it != dirtyvarnames.end(); ++it) {
KSharedPtr<KoMacro::Variable> variable = macroitem->variable(*it);
TDESharedPtr<KoMacro::Variable> variable = macroitem->variable(*it);
if(! variable.data()) {
kdDebug() << "KexiMacroDesignView::propertyChanged() name=" << name << " it=" << *it << " skipped cause such a variable is not known." << endl;
continue;


+ 2
- 2
kexi/plugins/macros/kexipart/keximacrodesignview.h View File

@@ -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<KoMacro::MacroItem> item, const TQString& variablename);
bool updateSet(KoProperty::Set* set, TDESharedPtr<KoMacro::MacroItem> item, const TQString& variablename);

/**
* Update the properties of the \a KoProperty::Set \p set at
* row-number \p row with the \a KoMacro::MacroItem \p macroitem .
*/
void updateProperties(int row, KoProperty::Set* set, KSharedPtr<KoMacro::MacroItem> macroitem);
void updateProperties(int row, KoProperty::Set* set, TDESharedPtr<KoMacro::MacroItem> macroitem);
};

#endif

+ 4
- 4
kexi/plugins/macros/kexipart/keximacroerror.cpp View File

@@ -34,7 +34,7 @@ class KexiMacroError::Private
{
public:
KexiMainWindow* const mainwin;
KSharedPtr<KoMacro::Context> context;
TDESharedPtr<KoMacro::Context> context;

Private(KexiMainWindow* const m, KoMacro::Context* const c)
: mainwin(m)
@@ -43,7 +43,7 @@ class KexiMacroError::Private
}
};

KexiMacroError::KexiMacroError(KexiMainWindow* mainwin, KSharedPtr<KoMacro::Context> context)
KexiMacroError::KexiMacroError(KexiMainWindow* mainwin, TDESharedPtr<KoMacro::Context> context)
: KexiMacroErrorBase(mainwin, "KexiMacroError" , /*WFlags*/ TQt::WDestructiveClose)
, d(new Private(mainwin, context))
{
@@ -62,7 +62,7 @@ KexiMacroError::KexiMacroError(KexiMainWindow* mainwin, KSharedPtr<KoMacro::Cont
KListViewItem* listviewitem = new KListViewItem(errorlist);
listviewitem->setText(0,TQString("%1").arg(i++));
listviewitem->setText(1,i18n("Action"));
KSharedPtr<KoMacro::MacroItem> macroitem = *mit;
TDESharedPtr<KoMacro::MacroItem> 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<KoMacro::Macro> macro = d->context->macro();
TDESharedPtr<KoMacro::Macro> macro = d->context->macro();
const TQString name = macro->name();
KexiPart::Item* item = d->mainwin->project()->itemForMimeType("kexi/macro", name);
if(! item) {


+ 1
- 1
kexi/plugins/macros/kexipart/keximacroerror.h View File

@@ -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<KoMacro::Context> context);
KexiMacroError(KexiMainWindow* mainwin, TDESharedPtr<KoMacro::Context> context);
/**
* Destructor.


+ 1
- 1
kexi/plugins/macros/kexipart/keximacropart.cpp View File

@@ -129,7 +129,7 @@ KexiViewBase* KexiMacroPart::createView(TQWidget* parent, KexiDialogBase* dialog
//kdDebug() << "KexiMacroPart::createView() itemname=" << itemname << endl;

if(! itemname.isNull()) {
KSharedPtr<KoMacro::Macro> macro = ::KoMacro::Manager::self()->getMacro(itemname);
TDESharedPtr<KoMacro::Macro> 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);


+ 21
- 21
kexi/plugins/macros/kexipart/keximacroproperty.cpp View File

@@ -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<KoMacro::MacroItem> macroitem;
TDESharedPtr<KoMacro::MacroItem> 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<KoMacro::MacroItem> macroitem, const TQString& name)
KexiMacroProperty::KexiMacroProperty(KoProperty::Property* parent, TDESharedPtr<KoMacro::MacroItem> 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<KoMacro::Action> action = d->macroitem->action();
KSharedPtr<KoMacro::Variable> actionvariable = action->variable(d->name);
TDESharedPtr<KoMacro::Action> action = d->macroitem->action();
TDESharedPtr<KoMacro::Variable> actionvariable = action->variable(d->name);
if(! actionvariable.data()) {
kdDebug() << "KexiMacroProperty::createProperty() Skipped cause there exists no such action=" << d->name << endl;
return;
}

KSharedPtr<KoMacro::Variable> variable = d->macroitem->variable(d->name, true/*checkaction*/);
TDESharedPtr<KoMacro::Variable> variable = d->macroitem->variable(d->name, true/*checkaction*/);
if(! variable.data()) {
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<KoMacro::Variable> variable = d->macroitem->variable(d->name, true);
TDESharedPtr<KoMacro::Variable> 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<KoMacro::MacroItem> KexiMacroProperty::macroItem() const
TDESharedPtr<KoMacro::MacroItem> KexiMacroProperty::macroItem() const
{
return d->macroitem;
}
@@ -141,12 +141,12 @@ TQString KexiMacroProperty::name() const
return d->name;
}

KSharedPtr<KoMacro::Variable> KexiMacroProperty::variable() const
TDESharedPtr<KoMacro::Variable> KexiMacroProperty::variable() const
{
return d->macroitem->variable(d->name, true/*checkaction*/);
}

KoProperty::Property* KexiMacroProperty::createProperty(KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name)
KoProperty::Property* KexiMacroProperty::createProperty(TDESharedPtr<KoMacro::MacroItem> macroitem, const TQString& name)
{
KoProperty::Property* property = new KoProperty::Property();
KexiMacroProperty* customproperty = new KexiMacroProperty(property, macroitem, name);
@@ -184,7 +184,7 @@ KoProperty::CustomProperty* KexiMacroPropertyFactory::createCustomProperty(KoPro
return 0;
}

KSharedPtr<KoMacro::MacroItem> macroitem = parentcustomproperty->macroItem();
TDESharedPtr<KoMacro::MacroItem> 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<KoMacro::Variable> variable = m_macroproperty->variable();
TDESharedPtr<KoMacro::Variable> variable = m_macroproperty->variable();
Q_ASSERT( variable.data() );
//kdDebug()<<"EditListBoxItem::text() text="<<variable->toString()<<endl;
Q_ASSERT( variable->toString() != TQString() );
@@ -274,9 +274,9 @@ class EditListBoxItem : public ListBoxItem
}

KoProperty::Widget* widget() const { return m_widget; }
KSharedPtr<KoMacro::MacroItem> macroItem() const { return m_macroproperty->macroItem(); }
KSharedPtr<KoMacro::Variable> variable() const { return m_macroproperty->variable(); }
KSharedPtr<KoMacro::Action> action() const { return m_macroproperty->macroItem()->action(); }
TDESharedPtr<KoMacro::MacroItem> macroItem() const { return m_macroproperty->macroItem(); }
TDESharedPtr<KoMacro::Variable> variable() const { return m_macroproperty->variable(); }
TDESharedPtr<KoMacro::Action> 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<KoMacro::MacroItem> macroitem = m_macroproperty->macroItem();
TDESharedPtr<KoMacro::MacroItem> macroitem = m_macroproperty->macroItem();
Q_ASSERT( macroitem.data() );
KSharedPtr<KoMacro::Action> action = m_macroproperty->macroItem()->action();
TDESharedPtr<KoMacro::Action> 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<KoMacro::Variable> variable = m_macroproperty->variable();
TDESharedPtr<KoMacro::Variable> 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<KoMacro::Variable> actionvariable = action->variable(m_macroproperty->name());
TDESharedPtr<KoMacro::Variable> 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<KoMacro::Variable> itemvar = m_macroproperty->macroItem()->variable(name,false);
TDESharedPtr<KoMacro::Variable> itemvar = m_macroproperty->macroItem()->variable(name,false);
//kdDebug() << "KexiMacroProperty::ListBox::update() itemvar="<<(itemvar.data() ? "name:"+itemvar->name()+" value:"+itemvar->toString() : "NULL")<<endl;
if(itemvar.data())
actionchildren = itemvar->children();

KSharedPtr<KoMacro::Action> action = m_edititem->action();
KSharedPtr<KoMacro::Variable> actionvar = action.data() ? action->variable(name) : KSharedPtr<KoMacro::Variable>();
TDESharedPtr<KoMacro::Action> action = m_edititem->action();
TDESharedPtr<KoMacro::Variable> actionvar = action.data() ? action->variable(name) : TDESharedPtr<KoMacro::Variable>();
//kdDebug() << "KexiMacroProperty::ListBox::update() actionvar="<<(actionvar.data() ? "name:"+actionvar->name()+" value:"+actionvar->toString() : "NULL")<<endl;
if(actionvar.data())
actionchildren += actionvar->children();


+ 4
- 4
kexi/plugins/macros/kexipart/keximacroproperty.h View File

@@ -47,7 +47,7 @@ class KexiMacroProperty
public:

/** Constructor. */
explicit KexiMacroProperty(KoProperty::Property* parent, KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name);
explicit KexiMacroProperty(KoProperty::Property* parent, TDESharedPtr<KoMacro::MacroItem> macroitem, const TQString& name);
/** Destructor. */
virtual ~KexiMacroProperty();