Remove spurious TQ_OBJECT instances

12 years ago · 2f8f2b51ac
parent 3464ad940b
commit 2f8f2b51ac
1057 changed files with 1335 additions and 1335 deletions
--- a/chalk/chalkcolor/kis_colorspace_factory_registry.h
+++ b/chalk/chalkcolor/kis_colorspace_factory_registry.h
@ -36,7 +36,7 @@ class KisColorSpaceFactoryRegistry : public TQObject,  public KisGenericRegistry


    Q_OBJECT
-  TQ_OBJECT
+  

 public:

--- a/chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.h
+++ b/chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.h
@ -27,7 +27,7 @@
 class CMYKU16Plugin : public KParts::Plugin
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    CMYKU16Plugin(TQObject *parent, const char *name, const TQStringList &);
    virtual ~CMYKU16Plugin();
--- a/chalk/colorspaces/cmyk_u8/cmyk_plugin.h
+++ b/chalk/colorspaces/cmyk_u8/cmyk_plugin.h
@ -27,7 +27,7 @@
 class CMYKPlugin : public KParts::Plugin
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    CMYKPlugin(TQObject *parent, const char *name, const TQStringList &);
    virtual ~CMYKPlugin();
--- a/chalk/colorspaces/gray_u16/gray_u16_plugin.h
+++ b/chalk/colorspaces/gray_u16/gray_u16_plugin.h
@ -27,7 +27,7 @@
 class GRAYU16Plugin : public KParts::Plugin
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    GRAYU16Plugin(TQObject *parent, const char *name, const TQStringList &);
    virtual ~GRAYU16Plugin();
--- a/chalk/colorspaces/gray_u8/gray_plugin.h
+++ b/chalk/colorspaces/gray_u8/gray_plugin.h
@ -27,7 +27,7 @@
 class GrayPlugin : public KParts::Plugin
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    GrayPlugin(TQObject *parent, const char *name, const TQStringList &);
    virtual ~GrayPlugin();
--- a/chalk/colorspaces/lms_f32/lms_f32_plugin.h
+++ b/chalk/colorspaces/lms_f32/lms_f32_plugin.h
@ -29,7 +29,7 @@
 class LMSF32Plugin : public KParts::Plugin
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    LMSF32Plugin(TQObject *parent, const char *name, const TQStringList &);
    virtual ~LMSF32Plugin();
--- a/chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.h
+++ b/chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.h
@ -28,7 +28,7 @@
 class RGBF16HalfPlugin : public KParts::Plugin
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    RGBF16HalfPlugin(TQObject *parent, const char *name, const TQStringList &);
    virtual ~RGBF16HalfPlugin();
--- a/chalk/colorspaces/rgb_f32/rgb_f32_plugin.h
+++ b/chalk/colorspaces/rgb_f32/rgb_f32_plugin.h
@ -28,7 +28,7 @@
 class RGBF32Plugin : public KParts::Plugin
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    RGBF32Plugin(TQObject *parent, const char *name, const TQStringList &);
    virtual ~RGBF32Plugin();
--- a/chalk/colorspaces/rgb_u16/rgb_u16_plugin.h
+++ b/chalk/colorspaces/rgb_u16/rgb_u16_plugin.h
@ -27,7 +27,7 @@
 class RGBU16Plugin : public KParts::Plugin
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    RGBU16Plugin(TQObject *parent, const char *name, const TQStringList &);
    virtual ~RGBU16Plugin();
--- a/chalk/colorspaces/rgb_u8/rgb_plugin.h
+++ b/chalk/colorspaces/rgb_u8/rgb_plugin.h
@ -27,7 +27,7 @@
 class RGBPlugin : public KParts::Plugin
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    RGBPlugin(TQObject *parent, const char *name, const TQStringList &);
    virtual ~RGBPlugin();
--- a/chalk/colorspaces/wet/kis_wet_palette_widget.h
+++ b/chalk/colorspaces/wet/kis_wet_palette_widget.h
@ -41,7 +41,7 @@ class KRITAUI_EXPORT KisWetPaletteWidget
       public KisCanvasObserver
 {
     Q_OBJECT
-  TQ_OBJECT
+  
    typedef TQWidget super;

 public:
--- a/chalk/colorspaces/wet/kis_wetness_visualisation_filter.h
+++ b/chalk/colorspaces/wet/kis_wetness_visualisation_filter.h
@ -30,7 +30,7 @@ class KisView;
 class WetnessVisualisationFilter : public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
    WetnessVisualisationFilter(KisView* view);
    virtual ~WetnessVisualisationFilter() {}
--- a/chalk/colorspaces/wet/wet_plugin.h
+++ b/chalk/colorspaces/wet/wet_plugin.h
@ -32,7 +32,7 @@ class KisWetColorSpace;
 class WetPlugin : public KParts::Plugin
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
    WetPlugin(TQObject *parent, const char *name, const TQStringList &);
    virtual ~WetPlugin();
--- a/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.h
+++ b/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.h
@ -31,7 +31,7 @@ class KisView;
 class WSBrushPaintOpPlugin : public KParts::Plugin
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    WSBrushPaintOpPlugin(TQObject *parent, const char *name, const TQStringList &);
    virtual ~WSBrushPaintOpPlugin();
--- a/chalk/colorspaces/wetsticky/wet_sticky_plugin.h
+++ b/chalk/colorspaces/wetsticky/wet_sticky_plugin.h
@ -32,7 +32,7 @@
 class WetStickyPlugin : public KParts::Plugin
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    WetStickyPlugin(TQObject *parent, const char *name, const TQStringList &);
    virtual ~WetStickyPlugin();
--- a/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.h
+++ b/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.h
@ -27,7 +27,7 @@
 class YCbCrU16Plugin : public KParts::Plugin
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    YCbCrU16Plugin(TQObject *parent, const char *name, const TQStringList &);
    virtual ~YCbCrU16Plugin();
--- a/chalk/colorspaces/ycbcr_u8/ycbcr_u8_plugin.h
+++ b/chalk/colorspaces/ycbcr_u8/ycbcr_u8_plugin.h
@ -27,7 +27,7 @@
 class YCbCrU8Plugin : public KParts::Plugin
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    YCbCrU8Plugin(TQObject *parent, const char *name, const TQStringList &);
    virtual ~YCbCrU8Plugin();
--- a/chalk/core/kis_adjustment_layer.h
+++ b/chalk/core/kis_adjustment_layer.h
@ -38,7 +38,7 @@ class KisFilterConfiguration;
 class KRITACORE_EXPORT KisAdjustmentLayer : public KisLayer, public KisLayerSupportsIndirectPainting
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    /**
--- a/chalk/core/kis_brush.h
+++ b/chalk/core/kis_brush.h
@ -54,7 +54,7 @@ enum enumBrushType {
 class KRITACORE_EXPORT KisBrush : public KisResource {
    typedef KisResource super;
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    /// Construct brush to load filename later as brush
--- a/chalk/core/kis_filter.h
+++ b/chalk/core/kis_filter.h
@ -45,7 +45,7 @@ class TQWidget;
 */
 class KRITACORE_EXPORT KisFilter : public KisProgressSubject, public KShared {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:

    /**
--- a/chalk/core/kis_filter_config_widget.h
+++ b/chalk/core/kis_filter_config_widget.h
@ -29,7 +29,7 @@
 class KisFilterConfigWidget : public TQWidget {

    Q_OBJECT
-  TQ_OBJECT
+  

 public:

--- a/chalk/core/kis_filter_registry.h
+++ b/chalk/core/kis_filter_registry.h
@ -34,7 +34,7 @@ class KRITACORE_EXPORT KisFilterRegistry : public TQObject, public KisGenericReg
 {

    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    virtual ~KisFilterRegistry();
--- a/chalk/core/kis_gradient.h
+++ b/chalk/core/kis_gradient.h
@ -232,7 +232,7 @@ class KisGradientSegment {
 class KisGradient : public KisResource {
    typedef KisResource super;
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    KisGradient(const TQString& file);
--- a/chalk/core/kis_group_layer.h
+++ b/chalk/core/kis_group_layer.h
@ -37,7 +37,7 @@ class KisGroupLayer : public KisLayer {
    typedef KisLayer super;

    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    KisGroupLayer(KisImage *img, const TQString &name, TQ_UINT8 opacity);
--- a/chalk/core/kis_image.h
+++ b/chalk/core/kis_image.h
@ -60,7 +60,7 @@ class KisPerspectiveGrid;

 class KRITACORE_EXPORT KisImage : public TQObject, public KShared {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    KisImage(KisUndoAdapter * adapter, TQ_INT32 width, TQ_INT32 height, KisColorSpace * colorSpace, const TQString& name);
--- a/chalk/core/kis_imagepipe_brush.h
+++ b/chalk/core/kis_imagepipe_brush.h
@ -101,7 +101,7 @@ public:
 class KisImagePipeBrush : public KisBrush {
    typedef KisBrush super;
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    KisImagePipeBrush(const TQString& filename);
--- a/chalk/core/kis_layer.h
+++ b/chalk/core/kis_layer.h
@ -41,7 +41,7 @@ class KisGroupLayer;
 class KRITACORE_EXPORT KisLayer : public TQObject, public KShared
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    KisLayer(KisImage *img, const TQString &name, TQ_UINT8 opacity);
--- a/chalk/core/kis_math_toolbox.h
+++ b/chalk/core/kis_math_toolbox.h
@ -33,7 +33,7 @@

 class KisMathToolbox : public TQObject {
    Q_OBJECT
-  TQ_OBJECT
+  
    public:
        struct KisFloatRepresentation {
            KisFloatRepresentation(uint nsize, uint ndepth) throw(std::bad_alloc ) : coeffs(new float[nsize*nsize*ndepth]) ,size(nsize), depth(ndepth)
--- a/chalk/core/kis_paint_device.h
+++ b/chalk/core/kis_paint_device.h
@ -76,7 +76,7 @@ class KRITACORE_EXPORT KisPaintDevice
 {

        Q_OBJECT
-  TQ_OBJECT
+  

 public:

--- a/chalk/core/kis_paint_layer.h
+++ b/chalk/core/kis_paint_layer.h
@ -29,7 +29,7 @@ class KisPaintLayer : public KisLayer, public KisLayerSupportsIndirectPainting {
    typedef KisLayer super;

    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    KisPaintLayer(KisImage *img, const TQString& name, TQ_UINT8 opacity, KisPaintDeviceSP dev);
--- a/chalk/core/kis_paintop_registry.h
+++ b/chalk/core/kis_paintop_registry.h
@ -38,7 +38,7 @@ class KRITACORE_EXPORT KisPaintOpRegistry : public TQObject, public KisGenericRe
 {

    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    virtual ~KisPaintOpRegistry();
--- a/chalk/core/kis_palette.h
+++ b/chalk/core/kis_palette.h
@ -51,7 +51,7 @@ class KisPalette : public KisResource {
    typedef KisResource super;

    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    /**
--- a/chalk/core/kis_pattern.h
+++ b/chalk/core/kis_pattern.h
@ -35,7 +35,7 @@ class KisPaintDevice;
 class KisPattern : public KisResource {
    typedef KisResource super;
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    KisPattern(const TQString& file);
--- a/chalk/core/kis_resource.h
+++ b/chalk/core/kis_resource.h
@ -32,7 +32,7 @@
 class KisResource : public TQObject {
    typedef TQObject super;
    Q_OBJECT
-  TQ_OBJECT
+  

 public:

--- a/chalk/plugins/filters/blur/kis_wdg_blur.h
+++ b/chalk/plugins/filters/blur/kis_wdg_blur.h
@ -33,7 +33,7 @@ class WdgBlur;
 class KisWdgBlur : public KisFilterConfigWidget
 {
    Q_OBJECT
-  TQ_OBJECT
+  
    public:
        KisWdgBlur( KisFilter* nfilter, TQWidget * parent, const char * name);
        inline WdgBlur* widget() { return m_widget; };
--- a/chalk/plugins/filters/bumpmap/bumpmap.h
+++ b/chalk/plugins/filters/bumpmap/bumpmap.h
@ -113,7 +113,7 @@ public:
 class KisBumpmapConfigWidget : public KisFilterConfigWidget {

    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    KisBumpmapConfigWidget(KisFilter * filter, KisPaintDeviceSP dev, TQWidget * parent, const char * name = 0, WFlags f = 0 );
--- a/chalk/plugins/filters/cimg/kis_cimgconfig_widget.h
+++ b/chalk/plugins/filters/cimg/kis_cimgconfig_widget.h
@ -30,7 +30,7 @@
 class KisCImgconfigWidget : public KisFilterConfigWidget {

    Q_OBJECT
-  TQ_OBJECT
+  

 public:

--- a/chalk/plugins/filters/colorify/KisWdgColorify.h
+++ b/chalk/plugins/filters/colorify/KisWdgColorify.h
@ -33,7 +33,7 @@ class WdgColorifyBase;
 class KisWdgColorify : public KisFilterConfigWidget
 {
    Q_OBJECT
-  TQ_OBJECT
+  
    public:
        KisWdgColorify( KisFilter* nfilter, TQWidget * parent, const char * name);
        inline WdgColorifyBase* widget() { return m_widget; };
--- a/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.h
+++ b/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.h
@ -33,7 +33,7 @@ class WdgColorToAlphaBase;
 class KisWdgColorToAlpha : public KisFilterConfigWidget
 {
    Q_OBJECT
-  TQ_OBJECT
+  
    public:
        KisWdgColorToAlpha( KisFilter* nfilter, TQWidget * parent, const char * name);
        inline WdgColorToAlphaBase* widget() { return m_widget; };
--- a/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.h
+++ b/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.h
@ -77,7 +77,7 @@ class KisPerChannelConfigWidget : public KisFilterConfigWidget {

    typedef KisFilterConfigWidget super;
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    KisPerChannelConfigWidget(TQWidget * parent, KisPaintDeviceSP dev, const char * name = 0, WFlags f = 0 );
--- a/chalk/plugins/filters/convolutionfilters/kis_convolution_filter.h
+++ b/chalk/plugins/filters/convolutionfilters/kis_convolution_filter.h
@ -53,7 +53,7 @@ private:
 class KisConvolutionFilter : public KisFilter {

    Q_OBJECT
-  TQ_OBJECT
+  

 public:

--- a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.h
+++ b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.h
@ -30,7 +30,7 @@ class KisCustomConvolutionFilterConfigurationWidget : public KisFilterConfigWidg
 {

    Q_OBJECT
-  TQ_OBJECT
+  

 public:

--- a/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.h
+++ b/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.h
@ -29,7 +29,7 @@ class KisFilter;
 class KisWdgLensCorrection : public KisFilterConfigWidget
 {
    Q_OBJECT
-  TQ_OBJECT
+  
    public:
        KisWdgLensCorrection(KisFilter* nfilter, TQWidget* parent = 0, const char* name = 0);
        ~KisWdgLensCorrection();
--- a/chalk/plugins/filters/levelfilter/kgradientslider.h
+++ b/chalk/plugins/filters/levelfilter/kgradientslider.h
@ -31,7 +31,7 @@
 class KGradientSlider : public TQWidget
 {
 Q_OBJECT
-  TQ_OBJECT
+  

    typedef enum {
        BlackCursor,
--- a/chalk/plugins/filters/levelfilter/kis_level_filter.h
+++ b/chalk/plugins/filters/levelfilter/kis_level_filter.h
@ -74,7 +74,7 @@ public:

 class KisLevelConfigWidget : public KisFilterConfigWidget {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
    KisLevelConfigWidget(TQWidget * parent, KisPaintDeviceSP dev, const char * name = 0, WFlags f = 0 );
    virtual ~KisLevelConfigWidget();
--- a/chalk/plugins/filters/noisefilter/kis_wdg_noise.h
+++ b/chalk/plugins/filters/noisefilter/kis_wdg_noise.h
@ -29,7 +29,7 @@ class KisFilter;
 class KisWdgNoise : public KisFilterConfigWidget
 {
    Q_OBJECT
-  TQ_OBJECT
+  
    public:
        KisWdgNoise(KisFilter* nfilter, TQWidget* parent = 0, const char* name = 0);
        ~KisWdgNoise();
--- a/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.h
+++ b/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.h
@ -29,7 +29,7 @@ class KisFilter;
 class KisWdgRandomPick : public KisFilterConfigWidget
 {
    Q_OBJECT
-  TQ_OBJECT
+  
    public:
        KisWdgRandomPick(KisFilter* nfilter, TQWidget* parent = 0, const char* name = 0);
        ~KisWdgRandomPick();
--- a/chalk/plugins/filters/unsharp/kis_wdg_unsharp.h
+++ b/chalk/plugins/filters/unsharp/kis_wdg_unsharp.h
@ -33,7 +33,7 @@ class WdgUnsharp;
 class KisWdgUnsharp : public KisFilterConfigWidget
 {
    Q_OBJECT
-  TQ_OBJECT
+  
    public:
        KisWdgUnsharp( KisFilter* nfilter, TQWidget * parent, const char * name);
        inline WdgUnsharp* widget() { return m_widget; };
--- a/chalk/plugins/filters/wavefilter/kis_wdg_wave.h
+++ b/chalk/plugins/filters/wavefilter/kis_wdg_wave.h
@ -29,7 +29,7 @@ class KisFilter;
 class KisWdgWave : public KisFilterConfigWidget
 {
    Q_OBJECT
-  TQ_OBJECT
+  
    public:
        KisWdgWave(KisFilter* nfilter, TQWidget* parent = 0, const char* name = 0);
        ~KisWdgWave();
--- a/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.h
+++ b/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.h
@ -27,7 +27,7 @@
 class DefaultPaintOpsPlugin : public KParts::Plugin
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    DefaultPaintOpsPlugin(TQObject *parent, const char *name, const TQStringList &);
    virtual ~DefaultPaintOpsPlugin();
--- a/chalk/plugins/paintops/defaultpaintops/kis_brushop.h
+++ b/chalk/plugins/paintops/defaultpaintops/kis_brushop.h
@ -47,7 +47,7 @@ public:

 class KisBrushOpSettings : public TQObject, public KisPaintOpSettings {
    Q_OBJECT
-  TQ_OBJECT
+  
    typedef KisPaintOpSettings super;
 public:
    KisBrushOpSettings(TQWidget *parent);
--- a/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.h
+++ b/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.h
@ -45,7 +45,7 @@ public:

 class KisSmudgeOpSettings : public TQObject, public KisPaintOpSettings {
    Q_OBJECT
-  TQ_OBJECT
+  
    typedef KisPaintOpSettings super;
 public:
    KisSmudgeOpSettings(TQWidget *parent, bool isTablet);
--- a/chalk/plugins/tools/defaulttools/default_tools.h
+++ b/chalk/plugins/tools/defaulttools/default_tools.h
@ -34,7 +34,7 @@
 class DefaultTools : public KParts::Plugin
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    DefaultTools(TQObject *parent, const char *name, const TQStringList &);
    virtual ~DefaultTools();
--- a/chalk/plugins/tools/defaulttools/kis_tool_brush.h
+++ b/chalk/plugins/tools/defaulttools/kis_tool_brush.h
@ -35,7 +35,7 @@ class TQGridLayout;

 class KRITACORE_EXPORT KisToolBrush : public KisToolFreehand {
    Q_OBJECT
-  TQ_OBJECT
+  
    typedef KisToolFreehand super;

 public:
--- a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.h
+++ b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.h
@ -31,7 +31,7 @@ class KisPalette;
 class KisToolColorPicker : public KisToolNonPaint {

    Q_OBJECT
-  TQ_OBJECT
+  
    typedef KisToolNonPaint super;

 public:
--- a/chalk/plugins/tools/defaulttools/kis_tool_duplicate.h
+++ b/chalk/plugins/tools/defaulttools/kis_tool_duplicate.h
@ -34,7 +34,7 @@ class KisToolDuplicate : public KisToolFreehand {

    typedef KisToolFreehand super;
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    KisToolDuplicate();
--- a/chalk/plugins/tools/defaulttools/kis_tool_ellipse.h
+++ b/chalk/plugins/tools/defaulttools/kis_tool_ellipse.h
@ -33,7 +33,7 @@ class KisToolEllipse : public KisToolShape {

    typedef KisToolShape super;
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    KisToolEllipse();
--- a/chalk/plugins/tools/defaulttools/kis_tool_fill.h
+++ b/chalk/plugins/tools/defaulttools/kis_tool_fill.h
@ -37,7 +37,7 @@ class KisToolFill : public KisToolPaint {

    typedef KisToolPaint super;
    Q_OBJECT
-  TQ_OBJECT
+  

 public:

--- a/chalk/plugins/tools/defaulttools/kis_tool_gradient.h
+++ b/chalk/plugins/tools/defaulttools/kis_tool_gradient.h
@ -47,7 +47,7 @@ class TQCheckBox;
 class KisToolGradient : public KisToolPaint {

    Q_OBJECT
-  TQ_OBJECT
+  
    typedef KisToolPaint super;

 public:
--- a/chalk/plugins/tools/defaulttools/kis_tool_line.h
+++ b/chalk/plugins/tools/defaulttools/kis_tool_line.h
@ -39,7 +39,7 @@ class TQWidget;
 class KisToolLine : public KisToolPaint {

    Q_OBJECT
-  TQ_OBJECT
+  
    typedef KisToolPaint super;

 public:
--- a/chalk/plugins/tools/defaulttools/kis_tool_move.h
+++ b/chalk/plugins/tools/defaulttools/kis_tool_move.h
@ -33,7 +33,7 @@ class KisToolMove : public KisToolNonPaint {

    typedef KisToolNonPaint super;
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    KisToolMove();
--- a/chalk/plugins/tools/defaulttools/kis_tool_pan.h
+++ b/chalk/plugins/tools/defaulttools/kis_tool_pan.h
@ -32,7 +32,7 @@ class KRITATOOL_EXPORT KisToolPan : public KisToolNonPaint

    typedef KisToolNonPaint super;
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    KisToolPan();
--- a/chalk/plugins/tools/defaulttools/kis_tool_rectangle.h
+++ b/chalk/plugins/tools/defaulttools/kis_tool_rectangle.h
@ -38,7 +38,7 @@ class KisToolRectangle : public KisToolShape {

    typedef KisToolShape super;
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    KisToolRectangle();
--- a/chalk/plugins/tools/defaulttools/kis_tool_text.h
+++ b/chalk/plugins/tools/defaulttools/kis_tool_text.h
@ -34,7 +34,7 @@ class KSqueezedTextLabel;
 class KisToolText : public KisToolPaint {
    typedef KisToolPaint super;
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    KisToolText();
--- a/chalk/plugins/tools/defaulttools/kis_tool_zoom.h
+++ b/chalk/plugins/tools/defaulttools/kis_tool_zoom.h
@ -33,7 +33,7 @@ class KisToolZoom : public KisToolNonPaint {

    typedef KisToolNonPaint super;
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    KisToolZoom();
--- a/chalk/plugins/tools/selectiontools/kis_tool_move_selection.h
+++ b/chalk/plugins/tools/selectiontools/kis_tool_move_selection.h
@ -27,7 +27,7 @@ class KisToolMoveSelection : public KisToolNonPaint {

    typedef KisToolNonPaint super;
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    KisToolMoveSelection();
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.h
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.h
@ -37,7 +37,7 @@ class KisSelectionOptions;
 */
 class KisToolSelectBrush : public KisToolFreehand {
    Q_OBJECT
-  TQ_OBJECT
+  
    typedef KisToolFreehand super;

 public:
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.h
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.h
@ -41,7 +41,7 @@ class KisToolSelectContiguous : public KisToolNonPaint {

    typedef KisToolNonPaint super;
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    KisToolSelectContiguous();
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.h
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.h
@ -36,7 +36,7 @@ class KisToolSelectElliptical : public KisToolNonPaint {

    typedef KisToolNonPaint super;
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    KisToolSelectElliptical();
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h
@ -35,7 +35,7 @@ class KisSelectionOptions;
 */
 class KisToolSelectEraser : public KisToolFreehand {
    Q_OBJECT
-  TQ_OBJECT
+  
    typedef KisToolFreehand super;

 public:
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.h
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.h
@ -37,7 +37,7 @@ class KisToolSelectOutline : public KisToolNonPaint {

    typedef KisToolNonPaint super;
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    KisToolSelectOutline();
    virtual ~KisToolSelectOutline();
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.h
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.h
@ -34,7 +34,7 @@ class KisToolSelectPolygonal : public KisToolNonPaint {

    typedef KisToolNonPaint super;
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    KisToolSelectPolygonal();
    virtual ~KisToolSelectPolygonal();
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.h
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.h
@ -33,7 +33,7 @@ class KisToolSelectRectangular : public KisToolNonPaint {

    typedef KisToolNonPaint super;
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    KisToolSelectRectangular();
--- a/chalk/plugins/tools/selectiontools/selection_tools.h
+++ b/chalk/plugins/tools/selectiontools/selection_tools.h
@ -34,7 +34,7 @@
 class SelectionTools : public KParts::Plugin
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    SelectionTools(TQObject *parent, const char *name, const TQStringList &);
    virtual ~SelectionTools();
--- a/chalk/plugins/tools/tool_crop/kis_tool_crop.h
+++ b/chalk/plugins/tools/tool_crop/kis_tool_crop.h
@ -41,7 +41,7 @@ class KisToolCrop : public KisToolNonPaint {

    typedef KisToolNonPaint super;
    Q_OBJECT
-  TQ_OBJECT
+  

 public:

--- a/chalk/plugins/tools/tool_crop/tool_crop.h
+++ b/chalk/plugins/tools/tool_crop/tool_crop.h
@ -29,7 +29,7 @@ class KisView;
 class ToolCrop : public KParts::Plugin
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    ToolCrop(TQObject *parent, const char *name, const TQStringList &);
    virtual ~ToolCrop();
--- a/chalk/plugins/tools/tool_curves/kis_tool_bezier.h
+++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier.h
@ -77,7 +77,7 @@ class KisToolBezier : public KisToolCurve {

    typedef KisToolCurve super;
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    KisToolBezier(const TQString&);
--- a/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.h
+++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.h
@ -29,7 +29,7 @@ class KisToolBezierPaint : public KisToolBezier {

    typedef KisToolBezier super;
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    KisToolBezierPaint();
--- a/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.h
+++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.h
@ -29,7 +29,7 @@ class KisToolBezierSelect : public KisToolBezier {

    typedef KisToolBezier super;
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    KisToolBezierSelect();
--- a/chalk/plugins/tools/tool_curves/kis_tool_curve.h
+++ b/chalk/plugins/tools/tool_curves/kis_tool_curve.h
@ -44,7 +44,7 @@ class KisToolCurve : public KisToolPaint {

    typedef KisToolPaint super;
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    KisToolCurve(const TQString& UIName);
--- a/chalk/plugins/tools/tool_curves/kis_tool_example.h
+++ b/chalk/plugins/tools/tool_curves/kis_tool_example.h
@ -37,7 +37,7 @@ class KisToolExample : public KisToolCurve {

    typedef KisToolCurve super;
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    KisToolExample();
--- a/chalk/plugins/tools/tool_curves/kis_tool_moutline.h
+++ b/chalk/plugins/tools/tool_curves/kis_tool_moutline.h
@ -66,7 +66,7 @@ class KisToolMagnetic : public KisToolCurve {

    typedef KisToolCurve super;
    Q_OBJECT
-  TQ_OBJECT
+  

    friend class KisCurveMagnetic;

--- a/chalk/plugins/tools/tool_curves/tool_curves.h
+++ b/chalk/plugins/tools/tool_curves/tool_curves.h
@ -26,7 +26,7 @@
 class ToolCurves : public KParts::Plugin
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    ToolCurves(TQObject *parent, const char *name, const TQStringList &);
    virtual ~ToolCurves();
--- a/chalk/plugins/tools/tool_filter/kis_tool_filter.h
+++ b/chalk/plugins/tools/tool_filter/kis_tool_filter.h
@ -36,7 +36,7 @@ class KisCmbIDList;

 class KisToolFilter : public KisToolFreehand {
    Q_OBJECT
-  TQ_OBJECT
+  
    typedef KisToolFreehand super;

 public:
--- a/chalk/plugins/tools/tool_filter/tool_filter.h
+++ b/chalk/plugins/tools/tool_filter/tool_filter.h
@ -29,7 +29,7 @@ class KisView;
 class ToolFilter : public KParts::Plugin
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    ToolFilter(TQObject *parent, const char *name, const TQStringList &);
    virtual ~ToolFilter();
--- a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.h
+++ b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.h
@ -28,7 +28,7 @@

 class KisToolPerspectiveGrid : public KisToolNonPaint {
    Q_OBJECT
-  TQ_OBJECT
+  
    enum PerspectiveGridEditionMode {
        MODE_CREATION, // This is the mode when there is not yet a perspective grid
        MODE_EDITING, // This is the mode when the grid has been created, and we are waiting for the user to click on a control box
--- a/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.h
+++ b/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.h
@ -29,7 +29,7 @@ class KisView;
 class ToolPerspectiveGrid : public KParts::Plugin
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    ToolPerspectiveGrid(TQObject *parent, const char *name, const TQStringList &);
    virtual ~ToolPerspectiveGrid();
--- a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.h
+++ b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.h
@ -46,7 +46,7 @@ class KisToolPerspectiveTransform : public KisToolNonPaint, KisCommandHistoryLis

    typedef KisToolNonPaint super;
    Q_OBJECT
-  TQ_OBJECT
+  
    enum InterractionMode { DRAWRECTINTERRACTION, EDITRECTINTERRACTION };
    enum HandleSelected { NOHANDLE, TOPHANDLE, BOTTOMHANDLE, RIGHTHANDLE, LEFTHANDLE, MIDDLEHANDLE };
 public:
--- a/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.h
+++ b/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.h
@ -29,7 +29,7 @@ class KisView;
 class ToolPerspectiveTransform : public KParts::Plugin
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    ToolPerspectiveTransform(TQObject *parent, const char *name, const TQStringList &);
    virtual ~ToolPerspectiveTransform();
--- a/chalk/plugins/tools/tool_polygon/kis_tool_polygon.h
+++ b/chalk/plugins/tools/tool_polygon/kis_tool_polygon.h
@ -35,7 +35,7 @@ class KisToolPolygon : public KisToolShape {

    typedef KisToolShape super;
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    KisToolPolygon();
--- a/chalk/plugins/tools/tool_polygon/tool_polygon.h
+++ b/chalk/plugins/tools/tool_polygon/tool_polygon.h
@ -27,7 +27,7 @@
 class ToolPolygon : public KParts::Plugin
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:

--- a/chalk/plugins/tools/tool_polyline/kis_tool_polyline.h
+++ b/chalk/plugins/tools/tool_polyline/kis_tool_polyline.h
@ -38,7 +38,7 @@ class KisToolPolyline : public KisToolPaint {

    typedef KisToolPaint super;
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    KisToolPolyline();
--- a/chalk/plugins/tools/tool_polyline/tool_polyline.h
+++ b/chalk/plugins/tools/tool_polyline/tool_polyline.h
@ -29,7 +29,7 @@ class KisView;
 class ToolPolyline : public KParts::Plugin
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    ToolPolyline(TQObject *parent, const char *name, const TQStringList &);
    virtual ~ToolPolyline();
--- a/2
+++ b/2