Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

91 files changed, 319 insertions, 319 deletions

diff --git a/chalk/plugins/filters/blur/kis_wdg_blur.cpp b/chalk/plugins/filters/blur/kis_wdg_blur.cpp
index d4213bb5..e67afe4c 100644
--- a/chalk/plugins/filters/blur/kis_wdg_blur.cpp
+++ b/chalk/plugins/filters/blur/kis_wdg_blur.cpp
@@ -42,13 +42,13 @@ KisWdgBlur::KisWdgBlur( KisFilter* nfilter, TQWidget * parent, const char * name
 
     linkSpacingToggled(true);
 
-    connect( widget()->bnLinkSize, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(linkSpacingToggled( bool )));
-    connect( widget()->intHalfWidth, TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(spinBoxHalfWidthChanged(int)));
-    connect( widget()->intHalfHeight, TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(spinBoxHalfHeightChanged(int)));
+    connect( widget()->bnLinkSize, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(linkSpacingToggled( bool )));
+    connect( widget()->intHalfWidth, TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(spinBoxHalfWidthChanged(int)));
+    connect( widget()->intHalfHeight, TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(spinBoxHalfHeightChanged(int)));
 
-    connect( widget()->intStrength, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( widget()->intAngle, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( widget()->cbShape, TQT_SIGNAL( activated(int)), TQT_SIGNAL(sigPleaseUpdatePreview()));
+    connect( widget()->intStrength, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( widget()->intAngle, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( widget()->cbShape, TQ_SIGNAL( activated(int)), TQ_SIGNAL(sigPleaseUpdatePreview()));
 }
 
 
diff --git a/chalk/plugins/filters/bumpmap/bumpmap.cpp b/chalk/plugins/filters/bumpmap/bumpmap.cpp
index 9d771222..de2bc4ff 100644
--- a/chalk/plugins/filters/bumpmap/bumpmap.cpp
+++ b/chalk/plugins/filters/bumpmap/bumpmap.cpp
@@ -475,19 +475,19 @@ KisBumpmapConfigWidget::KisBumpmapConfigWidget(KisFilter *, KisPaintDeviceSP dev
     }
 
     // Connect all of the widgets to update signal
-    connect( m_page->radioLinear, TQT_SIGNAL( toggled(bool)), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( m_page->radioSpherical, TQT_SIGNAL( toggled(bool)), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( m_page->radioSinusoidal, TQT_SIGNAL( toggled(bool)), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( m_page->chkCompensate, TQT_SIGNAL( toggled(bool)), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( m_page->chkInvert, TQT_SIGNAL( toggled(bool)), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( m_page->chkTiled, TQT_SIGNAL( toggled(bool)), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( m_page->dblAzimuth, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( m_page->dblElevation, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( m_page->dblDepth, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( m_page->intXOffset, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( m_page->intYOffset, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( m_page->intWaterLevel, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( m_page->intAmbient, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview()));
+    connect( m_page->radioLinear, TQ_SIGNAL( toggled(bool)), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( m_page->radioSpherical, TQ_SIGNAL( toggled(bool)), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( m_page->radioSinusoidal, TQ_SIGNAL( toggled(bool)), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( m_page->chkCompensate, TQ_SIGNAL( toggled(bool)), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( m_page->chkInvert, TQ_SIGNAL( toggled(bool)), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( m_page->chkTiled, TQ_SIGNAL( toggled(bool)), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( m_page->dblAzimuth, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( m_page->dblElevation, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( m_page->dblDepth, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( m_page->intXOffset, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( m_page->intYOffset, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( m_page->intWaterLevel, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( m_page->intAmbient, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview()));
 }
 
 KisBumpmapConfiguration * KisBumpmapConfigWidget::config()
diff --git a/chalk/plugins/filters/cimg/kis_cimgconfig_widget.cpp b/chalk/plugins/filters/cimg/kis_cimgconfig_widget.cpp
index ba9e61e0..3a7556ea 100644
--- a/chalk/plugins/filters/cimg/kis_cimgconfig_widget.cpp
+++ b/chalk/plugins/filters/cimg/kis_cimgconfig_widget.cpp
@@ -41,17 +41,17 @@ KisCImgconfigWidget::KisCImgconfigWidget(KisFilter* nfilter, TQWidget * parent,
     l->add(m_page);
     nfilter->setAutoUpdate(false);
     
-//     connect(  m_page->bnRefresh, TQT_SIGNAL(clicked()), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( m_page->numDetail, TQT_SIGNAL(valueChanged (double)), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( m_page->numGradient, TQT_SIGNAL(valueChanged (double)), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( m_page->numTimeStep, TQT_SIGNAL(valueChanged (double)), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( m_page->numBlur, TQT_SIGNAL(valueChanged (double)), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( m_page->numBlurIterations, TQT_SIGNAL(valueChanged (int)), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( m_page->numAngularStep, TQT_SIGNAL(valueChanged (double)), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( m_page->numIntegralStep, TQT_SIGNAL(valueChanged (double)), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( m_page->numGaussian, TQT_SIGNAL(valueChanged (double)), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( m_page->chkLinearInterpolation, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( m_page->chkNormalize, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(sigPleaseUpdatePreview()));
+//     connect(  m_page->bnRefresh, TQ_SIGNAL(clicked()), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( m_page->numDetail, TQ_SIGNAL(valueChanged (double)), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( m_page->numGradient, TQ_SIGNAL(valueChanged (double)), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( m_page->numTimeStep, TQ_SIGNAL(valueChanged (double)), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( m_page->numBlur, TQ_SIGNAL(valueChanged (double)), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( m_page->numBlurIterations, TQ_SIGNAL(valueChanged (int)), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( m_page->numAngularStep, TQ_SIGNAL(valueChanged (double)), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( m_page->numIntegralStep, TQ_SIGNAL(valueChanged (double)), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( m_page->numGaussian, TQ_SIGNAL(valueChanged (double)), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( m_page->chkLinearInterpolation, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( m_page->chkNormalize, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(sigPleaseUpdatePreview()));
 }
 
 
diff --git a/chalk/plugins/filters/colorify/KisWdgColorify.cpp b/chalk/plugins/filters/colorify/KisWdgColorify.cpp
index 5b03ad70..1fee1526 100644
--- a/chalk/plugins/filters/colorify/KisWdgColorify.cpp
+++ b/chalk/plugins/filters/colorify/KisWdgColorify.cpp
@@ -35,7 +35,7 @@ KisWdgColorify::KisWdgColorify( KisFilter* nfilter, TQWidget * parent, const cha
     TQGridLayout *widgetLayout = new TQGridLayout(this, 1, 1);
     m_widget = new WdgColorifyBase(this);
     widgetLayout -> addWidget(m_widget,0,0);
-    connect( m_widget->colorTarget, TQT_SIGNAL( changed(const TQColor&)), TQT_SIGNAL(sigPleaseUpdatePreview()));
+    connect( m_widget->colorTarget, TQ_SIGNAL( changed(const TQColor&)), TQ_SIGNAL(sigPleaseUpdatePreview()));
 }
 
 void KisWdgColorify::setConfiguration(KisFilterConfiguration* config)
diff --git a/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cpp b/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cpp
index 31b726bf..6240297c 100644
--- a/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cpp
+++ b/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cpp
@@ -35,8 +35,8 @@ KisWdgColorToAlpha::KisWdgColorToAlpha( KisFilter* nfilter, TQWidget * parent, c
     TQGridLayout *widgetLayout = new TQGridLayout(this, 1, 1);
     m_widget = new WdgColorToAlphaBase(this);
     widgetLayout -> addWidget(m_widget,0,0);
-    connect( m_widget->colorTarget, TQT_SIGNAL( changed(const TQColor&)), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( m_widget->intThreshold, TQT_SIGNAL( valueChanged ( int value) ), TQT_SIGNAL(sigPleaseUpdatePreview()));
+    connect( m_widget->colorTarget, TQ_SIGNAL( changed(const TQColor&)), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( m_widget->intThreshold, TQ_SIGNAL( valueChanged ( int value) ), TQ_SIGNAL(sigPleaseUpdatePreview()));
 }
 
 void KisWdgColorToAlpha::setConfiguration(KisFilterConfiguration* config)
diff --git a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp
index 85b63ffb..29c74cfd 100644
--- a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp
+++ b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp
@@ -271,7 +271,7 @@ KisBrightnessContrastConfigWidget::KisBrightnessContrastConfigWidget(TQWidget *
 
     l->addWidget(m_page, 0, TQt::AlignTop);
     height = 256;
-    connect( m_page->kCurve, TQT_SIGNAL(modified()), TQT_SIGNAL(sigPleaseUpdatePreview()));
+    connect( m_page->kCurve, TQ_SIGNAL(modified()), TQ_SIGNAL(sigPleaseUpdatePreview()));
 
     // Create the horizontal gradient label
     TQPixmap hgradientpix(256, 1);
diff --git a/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cpp b/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cpp
index 37c0815e..7256c50a 100644
--- a/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cpp
+++ b/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cpp
@@ -320,13 +320,13 @@ KisPerChannelConfigWidget::KisPerChannelConfigWidget(TQWidget * parent, KisPaint
 
     l->add(m_page);
     height = 256;
-    connect( m_page->kCurve, TQT_SIGNAL(modified()), TQT_SIGNAL(sigPleaseUpdatePreview()));
+    connect( m_page->kCurve, TQ_SIGNAL(modified()), TQ_SIGNAL(sigPleaseUpdatePreview()));
 
     // Fill in the channel chooser
     TQValueVector<KisChannelInfo *> channels = dev->colorSpace()->channels();
     for(unsigned int val=0; val < dev->colorSpace()->nColorChannels(); val++)
         m_page->cmbChannel->insertItem(channels.at(val)->name());
-    connect( m_page->cmbChannel, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setActiveChannel(int)));
+    connect( m_page->cmbChannel, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setActiveChannel(int)));
 
     // Create the horizontal gradient label
     TQPixmap hgradientpix(256, 1);
diff --git a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cpp b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cpp
index fcffb3de..851ed3f4 100644
--- a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cpp
+++ b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cpp
@@ -54,10 +54,10 @@ KisCustomConvolutionFilterConfigurationWidget::KisCustomConvolutionFilterConfigu
 
     widgetLayout->addMultiCellWidget(m_ccfcws, 1, 1, 0, 1);
 
-//     connect( bnRefresh, TQT_SIGNAL(clicked()), nfilter, TQT_SLOT(refreshPreview()));
-    connect( m_ccfcws->matrixWidget, TQT_SIGNAL(valueChanged()), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( m_ccfcws->spinBoxFactor, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( m_ccfcws->spinBoxOffset, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview()));
+//     connect( bnRefresh, TQ_SIGNAL(clicked()), nfilter, TQ_SLOT(refreshPreview()));
+    connect( m_ccfcws->matrixWidget, TQ_SIGNAL(valueChanged()), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( m_ccfcws->spinBoxFactor, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( m_ccfcws->spinBoxOffset, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview()));
 }
 
 void KisCustomConvolutionFilterConfigurationWidget::setConfiguration(KisFilterConfiguration * cfg)
diff --git a/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp b/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp
index 49826ccb..3a2dbaad 100644
--- a/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp
+++ b/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp
@@ -31,7 +31,7 @@ KisWdgFastColorTransfer::KisWdgFastColorTransfer(KisFilter* nfilter, TQWidget *
     TQGridLayout *widgetLayout = new TQGridLayout(this, 1, 1);
     m_widget = new WdgFastColorTransfer(this);
     widgetLayout -> addWidget(m_widget,0,0);
-    connect(m_widget->fileNameURLRequester, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SIGNAL(sigPleaseUpdatePreview()));
+    connect(m_widget->fileNameURLRequester, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SIGNAL(sigPleaseUpdatePreview()));
 }
 
 
diff --git a/chalk/plugins/filters/halftone/kis_halftone.cpp b/chalk/plugins/filters/halftone/kis_halftone.cpp
index c2c2f463..1ca2aba3 100644
--- a/chalk/plugins/filters/halftone/kis_halftone.cpp
+++ b/chalk/plugins/filters/halftone/kis_halftone.cpp
@@ -113,7 +113,7 @@ void KisHalftoneReduction::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, K
 
     KisMathToolbox* mathToolbox = KisMetaRegistry::instance()->mtRegistry()->get( src->colorSpace()->mathToolboxID() );
     setProgressTotalSteps(mathToolbox->fastWaveletTotalSteps(rect) * 2 + size*size*depth );
-    connect(mathToolbox, TQT_SIGNAL(nextStep()), this, TQT_SLOT(incProgress()));
+    connect(mathToolbox, TQ_SIGNAL(nextStep()), this, TQ_SLOT(incProgress()));
 
 
     kdDebug(41005) << size << " " << maxrectsize << " " << rect.x() << " " << rect.y() << endl;
@@ -184,7 +184,7 @@ void KisHalftoneReduction::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, K
     delete wav;
     delete blurwav;
     delete buff;
-    disconnect(mathToolbox, TQT_SIGNAL(nextStep()), this, TQT_SLOT(incProgress()));
+    disconnect(mathToolbox, TQ_SIGNAL(nextStep()), this, TQ_SLOT(incProgress()));
 
     setProgressDone(); // Must be called even if you don't really support progression
 }
diff --git a/chalk/plugins/filters/imageenhancement/kis_wavelet_noise_reduction.cpp b/chalk/plugins/filters/imageenhancement/kis_wavelet_noise_reduction.cpp
index e5cca62e..f1d71404 100644
--- a/chalk/plugins/filters/imageenhancement/kis_wavelet_noise_reduction.cpp
+++ b/chalk/plugins/filters/imageenhancement/kis_wavelet_noise_reduction.cpp
@@ -77,7 +77,7 @@ void KisWaveletNoiseReduction::process(KisPaintDeviceSP src, KisPaintDeviceSP ds
 
     KisMathToolbox* mathToolbox = KisMetaRegistry::instance()->mtRegistry()->get( src->colorSpace()->mathToolboxID() );
     setProgressTotalSteps(mathToolbox->fastWaveletTotalSteps(rect) * 2 + size*size*depth );
-    connect(mathToolbox, TQT_SIGNAL(nextStep()), this, TQT_SLOT(incProgress()));
+    connect(mathToolbox, TQ_SIGNAL(nextStep()), this, TQ_SLOT(incProgress()));
 
 
     kdDebug(41005) << size << " " << maxrectsize << " " << rect.x() << " " << rect.y() << endl;
@@ -124,7 +124,7 @@ void KisWaveletNoiseReduction::process(KisPaintDeviceSP src, KisPaintDeviceSP ds
 
     delete wav;
     delete buff;
-    disconnect(mathToolbox, TQT_SIGNAL(nextStep()), this, TQT_SLOT(incProgress()));
+    disconnect(mathToolbox, TQ_SIGNAL(nextStep()), this, TQ_SLOT(incProgress()));
 
     setProgressDone(); // Must be called even if you don't really support progression
 }
diff --git a/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp b/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp
index b83baa11..b33eeadd 100644
--- a/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp
+++ b/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp
@@ -33,11 +33,11 @@ KisWdgLensCorrection::KisWdgLensCorrection(KisFilter* /*nfilter*/, TQWidget* par
     m_widget = new WdgLensCorrectionOptions(this);
     widgetLayout -> addWidget(m_widget, 0, 0);
 
-    connect( widget()->intXCenter, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( widget()->intYCenter, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( widget()->dblCorrectionNearCenter, TQT_SIGNAL( valueChanged(double)), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( widget()->dblCorrectionNearEdges, TQT_SIGNAL( valueChanged(double)), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( widget()->dblBrightness, TQT_SIGNAL( valueChanged(double)), TQT_SIGNAL(sigPleaseUpdatePreview()));
+    connect( widget()->intXCenter, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( widget()->intYCenter, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( widget()->dblCorrectionNearCenter, TQ_SIGNAL( valueChanged(double)), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( widget()->dblCorrectionNearEdges, TQ_SIGNAL( valueChanged(double)), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( widget()->dblBrightness, TQ_SIGNAL( valueChanged(double)), TQ_SIGNAL(sigPleaseUpdatePreview()));
 }
 
 KisWdgLensCorrection::~KisWdgLensCorrection()
diff --git a/chalk/plugins/filters/levelfilter/kis_level_filter.cpp b/chalk/plugins/filters/levelfilter/kis_level_filter.cpp
index 3d27e6e6..9e85b6bc 100644
--- a/chalk/plugins/filters/levelfilter/kis_level_filter.cpp
+++ b/chalk/plugins/filters/levelfilter/kis_level_filter.cpp
@@ -225,29 +225,29 @@ KisLevelConfigWidget::KisLevelConfigWidget(TQWidget * parent, KisPaintDeviceSP d
     TQ_CHECK_PTR(l);
     l->addWidget(m_page, 0, TQt::AlignTop);
 
-    connect( m_page->blackspin, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( m_page->whitespin, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( m_page->ingradient, TQT_SIGNAL(modifiedGamma(double)), TQT_SIGNAL(sigPleaseUpdatePreview()));
+    connect( m_page->blackspin, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( m_page->whitespin, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( m_page->ingradient, TQ_SIGNAL(modifiedGamma(double)), TQ_SIGNAL(sigPleaseUpdatePreview()));
 
-    connect( m_page->blackspin, TQT_SIGNAL(valueChanged(int)), m_page->ingradient, TQT_SLOT(modifyBlack(int)));
-    connect( m_page->whitespin, TQT_SIGNAL(valueChanged(int)), m_page->ingradient, TQT_SLOT(modifyWhite(int)));
-    //connect( m_page->whitespin, TQT_SIGNAL(valueChanged(int)), m_page->ingradient, TQT_SLOT(modifyGamma()));
+    connect( m_page->blackspin, TQ_SIGNAL(valueChanged(int)), m_page->ingradient, TQ_SLOT(modifyBlack(int)));
+    connect( m_page->whitespin, TQ_SIGNAL(valueChanged(int)), m_page->ingradient, TQ_SLOT(modifyWhite(int)));
+    //connect( m_page->whitespin, TQ_SIGNAL(valueChanged(int)), m_page->ingradient, TQ_SLOT(modifyGamma()));
 
-    connect( m_page->ingradient, TQT_SIGNAL(modifiedBlack(int)), m_page->blackspin, TQT_SLOT(setValue(int)));
-    connect( m_page->ingradient, TQT_SIGNAL(modifiedWhite(int)), m_page->whitespin, TQT_SLOT(setValue(int)));
-    connect( m_page->ingradient, TQT_SIGNAL(modifiedGamma(double)), m_page->gammaspin, TQT_SLOT(setNum(double)));
+    connect( m_page->ingradient, TQ_SIGNAL(modifiedBlack(int)), m_page->blackspin, TQ_SLOT(setValue(int)));
+    connect( m_page->ingradient, TQ_SIGNAL(modifiedWhite(int)), m_page->whitespin, TQ_SLOT(setValue(int)));
+    connect( m_page->ingradient, TQ_SIGNAL(modifiedGamma(double)), m_page->gammaspin, TQ_SLOT(setNum(double)));
 
 
-    connect( m_page->outblackspin, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( m_page->outwhitespin, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview()));
+    connect( m_page->outblackspin, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( m_page->outwhitespin, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview()));
 
-    connect( m_page->outblackspin, TQT_SIGNAL(valueChanged(int)), m_page->outgradient, TQT_SLOT(modifyBlack(int)));
-    connect( m_page->outwhitespin, TQT_SIGNAL(valueChanged(int)), m_page->outgradient, TQT_SLOT(modifyWhite(int)));
+    connect( m_page->outblackspin, TQ_SIGNAL(valueChanged(int)), m_page->outgradient, TQ_SLOT(modifyBlack(int)));
+    connect( m_page->outwhitespin, TQ_SIGNAL(valueChanged(int)), m_page->outgradient, TQ_SLOT(modifyWhite(int)));
 
-    connect( m_page->outgradient, TQT_SIGNAL(modifiedBlack(int)), m_page->outblackspin, TQT_SLOT(setValue(int)));
-    connect( m_page->outgradient, TQT_SIGNAL(modifiedWhite(int)), m_page->outwhitespin, TQT_SLOT(setValue(int)));
+    connect( m_page->outgradient, TQ_SIGNAL(modifiedBlack(int)), m_page->outblackspin, TQ_SLOT(setValue(int)));
+    connect( m_page->outgradient, TQ_SIGNAL(modifiedWhite(int)), m_page->outwhitespin, TQ_SLOT(setValue(int)));
 
-    connect( (TQObject*)(m_page->chkLogarithmic), TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(drawHistogram(bool)));
+    connect( (TQObject*)(m_page->chkLogarithmic), TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(drawHistogram(bool)));
 
     KisHistogramProducerSP producer = new KisGenericLabHistogramProducer();
     histogram = new KisHistogram(dev, producer, LINEAR);
diff --git a/chalk/plugins/filters/noisefilter/kis_wdg_noise.cpp b/chalk/plugins/filters/noisefilter/kis_wdg_noise.cpp
index c13db952..38dcc552 100644
--- a/chalk/plugins/filters/noisefilter/kis_wdg_noise.cpp
+++ b/chalk/plugins/filters/noisefilter/kis_wdg_noise.cpp
@@ -33,8 +33,8 @@ KisWdgNoise::KisWdgNoise(KisFilter* /*nfilter*/, TQWidget* parent, const char* n
     m_widget = new WdgNoiseOptions(this);
     widgetLayout -> addWidget(m_widget,0,0);
 
-    connect( widget()->intLevel, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( widget()->intOpacity, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview()));
+    connect( widget()->intLevel, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( widget()->intOpacity, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview()));
 }
 
 KisWdgNoise::~KisWdgNoise()
diff --git a/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp b/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp
index ba157e14..2b0f63e8 100644
--- a/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp
+++ b/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp
@@ -33,9 +33,9 @@ KisWdgRandomPick::KisWdgRandomPick(KisFilter* /*nfilter*/, TQWidget* parent, con
     m_widget = new WdgRandomPickOptions(this);
     widgetLayout -> addWidget(m_widget,0,0);
 
-    connect( widget()->intLevel, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( widget()->intWindowSize, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( widget()->intOpacity, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview()));
+    connect( widget()->intLevel, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( widget()->intWindowSize, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( widget()->intOpacity, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview()));
 }
 
 KisWdgRandomPick::~KisWdgRandomPick()
diff --git a/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cpp b/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cpp
index 627d105c..744ec49a 100644
--- a/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cpp
+++ b/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cpp
@@ -36,9 +36,9 @@ KisWdgUnsharp::KisWdgUnsharp( KisFilter* , TQWidget * parent, const char * name)
     m_widget = new WdgUnsharp(this);
     widgetLayout -> addWidget(m_widget,0,0);
 
-    connect( widget()->intHalfSize, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( widget()->doubleAmount, TQT_SIGNAL( valueChanged(double)), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( widget()->intThreshold, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview()));
+    connect( widget()->intHalfSize, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( widget()->doubleAmount, TQ_SIGNAL( valueChanged(double)), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( widget()->intThreshold, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview()));
 }
 
 void KisWdgUnsharp::setConfiguration(KisFilterConfiguration* config)
diff --git a/chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp b/chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp
index 346ff44a..6788f294 100644
--- a/chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp
+++ b/chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp
@@ -34,14 +34,14 @@ KisWdgWave::KisWdgWave(KisFilter* /*nfilter*/, TQWidget* parent, const char* nam
     m_widget = new WdgWaveOptions(this);
     widgetLayout -> addWidget(m_widget, 0, 0);
 
-    connect( widget()->intHWavelength, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( widget()->intHShift, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( widget()->intHAmplitude, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( widget()->cbHShape, TQT_SIGNAL( activated(int)), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( widget()->intVWavelength, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( widget()->intVShift, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( widget()->intVAmplitude, TQT_SIGNAL( valueChanged(int)), TQT_SIGNAL(sigPleaseUpdatePreview()));
-    connect( widget()->cbVShape, TQT_SIGNAL( activated(int)), TQT_SIGNAL(sigPleaseUpdatePreview()));
+    connect( widget()->intHWavelength, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( widget()->intHShift, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( widget()->intHAmplitude, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( widget()->cbHShape, TQ_SIGNAL( activated(int)), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( widget()->intVWavelength, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( widget()->intVShift, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( widget()->intVAmplitude, TQ_SIGNAL( valueChanged(int)), TQ_SIGNAL(sigPleaseUpdatePreview()));
+    connect( widget()->cbVShape, TQ_SIGNAL( activated(int)), TQ_SIGNAL(sigPleaseUpdatePreview()));
 }
 
 KisWdgWave::~KisWdgWave()
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_brushop.cpp b/chalk/plugins/paintops/defaultpaintops/kis_brushop.cpp
index 285b4d6f..5b8680a6 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_brushop.cpp
+++ b/chalk/plugins/paintops/defaultpaintops/kis_brushop.cpp
@@ -70,7 +70,7 @@ KisBrushOpSettings::KisBrushOpSettings(TQWidget *parent)
     TQToolButton* moreButton = new TQToolButton(TQt::UpArrow, m_optionsWidget);
     moreButton->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
     moreButton->setMinimumSize(TQSize(24,24)); // Bah, I had hoped the above line would make this unneeded
-    connect(moreButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCustomCurves()));
+    connect(moreButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCustomCurves()));
 
     m_customSize = false;
     m_customOpacity = false;
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cpp b/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cpp
index 3a2a2284..905ceb15 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cpp
+++ b/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cpp
@@ -79,7 +79,7 @@ KisSmudgeOpSettings::KisSmudgeOpSettings(TQWidget *parent, bool isTablet)
         TQToolButton* moreButton = new TQToolButton(TQt::UpArrow, m_optionsWidget);
         moreButton->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
         moreButton->setMinimumSize(TQSize(24,24)); // Bah, I had hoped the above line would make this unneeded
-        connect(moreButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCustomCurves()));
+        connect(moreButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCustomCurves()));
     } else {
         m_pressureVariation = 0;
         m_size = 0;
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_brush.cpp b/chalk/plugins/tools/defaulttools/kis_tool_brush.cpp
index 96e26202..8ceab02c 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_brush.cpp
+++ b/chalk/plugins/tools/defaulttools/kis_tool_brush.cpp
@@ -55,7 +55,7 @@ KisToolBrush::KisToolBrush()
     m_timer = new TQTimer(this);
     TQ_CHECK_PTR(m_timer);
 
-    connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeoutPaint()));
+    connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeoutPaint()));
 
 }
 
@@ -115,7 +115,7 @@ void KisToolBrush::setup(TDEActionCollection *collection)
     if (m_action == 0) {
         m_action = new TDERadioAction(i18n("&Brush"),
                                     "tool_freehand", TQt::Key_B, this,
-                                    TQT_SLOT(activate()), collection,
+                                    TQ_SLOT(activate()), collection,
                                     name());
         m_action->setToolTip(i18n("Draw freehand"));
         m_action->setExclusiveGroup("tools");
@@ -152,7 +152,7 @@ TQWidget* KisToolBrush::createOptionWidget(TQWidget* parent)
     TQWidget *widget = super::createOptionWidget(parent);
     m_chkDirect = new TQCheckBox(i18n("Paint direct"), widget, "chkDirect");
     m_chkDirect->setChecked(true);
-    connect(m_chkDirect, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(slotSetPaintingMode(int)));
+    connect(m_chkDirect, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(slotSetPaintingMode(int)));
     
     m_optionLayout = new TQGridLayout(NULL, 3, 2, 0, 6);
     TQ_CHECK_PTR(m_optionLayout);
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cpp b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cpp
index 6130aa21..57fa86f7 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cpp
+++ b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cpp
@@ -214,7 +214,7 @@ void KisToolColorPicker::setup(TDEActionCollection *collection)
     m_action = static_cast<TDERadioAction *>(collection->action(name()));
 
     if (m_action == 0) {
-        m_action = new TDERadioAction(i18n("&Color Picker"), "tool_colorpicker", TQt::Key_P, this, TQT_SLOT(activate()), collection, name());
+        m_action = new TDERadioAction(i18n("&Color Picker"), "tool_colorpicker", TQt::Key_P, this, TQ_SLOT(activate()), collection, name());
         m_action->setToolTip(i18n("Color picker"));
         m_action->setExclusiveGroup("tools");
         m_ownAction = true;
@@ -235,12 +235,12 @@ TQWidget* KisToolColorPicker::createOptionWidget(TQWidget* parent)
 
     m_optionsWidget->listViewChannels->setSorting(-1);
 
-    connect(m_optionsWidget->cbUpdateCurrentColour, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSetUpdateColor(bool)));
-    connect(m_optionsWidget->cbNormaliseValues, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSetNormaliseValues(bool)));
-    connect(m_optionsWidget->cbPalette, TQT_SIGNAL(toggled(bool)),
-            TQT_SLOT(slotSetAddPalette(bool)));
-    connect(m_optionsWidget->radius, TQT_SIGNAL(valueChanged(int)),
-            TQT_SLOT(slotChangeRadius(int)));
+    connect(m_optionsWidget->cbUpdateCurrentColour, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotSetUpdateColor(bool)));
+    connect(m_optionsWidget->cbNormaliseValues, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotSetNormaliseValues(bool)));
+    connect(m_optionsWidget->cbPalette, TQ_SIGNAL(toggled(bool)),
+            TQ_SLOT(slotSetAddPalette(bool)));
+    connect(m_optionsWidget->radius, TQ_SIGNAL(valueChanged(int)),
+            TQ_SLOT(slotChangeRadius(int)));
 
     KisResourceServerBase* srv = KisResourceServerRegistry::instance()->get("PaletteServer");
 
@@ -258,7 +258,7 @@ TQWidget* KisToolColorPicker::createOptionWidget(TQWidget* parent)
         }
     }
 
-    connect(srv, TQT_SIGNAL(resourceAdded(KisResource*)), this, TQT_SLOT(slotAddPalette(KisResource*)));
+    connect(srv, TQ_SIGNAL(resourceAdded(KisResource*)), this, TQ_SLOT(slotAddPalette(KisResource*)));
 
     return m_optionsWidget;
 }
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cpp b/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cpp
index 0f917e7f..ca7dfd1e 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cpp
+++ b/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cpp
@@ -90,7 +90,7 @@ void KisToolDuplicate::setup(TDEActionCollection *collection)
     if (m_action == 0) {
         m_action = new TDERadioAction(i18n("&Duplicate Brush"),
                         "tool_duplicate", TQt::Key_C, this,
-                        TQT_SLOT(activate()), collection,
+                        TQ_SLOT(activate()), collection,
                         name());
         m_action->setToolTip(i18n("Duplicate parts of the image. Shift-click to select the point to duplicate from to begin."));
         m_action->setExclusiveGroup("tools");
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cpp b/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cpp
index 0dc53a5b..284cb503 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cpp
+++ b/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cpp
@@ -174,7 +174,7 @@ void KisToolEllipse::setup(TDEActionCollection *collection)
                                     "tool_ellipse",
                                     shortcut,
                                     this,
-                                    TQT_SLOT(activate()),
+                                    TQ_SLOT(activate()),
                                     collection,
                                     name());
         m_action->setToolTip(i18n("Draw an ellipse"));
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_fill.cpp b/chalk/plugins/tools/defaulttools/kis_tool_fill.cpp
index 3c9b6038..7ac91b2e 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_fill.cpp
+++ b/chalk/plugins/tools/defaulttools/kis_tool_fill.cpp
@@ -167,19 +167,19 @@ TQWidget* KisToolFill::createOptionWidget(TQWidget* parent)
     m_slThreshold->setRange( 1, 100);
     m_slThreshold->setSteps( 3, 3);
     m_slThreshold->setValue(m_threshold);
-    connect(m_slThreshold, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetThreshold(int)));
+    connect(m_slThreshold, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotSetThreshold(int)));
 
     m_checkUsePattern = new TQCheckBox(i18n("Use pattern"), widget);
     m_checkUsePattern->setChecked(m_usePattern);
-    connect(m_checkUsePattern, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetUsePattern(bool)));
+    connect(m_checkUsePattern, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotSetUsePattern(bool)));
 
     m_checkSampleMerged = new TQCheckBox(i18n("Limit to current layer"), widget);
     m_checkSampleMerged->setChecked(m_unmerged);
-    connect(m_checkSampleMerged, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetSampleMerged(bool)));
+    connect(m_checkSampleMerged, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotSetSampleMerged(bool)));
 
     m_checkFillSelection = new TQCheckBox(i18n("Fill entire selection"), widget);
     m_checkFillSelection->setChecked(m_fillOnlySelection);
-    connect(m_checkFillSelection, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetFillSelection(bool)));
+    connect(m_checkFillSelection, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotSetFillSelection(bool)));
 
     addOptionWidgetOption(m_slThreshold, m_lbThreshold);
 
@@ -221,7 +221,7 @@ void KisToolFill::setup(TDEActionCollection *collection)
                         "tool_color_fill",
                         TQt::Key_F,
                         this,
-                        TQT_SLOT(activate()),
+                        TQ_SLOT(activate()),
                         collection,
                         name());
         m_action->setToolTip(i18n("Contiguous fill"));
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_gradient.cpp b/chalk/plugins/tools/defaulttools/kis_tool_gradient.cpp
index c0543c6a..bdf93bdf 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_gradient.cpp
+++ b/chalk/plugins/tools/defaulttools/kis_tool_gradient.cpp
@@ -235,10 +235,10 @@ TQWidget* KisToolGradient::createOptionWidget(TQWidget* parent)
     m_lbRepeat = new TQLabel(i18n("Repeat:"), widget);
 
     m_ckReverse = new TQCheckBox(i18n("Reverse"), widget, "reverse_check");
-    connect(m_ckReverse, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetReverse(bool)));
+    connect(m_ckReverse, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotSetReverse(bool)));
 
     m_cmbShape = new TQComboBox(false, widget, "shape_combo");
-    connect(m_cmbShape, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetShape(int)));
+    connect(m_cmbShape, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSetShape(int)));
     m_cmbShape->insertItem(i18n("Linear"));
     m_cmbShape->insertItem(i18n("Bi-Linear"));
     m_cmbShape->insertItem(i18n("Radial"));
@@ -247,7 +247,7 @@ TQWidget* KisToolGradient::createOptionWidget(TQWidget* parent)
     m_cmbShape->insertItem(i18n("Conical Symmetric"));
 
     m_cmbRepeat = new TQComboBox(false, widget, "repeat_combo");
-    connect(m_cmbRepeat, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetRepeat(int)));
+    connect(m_cmbRepeat, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSetRepeat(int)));
     m_cmbRepeat->insertItem(i18n("None"));
     m_cmbRepeat->insertItem(i18n("Forwards"));
     m_cmbRepeat->insertItem(i18n("Alternating"));
@@ -263,7 +263,7 @@ TQWidget* KisToolGradient::createOptionWidget(TQWidget* parent)
     m_slAntiAliasThreshold = new KDoubleNumInput(widget, "threshold_slider");
     m_slAntiAliasThreshold->setRange( 0, 1); 
     m_slAntiAliasThreshold->setValue(m_antiAliasThreshold);
-    connect(m_slAntiAliasThreshold, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(slotSetAntiAliasThreshold(double)));
+    connect(m_slAntiAliasThreshold, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(slotSetAntiAliasThreshold(double)));
 
     addOptionWidgetOption(m_slAntiAliasThreshold, m_lbAntiAliasThreshold);
 
@@ -297,7 +297,7 @@ void KisToolGradient::setup(TDEActionCollection *collection)
     if (m_action == 0) {
         m_action = new TDERadioAction(i18n("&Gradient"),
                         "tool_gradient", TQt::Key_G, this,
-                        TQT_SLOT(activate()), collection,
+                        TQ_SLOT(activate()), collection,
                         name());
         m_action->setToolTip(i18n("Draw a gradient"));
         m_action->setExclusiveGroup("tools");
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_line.cpp b/chalk/plugins/tools/defaulttools/kis_tool_line.cpp
index e9e303a6..2d0328eb 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_line.cpp
+++ b/chalk/plugins/tools/defaulttools/kis_tool_line.cpp
@@ -238,7 +238,7 @@ void KisToolLine::setup(TDEActionCollection *collection)
     if (m_action == 0) {
         m_action = new TDERadioAction(i18n("&Line"),
                         "tool_line", TQt::Key_L, this,
-                        TQT_SLOT(activate()), collection,
+                        TQ_SLOT(activate()), collection,
                         name());
         m_action->setToolTip(i18n("Draw a line"));
         m_action->setExclusiveGroup("tools");
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_move.cpp b/chalk/plugins/tools/defaulttools/kis_tool_move.cpp
index 1bcd5135..40ebcc03 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_move.cpp
+++ b/chalk/plugins/tools/defaulttools/kis_tool_move.cpp
@@ -46,7 +46,7 @@ KisToolMove::KisToolMove()
 
     setCursor(KisCursor::moveCursor());
     m_repeatTimer = new TQTimer(this);
-    connect( m_repeatTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotMove() ) );
+    connect( m_repeatTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotMove() ) );
 }
 
 KisToolMove::~KisToolMove()
@@ -104,7 +104,7 @@ void KisToolMove::setup(TDEActionCollection *collection)
                         "tool_move",
                         TQt::SHIFT+TQt::Key_V,
                         this,
-                        TQT_SLOT(activate()),
+                        TQ_SLOT(activate()),
                         collection,
                         name());
         m_action->setToolTip(i18n("Move"));
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_pan.cpp b/chalk/plugins/tools/defaulttools/kis_tool_pan.cpp
index d96c820f..b77d66c7 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_pan.cpp
+++ b/chalk/plugins/tools/defaulttools/kis_tool_pan.cpp
@@ -85,7 +85,7 @@ void KisToolPan::setup(TDEActionCollection *collection)
     m_action = static_cast<TDERadioAction *>(collection->action(name()));
 
     if (m_action == 0) {
-        m_action = new TDERadioAction(i18n("&Pan"), "tool_pan", TQt::SHIFT+TQt::Key_H, this, TQT_SLOT(activate()), collection, name());
+        m_action = new TDERadioAction(i18n("&Pan"), "tool_pan", TQt::SHIFT+TQt::Key_H, this, TQ_SLOT(activate()), collection, name());
         m_action->setToolTip(i18n("Pan"));
         m_action->setExclusiveGroup("tools");
         m_ownAction = true;
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_rectangle.cpp b/chalk/plugins/tools/defaulttools/kis_tool_rectangle.cpp
index 0106b769..8c02b078 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_rectangle.cpp
+++ b/chalk/plugins/tools/defaulttools/kis_tool_rectangle.cpp
@@ -175,7 +175,7 @@ void KisToolRectangle::setup(TDEActionCollection *collection)
                         "tool_rectangle",
                         TQt::Key_F6,
                         this,
-                        TQT_SLOT(activate()),
+                        TQ_SLOT(activate()),
                         collection,
                         name());
         m_action->setToolTip(i18n("Draw a rectangle"));
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_text.cpp b/chalk/plugins/tools/defaulttools/kis_tool_text.cpp
index 6fb07940..2e77c0c0 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_text.cpp
+++ b/chalk/plugins/tools/defaulttools/kis_tool_text.cpp
@@ -170,7 +170,7 @@ TQWidget* KisToolText::createOptionWidget(TQWidget* parent)
         .arg(m_font.pointSize()), fontBox);
     m_btnMoreFonts = new TQPushButton("...", fontBox);
 
-    connect(m_btnMoreFonts, TQT_SIGNAL(released()), this, TQT_SLOT(setFont()));
+    connect(m_btnMoreFonts, TQ_SIGNAL(released()), this, TQ_SLOT(setFont()));
 
     addOptionWidgetOption(fontBox, m_lbFont);
 
@@ -186,7 +186,7 @@ void KisToolText::setup(TDEActionCollection *collection)
                         "tool_text",
                         TQt::SHIFT+TQt::Key_T,
                         this,
-                        TQT_SLOT(activate()),
+                        TQ_SLOT(activate()),
                         collection,
                         name());
         m_action->setExclusiveGroup("tools");
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_zoom.cpp b/chalk/plugins/tools/defaulttools/kis_tool_zoom.cpp
index 77cdd336..bd5b4a72 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_zoom.cpp
+++ b/chalk/plugins/tools/defaulttools/kis_tool_zoom.cpp
@@ -46,7 +46,7 @@ KisToolZoom::KisToolZoom()
     m_plusCursor = KisCursor::load("tool_zoom_plus_cursor.png", 8, 8);
     m_minusCursor = KisCursor::load("tool_zoom_minus_cursor.png", 8, 8);
     setCursor(m_plusCursor);
-    connect(&m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimer()));
+    connect(&m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimer()));
 }
 
 KisToolZoom::~KisToolZoom()
@@ -181,7 +181,7 @@ void KisToolZoom::setup(TDEActionCollection *collection)
     m_action = static_cast<TDERadioAction *>(collection->action(name()));
 
     if (m_action == 0) {
-        m_action = new TDERadioAction(i18n("&Zoom"), "tool_zoom", TQt::Key_Z, this, TQT_SLOT(activate()), collection, name());
+        m_action = new TDERadioAction(i18n("&Zoom"), "tool_zoom", TQt::Key_Z, this, TQ_SLOT(activate()), collection, name());
         m_action->setToolTip(i18n("Zoom"));
         m_action->setExclusiveGroup("tools");
         m_ownAction = true;
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cpp b/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cpp
index c89702f9..6a5e90e0 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cpp
+++ b/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cpp
@@ -211,7 +211,7 @@ void KisToolMoveSelection::setup(TDEActionCollection *collection)
                         "tool_move",
                         TQt::SHIFT+TQt::Key_V,
                         this,
-                        TQT_SLOT(activate()),
+                        TQ_SLOT(activate()),
                         collection,
                         name());
         m_action->setToolTip(i18n("Move the selection"));
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cpp b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cpp
index ba80434f..75212cf6 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cpp
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cpp
@@ -134,7 +134,7 @@ void KisToolSelectBrush::setup(TDEActionCollection *collection)
     if (m_action == 0) {
         m_action = new TDERadioAction(i18n("&Selection Brush"),
                         "tool_brush_selection", "Ctrl+Shift+B", this,
-                        TQT_SLOT(activate()), collection,
+                        TQ_SLOT(activate()), collection,
                         name());
         TQ_CHECK_PTR(m_action);
         m_action->setToolTip(i18n("Paint a selection"));
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cpp b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cpp
index bf24775d..d186dad5 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cpp
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cpp
@@ -146,7 +146,7 @@ void KisToolSelectContiguous::setup(TDEActionCollection *collection)
                         "tool_contiguous_selection" ,
                         0,
                         this,
-                        TQT_SLOT(activate()),
+                        TQ_SLOT(activate()),
                         collection,
                         name());
         TQ_CHECK_PTR(m_action);
@@ -192,7 +192,7 @@ TQWidget* KisToolSelectContiguous::createOptionWidget(TQWidget* parent)
     TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout());
     l->setSpacing( 6 );
 
-    connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int)));
+    connect (m_optWidget, TQ_SIGNAL(actionChanged(int)), this, TQ_SLOT(slotSetAction(int)));
 
     TQHBoxLayout * hbox = new TQHBoxLayout(l);
     TQ_CHECK_PTR(hbox);
@@ -206,13 +206,13 @@ TQWidget* KisToolSelectContiguous::createOptionWidget(TQWidget* parent)
     input->setRange(0, 200, 10, true);
     input->setValue(20);
     hbox->addWidget(input);
-    connect(input, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetFuzziness(int)));
+    connect(input, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotSetFuzziness(int)));
 
     TQCheckBox* samplemerged = new TQCheckBox(i18n("Sample merged"), m_optWidget);
     l->addWidget( samplemerged );
     samplemerged->setChecked(m_sampleMerged);
-    connect(samplemerged, TQT_SIGNAL(stateChanged(int)),
-            this, TQT_SLOT(slotSetSampleMerged(int)));
+    connect(samplemerged, TQ_SIGNAL(stateChanged(int)),
+            this, TQ_SLOT(slotSetSampleMerged(int)));
 
     l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding));
 
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cpp b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cpp
index 0d632c42..e90360a4 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cpp
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cpp
@@ -287,7 +287,7 @@ void KisToolSelectElliptical::setup(TDEActionCollection *collection)
                         "tool_elliptical_selection" ,
                         TQt::Key_J,
                         this,
-                        TQT_SLOT(activate()),
+                        TQ_SLOT(activate()),
                         collection,
                         name());
         TQ_CHECK_PTR(m_action);
@@ -303,7 +303,7 @@ TQWidget* KisToolSelectElliptical::createOptionWidget(TQWidget* parent)
     TQ_CHECK_PTR(m_optWidget);
     m_optWidget->setCaption(i18n("Elliptical Selection"));
 
-    connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int)));
+    connect (m_optWidget, TQ_SIGNAL(actionChanged(int)), this, TQ_SLOT(slotSetAction(int)));
 
     TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout());
     l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding));
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cpp b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cpp
index 9cfef0a8..91abc07a 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cpp
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cpp
@@ -121,7 +121,7 @@ void KisToolSelectEraser::setup(TDEActionCollection *collection)
     if (m_action == 0) {
         m_action = new TDERadioAction(i18n("Selection &Eraser"),
                         "tool_eraser_selection", "Ctrl+Shift+E", this,
-                        TQT_SLOT(activate()), collection,
+                        TQ_SLOT(activate()), collection,
                         name());
         TQ_CHECK_PTR(m_action);
         m_action->setToolTip(i18n("Erase parts of a selection"));
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cpp b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cpp
index 2507cb56..37930042 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cpp
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cpp
@@ -256,7 +256,7 @@ void KisToolSelectOutline::setup(TDEActionCollection *collection)
                         "tool_outline_selection",
                         0,
                         this,
-                        TQT_SLOT(activate()),
+                        TQ_SLOT(activate()),
                         collection,
                         name());
         TQ_CHECK_PTR(m_action);
@@ -273,7 +273,7 @@ TQWidget* KisToolSelectOutline::createOptionWidget(TQWidget* parent)
     TQ_CHECK_PTR(m_optWidget);
     m_optWidget->setCaption(i18n("Outline Selection"));
 
-    connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int)));
+    connect (m_optWidget, TQ_SIGNAL(actionChanged(int)), this, TQ_SLOT(slotSetAction(int)));
 
     TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout());
     l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding));
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cpp b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cpp
index 464e4b0a..902e80d7 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cpp
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cpp
@@ -275,7 +275,7 @@ void KisToolSelectPolygonal::setup(TDEActionCollection *collection)
                         "tool_polygonal_selection" ,
                         0,
                         this,
-                        TQT_SLOT(activate()),
+                        TQ_SLOT(activate()),
                         collection,
                         name());
         TQ_CHECK_PTR(m_action);
@@ -292,7 +292,7 @@ TQWidget* KisToolSelectPolygonal::createOptionWidget(TQWidget* parent)
     TQ_CHECK_PTR(m_optWidget);
     m_optWidget->setCaption(i18n("Polygonal Selection"));
 
-    connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int)));
+    connect (m_optWidget, TQ_SIGNAL(actionChanged(int)), this, TQ_SLOT(slotSetAction(int)));
 
     TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout());
     l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding));
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cpp b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cpp
index b52ec563..62cf8f66 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cpp
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cpp
@@ -288,7 +288,7 @@ void KisToolSelectRectangular::setup(TDEActionCollection *collection)
                         "tool_rect_selection",
                         TQt::Key_R,
                         this,
-                        TQT_SLOT(activate()),
+                        TQ_SLOT(activate()),
                         collection,
                         name());
         TQ_CHECK_PTR(m_action);
@@ -304,7 +304,7 @@ TQWidget* KisToolSelectRectangular::createOptionWidget(TQWidget* parent)
     TQ_CHECK_PTR(m_optWidget);
     m_optWidget->setCaption(i18n("Rectangular Selection"));
 
-    connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int)));
+    connect (m_optWidget, TQ_SIGNAL(actionChanged(int)), this, TQ_SLOT(slotSetAction(int)));
 
     TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout());
     l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding));
diff --git a/chalk/plugins/tools/tool_crop/kis_tool_crop.cpp b/chalk/plugins/tools/tool_crop/kis_tool_crop.cpp
index 8826de3d..c7f619c1 100644
--- a/chalk/plugins/tools/tool_crop/kis_tool_crop.cpp
+++ b/chalk/plugins/tools/tool_crop/kis_tool_crop.cpp
@@ -703,13 +703,13 @@ TQWidget* KisToolCrop::createOptionWidget(TQWidget* parent)
     m_optWidget = new WdgToolCrop(parent);
     TQ_CHECK_PTR(m_optWidget);
 
-    connect(m_optWidget->bnCrop, TQT_SIGNAL(clicked()), this, TQT_SLOT(crop()));
+    connect(m_optWidget->bnCrop, TQ_SIGNAL(clicked()), this, TQ_SLOT(crop()));
 
-    connect(m_optWidget->intX, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setCropX(int)));
-    connect(m_optWidget->intY, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setCropY(int)));
-    connect(m_optWidget->intWidth, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setCropWidth(int)));
-    connect(m_optWidget->intHeight, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setCropHeight(int)));
-    connect(m_optWidget->doubleRatio, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(setRatio( double )));
+    connect(m_optWidget->intX, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setCropX(int)));
+    connect(m_optWidget->intY, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setCropY(int)));
+    connect(m_optWidget->intWidth, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setCropWidth(int)));
+    connect(m_optWidget->intHeight, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setCropHeight(int)));
+    connect(m_optWidget->doubleRatio, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(setRatio( double )));
 
     return m_optWidget;
 }
@@ -728,7 +728,7 @@ void KisToolCrop::setup(TDEActionCollection *collection)
                                     "tool_crop",
                                     0,
                                     this,
-                                    TQT_SLOT(activate()),
+                                    TQ_SLOT(activate()),
                                     collection,
                                     name());
         TQ_CHECK_PTR(m_action);
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cpp b/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cpp
index a8d1514b..208b4bae 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cpp
+++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cpp
@@ -101,7 +101,7 @@ void KisToolBezierPaint::setup(TDEActionCollection *collection)
                                     "tool_bezier_paint",
                                     shortcut,
                                     this,
-                                    TQT_SLOT(activate()),
+                                    TQ_SLOT(activate()),
                                     collection,
                                     name());
         TQ_CHECK_PTR(m_action);
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cpp b/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cpp
index 65735860..94000ebc 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cpp
+++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cpp
@@ -90,7 +90,7 @@ void KisToolBezierSelect::setup(TDEActionCollection *collection)
                                     "tool_bezier_select",
                                     shortcut,
                                     this,
-                                    TQT_SLOT(activate()),
+                                    TQ_SLOT(activate()),
                                     collection,
                                     name());
         TQ_CHECK_PTR(m_action);
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_curve.cpp b/chalk/plugins/tools/tool_curves/kis_tool_curve.cpp
index b4369d15..69cd5d05 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_curve.cpp
+++ b/chalk/plugins/tools/tool_curves/kis_tool_curve.cpp
@@ -574,7 +574,7 @@ TQWidget* KisToolCurve::createSelectionOptionWidget(TQWidget* parent)
     TQ_CHECK_PTR(m_optWidget);
     m_optWidget->setCaption(m_UIName);
 
-    connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int)));
+    connect (m_optWidget, TQ_SIGNAL(actionChanged(int)), this, TQ_SLOT(slotSetAction(int)));
 
     TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout());
     l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding));
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_example.cpp b/chalk/plugins/tools/tool_curves/kis_tool_example.cpp
index a21bb808..775e4e93 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_example.cpp
+++ b/chalk/plugins/tools/tool_curves/kis_tool_example.cpp
@@ -94,7 +94,7 @@ void KisToolExample::setup(TDEActionCollection *collection)
                                     "tool_example",
                                     shortcut,
                                     this,
-                                    TQT_SLOT(activate()),
+                                    TQ_SLOT(activate()),
                                     collection,
                                     name());
         TQ_CHECK_PTR(m_action);
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cpp b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cpp
index 1412f5fa..63e3f87f 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cpp
+++ b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cpp
@@ -773,8 +773,8 @@ TQWidget* KisToolMagnetic::createOptionWidget(TQWidget* parent)
     TQPushButton *finish = new TQPushButton(i18n("To Selection"), m_optWidget);
     m_slDistance = new TQSlider(MINDIST, MAXDIST, PAGESTEP, m_distance, TQt::Horizontal, m_optWidget);
 
-    connect(m_slDistance, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetDistance(int)));
-    connect(finish, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCommitCurve()));
+    connect(m_slDistance, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotSetDistance(int)));
+    connect(finish, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCommitCurve()));
 
     box->addWidget(m_lbDistance, 0, 0);
     box->addWidget(m_slDistance, 0, 1);
@@ -795,7 +795,7 @@ void KisToolMagnetic::setup(TDEActionCollection *collection)
                                     "tool_moutline",
                                     shortcut,
                                     this,
-                                    TQT_SLOT(activate()),
+                                    TQ_SLOT(activate()),
                                     collection,
                                     name());
         TQ_CHECK_PTR(m_action);
diff --git a/chalk/plugins/tools/tool_filter/kis_tool_filter.cpp b/chalk/plugins/tools/tool_filter/kis_tool_filter.cpp
index 14e2d616..04146c0e 100644
--- a/chalk/plugins/tools/tool_filter/kis_tool_filter.cpp
+++ b/chalk/plugins/tools/tool_filter/kis_tool_filter.cpp
@@ -67,7 +67,7 @@ void KisToolFilter::setup(TDEActionCollection *collection)
     if (m_action == 0) {
         m_action = new TDERadioAction(i18n("&Filter Brush"),
                         "tool_filter", 0, this,
-                        TQT_SLOT(activate()), collection,
+                        TQ_SLOT(activate()), collection,
                         name());
         TQ_CHECK_PTR(m_action);
         m_action->setToolTip(i18n("Paint with filters"));
@@ -124,7 +124,7 @@ TQWidget* KisToolFilter::createOptionWidget(TQWidget* parent)
     TQ_CHECK_PTR(m_optionLayout);
     super::addOptionWidgetLayout(m_optionLayout);
 
-    connect(m_cbFilter, TQT_SIGNAL(activated ( const KisID& )), this, TQT_SLOT( changeFilter( const KisID& ) ) );
+    connect(m_cbFilter, TQ_SIGNAL(activated ( const KisID& )), this, TQ_SLOT( changeFilter( const KisID& ) ) );
     changeFilter( m_cbFilter->currentItem () );
 
     return widget;
diff --git a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cpp b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cpp
index e676ba56..fc715e07 100644
--- a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cpp
+++ b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cpp
@@ -474,7 +474,7 @@ void KisToolPerspectiveGrid::setup(TDEActionCollection *collection)
                                     "tool_perspectivegrid" ,
                         0,
                         this,
-                        TQT_SLOT(activate()),
+                        TQ_SLOT(activate()),
                         collection,
                         name());
         TQ_CHECK_PTR(m_action);
diff --git a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cpp b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cpp
index 19451d94..8d63c65c 100644
--- a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cpp
+++ b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cpp
@@ -157,7 +157,7 @@ void KisToolPerspectiveTransform::deactivate()
 
     paintOutline();
 
-   disconnect(m_subject->currentImg().data(), TQT_SIGNAL(sigLayerActivated(KisLayerSP)), this, TQT_SLOT(slotLayerActivated(KisLayerSP)));
+   disconnect(m_subject->currentImg().data(), TQ_SIGNAL(sigLayerActivated(KisLayerSP)), this, TQ_SLOT(slotLayerActivated(KisLayerSP)));
 }
 
 void KisToolPerspectiveTransform::activate()
@@ -196,7 +196,7 @@ void KisToolPerspectiveTransform::activate()
             initHandles();
         }
     }
-    connect(m_subject->currentImg(), TQT_SIGNAL(sigLayerActivated(KisLayerSP)), this, TQT_SLOT(slotLayerActivated(KisLayerSP)));
+    connect(m_subject->currentImg(), TQ_SIGNAL(sigLayerActivated(KisLayerSP)), this, TQ_SLOT(slotLayerActivated(KisLayerSP)));
 }
 
 void KisToolPerspectiveTransform::initHandles()
@@ -691,17 +691,17 @@ TQWidget* KisToolPerspectiveTransform::createOptionWidget(TQWidget* /*parent*/)
     m_optWidget->cmbFilter->setIDList(KisFilterStrategyRegistry::instance()->listKeys());
 
     m_optWidget->cmbFilter->setCurrentText("Mitchell");
-    connect(m_optWidget->cmbFilter, TQT_SIGNAL(activated(const KisID &)),
-        this, TQT_SLOT(slotSetFilter(const KisID &)));
+    connect(m_optWidget->cmbFilter, TQ_SIGNAL(activated(const KisID &)),
+        this, TQ_SLOT(slotSetFilter(const KisID &)));
 
     KisID filterID = m_optWidget->cmbFilter->currentItem();
     m_filter = KisFilterStrategyRegistry::instance()->get(filterID);
 
 /*
-    connect(m_optWidget->intStartX, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setStartX(int)));
-    connect(m_optWidget->intStartY, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setStartY(int)));
-    connect(m_optWidget->intEndX, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setEndX(int)));
-    connect(m_optWidget->intEndY, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setEndY(int)));
+    connect(m_optWidget->intStartX, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setStartX(int)));
+    connect(m_optWidget->intStartY, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setStartY(int)));
+    connect(m_optWidget->intEndX, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setEndX(int)));
+    connect(m_optWidget->intEndY, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setEndY(int)));
 */
     m_optWidget->intStartX->hide();
     m_optWidget->intStartY->hide();
@@ -729,7 +729,7 @@ void KisToolPerspectiveTransform::setup(TDEActionCollection *collection)
                         "tool_perspectivetransform",
                         0,
                         this,
-                        TQT_SLOT(activate()),
+                        TQ_SLOT(activate()),
                         collection,
                         name());
         TQ_CHECK_PTR(m_action);
diff --git a/chalk/plugins/tools/tool_polygon/kis_tool_polygon.cpp b/chalk/plugins/tools/tool_polygon/kis_tool_polygon.cpp
index 3457d278..1948de1b 100644
--- a/chalk/plugins/tools/tool_polygon/kis_tool_polygon.cpp
+++ b/chalk/plugins/tools/tool_polygon/kis_tool_polygon.cpp
@@ -227,7 +227,7 @@ void KisToolPolygon::setup(TDEActionCollection *collection)
                         "tool_polygon",
                         shortcut,
                         this,
-                        TQT_SLOT(activate()),
+                        TQ_SLOT(activate()),
                         collection,
                         name());
         TQ_CHECK_PTR(m_action);
diff --git a/chalk/plugins/tools/tool_polyline/kis_tool_polyline.cpp b/chalk/plugins/tools/tool_polyline/kis_tool_polyline.cpp
index 594f1cf9..d4fc8803 100644
--- a/chalk/plugins/tools/tool_polyline/kis_tool_polyline.cpp
+++ b/chalk/plugins/tools/tool_polyline/kis_tool_polyline.cpp
@@ -242,7 +242,7 @@ void KisToolPolyline::setup(TDEActionCollection *collection)
                         "polyline",
                         shortcut,
                         this,
-                        TQT_SLOT(activate()),
+                        TQ_SLOT(activate()),
                         collection,
                         name());
         TQ_CHECK_PTR(m_action);
diff --git a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cpp b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cpp
index 3a5182b4..62f014d9 100644
--- a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cpp
+++ b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cpp
@@ -97,7 +97,7 @@ KisToolSelectSimilar::KisToolSelectSimilar()
     m_fuzziness = 20;
     m_currentSelectAction = m_defaultSelectAction = SELECTION_ADD;
     m_timer = new TQTimer(this);
-    connect(m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimer()) );
+    connect(m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimer()) );
 }
 
 KisToolSelectSimilar::~KisToolSelectSimilar()
@@ -202,7 +202,7 @@ void KisToolSelectSimilar::setup(TDEActionCollection *collection)
     m_action = static_cast<TDERadioAction *>(collection->action(name()));
 
     if (m_action == 0) {
-        m_action = new TDERadioAction(i18n("&Similar Selection"), "tool_similar_selection", "Ctrl+E", this, TQT_SLOT(activate()), collection, name());
+        m_action = new TDERadioAction(i18n("&Similar Selection"), "tool_similar_selection", "Ctrl+E", this, TQ_SLOT(activate()), collection, name());
         TQ_CHECK_PTR(m_action);
         m_action->setToolTip(i18n("Select similar colors"));
         m_action->setExclusiveGroup("tools");
@@ -240,7 +240,7 @@ TQWidget* KisToolSelectSimilar::createOptionWidget(TQWidget* parent)
     TQ_CHECK_PTR(m_selectionOptionsWidget);
 
     l->addWidget(m_selectionOptionsWidget);
-    connect (m_selectionOptionsWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int)));
+    connect (m_selectionOptionsWidget, TQ_SIGNAL(actionChanged(int)), this, TQ_SLOT(slotSetAction(int)));
 
     TQHBoxLayout * hbox = new TQHBoxLayout(l);
     TQ_CHECK_PTR(hbox);
@@ -256,7 +256,7 @@ TQWidget* KisToolSelectSimilar::createOptionWidget(TQWidget* parent)
     input->setRange(0, 200, 10, true);
     input->setValue(20);
     hbox->addWidget(input);
-    connect(input, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetFuzziness(int)));
+    connect(input, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotSetFuzziness(int)));
 
     l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding));
 
diff --git a/chalk/plugins/tools/tool_star/kis_tool_star.cpp b/chalk/plugins/tools/tool_star/kis_tool_star.cpp
index 601bb775..93587658 100644
--- a/chalk/plugins/tools/tool_star/kis_tool_star.cpp
+++ b/chalk/plugins/tools/tool_star/kis_tool_star.cpp
@@ -184,7 +184,7 @@ void KisToolStar::setup(TDEActionCollection *collection)
                                     "tool_star",
                                     shortcut,
                                     this,
-                                    TQT_SLOT(activate()),
+                                    TQ_SLOT(activate()),
                                     collection,
                                     name());
         TQ_CHECK_PTR(m_action);
diff --git a/chalk/plugins/tools/tool_transform/kis_tool_transform.cpp b/chalk/plugins/tools/tool_transform/kis_tool_transform.cpp
index 19841067..fc0c9bb4 100644
--- a/chalk/plugins/tools/tool_transform/kis_tool_transform.cpp
+++ b/chalk/plugins/tools/tool_transform/kis_tool_transform.cpp
@@ -181,7 +181,7 @@ void KisToolTransform::deactivate()
 
     paintOutline();
 
-   disconnect(m_subject->currentImg().data(), TQT_SIGNAL(sigLayerActivated(KisLayerSP)), this, TQT_SLOT(slotLayerActivated(KisLayerSP)));
+   disconnect(m_subject->currentImg().data(), TQ_SIGNAL(sigLayerActivated(KisLayerSP)), this, TQ_SLOT(slotLayerActivated(KisLayerSP)));
 }
 
 void KisToolTransform::activate()
@@ -222,7 +222,7 @@ void KisToolTransform::activate()
                 initHandles();
         }
     }
-    connect(m_subject->currentImg(), TQT_SIGNAL(sigLayerActivated(KisLayerSP)), this, TQT_SLOT(slotLayerActivated(KisLayerSP)));
+    connect(m_subject->currentImg(), TQ_SIGNAL(sigLayerActivated(KisLayerSP)), this, TQ_SLOT(slotLayerActivated(KisLayerSP)));
 }
 
 void KisToolTransform::initHandles()
@@ -866,17 +866,17 @@ TQWidget* KisToolTransform::createOptionWidget(TQWidget* parent)
     m_optWidget->cmbFilter->setIDList(KisFilterStrategyRegistry::instance()->listKeys());
 
     m_optWidget->cmbFilter->setCurrentText("Mitchell");
-    connect(m_optWidget->cmbFilter, TQT_SIGNAL(activated(const KisID &)),
-        this, TQT_SLOT(slotSetFilter(const KisID &)));
+    connect(m_optWidget->cmbFilter, TQ_SIGNAL(activated(const KisID &)),
+        this, TQ_SLOT(slotSetFilter(const KisID &)));
 
     KisID filterID = m_optWidget->cmbFilter->currentItem();
     m_filter = KisFilterStrategyRegistry::instance()->get(filterID);
 
 /*
-    connect(m_optWidget->intStartX, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setStartX(int)));
-    connect(m_optWidget->intStartY, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setStartY(int)));
-    connect(m_optWidget->intEndX, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setEndX(int)));
-    connect(m_optWidget->intEndY, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setEndY(int)));
+    connect(m_optWidget->intStartX, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setStartX(int)));
+    connect(m_optWidget->intStartY, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setStartY(int)));
+    connect(m_optWidget->intEndX, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setEndX(int)));
+    connect(m_optWidget->intEndY, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setEndY(int)));
 */
     m_optWidget->intStartX->hide();
     m_optWidget->intStartY->hide();
@@ -903,7 +903,7 @@ void KisToolTransform::setup(TDEActionCollection *collection)
                         "tool_transform",
                         0,
                         this,
-                        TQT_SLOT(activate()),
+                        TQ_SLOT(activate()),
                         collection,
                         name());
         TQ_CHECK_PTR(m_action);
diff --git a/chalk/plugins/viewplugins/colorrange/colorrange.cpp b/chalk/plugins/viewplugins/colorrange/colorrange.cpp
index be0648ba..722467d2 100644
--- a/chalk/plugins/viewplugins/colorrange/colorrange.cpp
+++ b/chalk/plugins/viewplugins/colorrange/colorrange.cpp
@@ -58,7 +58,7 @@ ColorRange::ColorRange(TQObject *parent, const char *name, const TQStringList &)
         setInstance(ColorRangeFactory::instance());
         setXMLFile(locate("data","chalkplugins/colorrange.rc"), true);
         m_view = dynamic_cast<KisView*>(parent);
-        m_view->canvasSubject()->selectionManager()->addSelectionAction( new TDEAction(i18n("&Color Range..."), 0, 0, this, TQT_SLOT(slotActivated()), actionCollection(), "colorrange") );
+        m_view->canvasSubject()->selectionManager()->addSelectionAction( new TDEAction(i18n("&Color Range..."), 0, 0, this, TQ_SLOT(slotActivated()), actionCollection(), "colorrange") );
 
     }
 }
diff --git a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cpp b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cpp
index b6b52860..55a58204 100644
--- a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cpp
+++ b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cpp
@@ -201,29 +201,29 @@ DlgColorRange::DlgColorRange( KisView * view, KisPaintDeviceSP dev, TQWidget *
     m_mode = SELECTION_ADD;
     m_currentAction = REDS;
 
-    connect(this, TQT_SIGNAL(okClicked()),
-        this, TQT_SLOT(okClicked()));
+    connect(this, TQ_SIGNAL(okClicked()),
+        this, TQ_SLOT(okClicked()));
 
-    connect(this, TQT_SIGNAL(cancelClicked()),
-        this, TQT_SLOT(cancelClicked()));
+    connect(this, TQ_SIGNAL(cancelClicked()),
+        this, TQ_SLOT(cancelClicked()));
 
-    connect(m_page->chkInvert, TQT_SIGNAL(clicked()),
-        this, TQT_SLOT(slotInvertClicked()));
+    connect(m_page->chkInvert, TQ_SIGNAL(clicked()),
+        this, TQ_SLOT(slotInvertClicked()));
 
-    connect(m_page->cmbSelect, TQT_SIGNAL(activated(int)),
-        this, TQT_SLOT(slotSelectionTypeChanged(int)));
+    connect(m_page->cmbSelect, TQ_SIGNAL(activated(int)),
+        this, TQ_SLOT(slotSelectionTypeChanged(int)));
 
-    connect (m_page->radioAdd, TQT_SIGNAL(toggled(bool)),
-         this, TQT_SLOT(slotAdd(bool)));
+    connect (m_page->radioAdd, TQ_SIGNAL(toggled(bool)),
+         this, TQ_SLOT(slotAdd(bool)));
 
-    connect (m_page->radioSubtract, TQT_SIGNAL(toggled(bool)),
-         this, TQT_SLOT(slotSubtract(bool)));
+    connect (m_page->radioSubtract, TQ_SIGNAL(toggled(bool)),
+         this, TQ_SLOT(slotSubtract(bool)));
 
-    connect (m_page->bnSelect, TQT_SIGNAL(clicked()),
-        this, TQT_SLOT(slotSelectClicked()));
+    connect (m_page->bnSelect, TQ_SIGNAL(clicked()),
+        this, TQ_SLOT(slotSelectClicked()));
 
-    connect (m_page->bnDeselect, TQT_SIGNAL(clicked()),
-        this, TQT_SLOT(slotDeselectClicked()));
+    connect (m_page->bnDeselect, TQ_SIGNAL(clicked()),
+        this, TQ_SLOT(slotDeselectClicked()));
 
 }
 
diff --git a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cpp b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cpp
index 377f0569..50702d80 100644
--- a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cpp
+++ b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cpp
@@ -69,8 +69,8 @@ ColorSpaceConversion::ColorSpaceConversion(TQObject *parent, const char *name, c
         setInstance(ColorSpaceConversionFactory::instance());
         setXMLFile(locate("data","chalkplugins/colorspaceconversion.rc"), true);
 
-        (void) new TDEAction(i18n("&Convert Image Type..."), 0, 0, this, TQT_SLOT(slotImgColorSpaceConversion()), actionCollection(), "imgcolorspaceconversion");
-        (void) new TDEAction(i18n("&Convert Layer Type..."), 0, 0, this, TQT_SLOT(slotLayerColorSpaceConversion()), actionCollection(), "layercolorspaceconversion");
+        (void) new TDEAction(i18n("&Convert Image Type..."), 0, 0, this, TQ_SLOT(slotImgColorSpaceConversion()), actionCollection(), "imgcolorspaceconversion");
+        (void) new TDEAction(i18n("&Convert Layer Type..."), 0, 0, this, TQ_SLOT(slotLayerColorSpaceConversion()), actionCollection(), "layercolorspaceconversion");
 
     }
 }
diff --git a/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cpp b/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cpp
index 259c6f47..3d2cecfd 100644
--- a/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cpp
+++ b/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cpp
@@ -53,12 +53,12 @@ DlgColorSpaceConversion::DlgColorSpaceConversion( TQWidget *  parent,
 
     fillCmbDestProfile(m_page->cmbColorSpaces->currentItem());
 
-    connect(m_page->cmbColorSpaces, TQT_SIGNAL(activated(const KisID &)),
-        this, TQT_SLOT(fillCmbDestProfile(const KisID &)));
+    connect(m_page->cmbColorSpaces, TQ_SIGNAL(activated(const KisID &)),
+        this, TQ_SLOT(fillCmbDestProfile(const KisID &)));
 
 
-    connect(this, TQT_SIGNAL(okClicked()),
-        this, TQT_SLOT(okClicked()));
+    connect(this, TQ_SIGNAL(okClicked()),
+        this, TQ_SLOT(okClicked()));
 
 }
 
diff --git a/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cpp b/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cpp
index c82bbbad..0e4e4335 100644
--- a/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cpp
+++ b/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cpp
@@ -58,8 +58,8 @@ DlgDropshadow::DlgDropshadow( const TQString & /*imageCS*/,
     m_page->opacitySpinBox->setValue( cfg->readNumEntry("dropshadow_opacity", 80 ) );
     m_page->allowResizingCheckBox->setChecked( cfg->readBoolEntry("dropshadow_resizing", true ) );
     
-    connect(this, TQT_SIGNAL(okClicked()),
-        this, TQT_SLOT(okClicked()));
+    connect(this, TQ_SIGNAL(okClicked()),
+        this, TQ_SLOT(okClicked()));
 }
 
 DlgDropshadow::~DlgDropshadow()
diff --git a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cpp b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cpp
index 97a0b8a7..5f79231a 100644
--- a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cpp
+++ b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cpp
@@ -48,7 +48,7 @@ KisDropshadowPlugin::KisDropshadowPlugin(TQObject *parent, const char *name, con
         setXMLFile(locate("data","chalkplugins/dropshadow.rc"), true);
 
         m_view = (KisView*) parent;
-        (void) new TDEAction(i18n("Add Drop Shadow..."), 0, 0, this, TQT_SLOT(slotDropshadow()), actionCollection(), "dropshadow");
+        (void) new TDEAction(i18n("Add Drop Shadow..."), 0, 0, this, TQ_SLOT(slotDropshadow()), actionCollection(), "dropshadow");
     }
 }
 
diff --git a/chalk/plugins/viewplugins/filtersgallery/filters_gallery.cpp b/chalk/plugins/viewplugins/filtersgallery/filters_gallery.cpp
index 337b55c0..f469c667 100644
--- a/chalk/plugins/viewplugins/filtersgallery/filters_gallery.cpp
+++ b/chalk/plugins/viewplugins/filtersgallery/filters_gallery.cpp
@@ -59,7 +59,7 @@ ChalkFiltersGallery::ChalkFiltersGallery(TQObject *parent, const char *name, con
 
         m_view = (KisView*) parent;
 
-        (void) new TDEAction(i18n("&Filters Gallery"), 0, 0, this, TQT_SLOT(showFiltersGalleryDialog()), actionCollection(), "chalk_filters_gallery");
+        (void) new TDEAction(i18n("&Filters Gallery"), 0, 0, this, TQ_SLOT(showFiltersGalleryDialog()), actionCollection(), "chalk_filters_gallery");
 
         // Add a docker with the list of filters
 //         TQImage img;
diff --git a/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cpp b/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cpp
index 255b8b8d..58ca6a50 100644
--- a/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cpp
+++ b/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cpp
@@ -53,7 +53,7 @@ KisDlgFiltersGallery::KisDlgFiltersGallery(KisView* view, TQWidget* parent,const
     
     setMainWidget(m_widget);
     // Initialize filters list
-    connect(m_widget->filtersList , TQT_SIGNAL(selectionChanged(TQIconViewItem*)), this, TQT_SLOT(selectionHasChanged(TQIconViewItem* )));
+    connect(m_widget->filtersList , TQ_SIGNAL(selectionChanged(TQIconViewItem*)), this, TQ_SLOT(selectionHasChanged(TQIconViewItem* )));
     // Initialize configWidgetHolder
     m_widget->configWidgetHolder->setColumnLayout ( 0, TQt::Horizontal );
     //m_widget->configWidgetHolder->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum);
@@ -63,7 +63,7 @@ KisDlgFiltersGallery::KisDlgFiltersGallery(KisView* view, TQWidget* parent,const
     {
         m_widget->previewWidget->slotSetDevice( m_view->canvasSubject()->currentImg()->activeDevice().data() );
     }
-    connect( m_widget->previewWidget, TQT_SIGNAL(updated()), this, TQT_SLOT(refreshPreview()));
+    connect( m_widget->previewWidget, TQ_SIGNAL(updated()), this, TQ_SLOT(refreshPreview()));
     resize( minimumSizeHint());
     m_widget->previewWidget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::MinimumExpanding);
     m_labelNoCW = new TQLabel(i18n("No configuration options are available for this filter."), m_widget->configWidgetHolder);
@@ -97,7 +97,7 @@ void KisDlgFiltersGallery::selectionHasChanged ( TQIconViewItem * item )
         //m_currentConfigWidget->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
         m_widget->configWidgetHolder->layout()->add(m_currentConfigWidget);
         m_currentConfigWidget->show();
-        connect(m_currentConfigWidget, TQT_SIGNAL(sigPleaseUpdatePreview()), this, TQT_SLOT(slotConfigChanged()));
+        connect(m_currentConfigWidget, TQ_SIGNAL(sigPleaseUpdatePreview()), this, TQ_SLOT(slotConfigChanged()));
     }
     else {
         m_labelNoCW->show();
diff --git a/chalk/plugins/viewplugins/histogram/histogram.cpp b/chalk/plugins/viewplugins/histogram/histogram.cpp
index 8252a98d..d8b95640 100644
--- a/chalk/plugins/viewplugins/histogram/histogram.cpp
+++ b/chalk/plugins/viewplugins/histogram/histogram.cpp
@@ -61,18 +61,18 @@ Histogram::Histogram(TQObject *parent, const char *name, const TQStringList &)
         setInstance(HistogramFactory::instance());
         setXMLFile(locate("data","chalkplugins/histogram.rc"), true);
 
-        m_action = new TDEAction(i18n("&Histogram"), 0, 0, this, TQT_SLOT(slotActivated()), actionCollection(), "histogram");
+        m_action = new TDEAction(i18n("&Histogram"), 0, 0, this, TQ_SLOT(slotActivated()), actionCollection(), "histogram");
 
         m_view = (KisView*) parent;
         if (KisImageSP img = m_view->canvasSubject()->currentImg()) {
-            connect(img, TQT_SIGNAL(sigLayersChanged(KisGroupLayerSP)), this, TQT_SLOT(slotLayersChanged()));
-            connect(img, TQT_SIGNAL(sigLayerAdded(KisLayerSP)), this, TQT_SLOT(slotLayersChanged()));
-            connect(img, TQT_SIGNAL(sigLayerActivated(KisLayerSP)), this, TQT_SLOT(slotLayersChanged()));
-            connect(img, TQT_SIGNAL(sigLayerPropertiesChanged(KisLayerSP)), this, TQT_SLOT(slotLayersChanged()));
-            connect(img, TQT_SIGNAL(sigLayerRemoved(KisLayerSP, KisGroupLayerSP, KisLayerSP)),
-                    this, TQT_SLOT(slotLayersChanged()));
-            connect(img, TQT_SIGNAL(sigLayerMoved(KisLayerSP, KisGroupLayerSP, KisLayerSP)),
-                    this, TQT_SLOT(slotLayersChanged()));
+            connect(img, TQ_SIGNAL(sigLayersChanged(KisGroupLayerSP)), this, TQ_SLOT(slotLayersChanged()));
+            connect(img, TQ_SIGNAL(sigLayerAdded(KisLayerSP)), this, TQ_SLOT(slotLayersChanged()));
+            connect(img, TQ_SIGNAL(sigLayerActivated(KisLayerSP)), this, TQ_SLOT(slotLayersChanged()));
+            connect(img, TQ_SIGNAL(sigLayerPropertiesChanged(KisLayerSP)), this, TQ_SLOT(slotLayersChanged()));
+            connect(img, TQ_SIGNAL(sigLayerRemoved(KisLayerSP, KisGroupLayerSP, KisLayerSP)),
+                    this, TQ_SLOT(slotLayersChanged()));
+            connect(img, TQ_SIGNAL(sigLayerMoved(KisLayerSP, KisGroupLayerSP, KisLayerSP)),
+                    this, TQ_SLOT(slotLayersChanged()));
             m_img = img;
         }
     }
diff --git a/chalk/plugins/viewplugins/histogram/kis_histogram_widget.cpp b/chalk/plugins/viewplugins/histogram/kis_histogram_widget.cpp
index c4983870..b3d3353a 100644
--- a/chalk/plugins/viewplugins/histogram/kis_histogram_widget.cpp
+++ b/chalk/plugins/viewplugins/histogram/kis_histogram_widget.cpp
@@ -72,11 +72,11 @@ void KisHistogramWidget::setPaintDevice(KisPaintDeviceSP dev)
     m_from = m_histogramView->currentProducer()->viewFrom();
     m_width = m_histogramView->currentProducer()->viewWidth();
 
-    connect(grpType, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotTypeSwitched(int)));
-    connect(cmbChannel, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setActiveChannel(int)));
-    connect(zoomIn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotZoomIn()));
-    connect(zoomOut, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotZoomOut()));
-    connect(currentView, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slide(int)));
+    connect(grpType, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotTypeSwitched(int)));
+    connect(cmbChannel, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setActiveChannel(int)));
+    connect(zoomIn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotZoomIn()));
+    connect(zoomOut, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotZoomOut()));
+    connect(currentView, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slide(int)));
 }
 
 void KisHistogramWidget::setActiveChannel(int channel)
diff --git a/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cpp b/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cpp
index 25a7b9cf..0ba11d4a 100644
--- a/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cpp
+++ b/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cpp
@@ -76,14 +76,14 @@ ChalkHistogramDocker::ChalkHistogramDocker(TQObject *parent, const char *name, c
         m_hview->setCaption(i18n("Histogram"));
 
 
-        connect(m_hview, TQT_SIGNAL(rightClicked(const TQPoint&)),
-                this, TQT_SLOT(popupMenu(const TQPoint&)));
-        connect(m_cache, TQT_SIGNAL(cacheUpdated()),
-                new HistogramDockerUpdater(this, m_histogram, m_hview, m_producer), TQT_SLOT(updated()));
-        connect(&m_popup, TQT_SIGNAL(activated(int)),
-                this, TQT_SLOT(producerChanged(int)));
-        connect(img, TQT_SIGNAL(sigColorSpaceChanged(KisColorSpace*)),
-                this, TQT_SLOT(colorSpaceChanged(KisColorSpace*))); // No need to force updates here
+        connect(m_hview, TQ_SIGNAL(rightClicked(const TQPoint&)),
+                this, TQ_SLOT(popupMenu(const TQPoint&)));
+        connect(m_cache, TQ_SIGNAL(cacheUpdated()),
+                new HistogramDockerUpdater(this, m_histogram, m_hview, m_producer), TQ_SLOT(updated()));
+        connect(&m_popup, TQ_SIGNAL(activated(int)),
+                this, TQ_SLOT(producerChanged(int)));
+        connect(img, TQ_SIGNAL(sigColorSpaceChanged(KisColorSpace*)),
+                this, TQ_SLOT(colorSpaceChanged(KisColorSpace*))); // No need to force updates here
 
         // Add it to the control palette
         m_view->canvasSubject()->paletteManager()->addWidget(
@@ -143,8 +143,8 @@ void ChalkHistogramDocker::producerChanged(int pos)
         m_hview->setColor(true);
         m_hview->setCurrentChannels(m_producer, m_producer->channels());
 
-        connect(m_cache, TQT_SIGNAL(cacheUpdated()),
-                new HistogramDockerUpdater(this, m_histogram, m_hview, m_producer), TQT_SLOT(updated()));
+        connect(m_cache, TQ_SIGNAL(cacheUpdated()),
+                new HistogramDockerUpdater(this, m_histogram, m_hview, m_producer), TQ_SLOT(updated()));
     }
 }
 
@@ -175,7 +175,7 @@ HistogramDockerUpdater::HistogramDockerUpdater(TQObject* /*parent*/, KisHistogra
                                                KisAccumulatingHistogramProducer* p)
     : m_histogram(h), m_view(v), m_producer(p)
 {
-    connect(p, TQT_SIGNAL(completed()), this, TQT_SLOT(completed()));
+    connect(p, TQ_SIGNAL(completed()), this, TQ_SLOT(completed()));
 }
 
 void HistogramDockerUpdater::updated() {
diff --git a/chalk/plugins/viewplugins/histogram_docker/kis_imagerasteredcache.cpp b/chalk/plugins/viewplugins/histogram_docker/kis_imagerasteredcache.cpp
index 19599cd9..a4df2688 100644
--- a/chalk/plugins/viewplugins/histogram_docker/kis_imagerasteredcache.cpp
+++ b/chalk/plugins/viewplugins/histogram_docker/kis_imagerasteredcache.cpp
@@ -47,11 +47,11 @@ KisImageRasteredCache::KisImageRasteredCache(KisView* view, Observer* o)
 
     imageSizeChanged(img->width(), img->height());
 
-    connect(img, TQT_SIGNAL(sigImageUpdated(TQRect)),
-            this, TQT_SLOT(imageUpdated(TQRect)));
-    connect(img, TQT_SIGNAL(sigSizeChanged(TQ_INT32, TQ_INT32)),
-            this, TQT_SLOT(imageSizeChanged(TQ_INT32, TQ_INT32)));
-    connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeOut()));
+    connect(img, TQ_SIGNAL(sigImageUpdated(TQRect)),
+            this, TQ_SLOT(imageUpdated(TQRect)));
+    connect(img, TQ_SIGNAL(sigSizeChanged(TQ_INT32, TQ_INT32)),
+            this, TQ_SLOT(imageSizeChanged(TQ_INT32, TQ_INT32)));
+    connect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeOut()));
 }
 
 KisImageRasteredCache::~KisImageRasteredCache() {
@@ -140,7 +140,7 @@ void KisImageRasteredCache::timeOut() {
 
     // If there are still elements, we need to be called again (this emulates processEvents)
     if (!m_queue.isEmpty()) {
-        TQTimer::singleShot(0, this, TQT_SLOT(timeOut()));
+        TQTimer::singleShot(0, this, TQ_SLOT(timeOut()));
     } else {
         emit cacheUpdated();
         m_imageProjection = 0;
diff --git a/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cpp b/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cpp
index c455af8c..8800c08c 100644
--- a/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cpp
+++ b/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cpp
@@ -63,8 +63,8 @@ DlgImageSize::DlgImageSize( TQWidget *  parent,
     unblockAll();
 
 
-    connect(this, TQT_SIGNAL(okClicked()),
-        this, TQT_SLOT(okClicked()));
+    connect(this, TQ_SIGNAL(okClicked()),
+        this, TQ_SLOT(okClicked()));
 
 }
 
@@ -259,17 +259,17 @@ void DlgImageSize::blockAll()
 void DlgImageSize::unblockAll()
 {
     // XXX: more efficient to use blockSignals?
-    connect (m_page->intWidth, TQT_SIGNAL(valueChanged(int)),
-         this, TQT_SLOT(slotWidthPixelsChanged(int)));
+    connect (m_page->intWidth, TQ_SIGNAL(valueChanged(int)),
+         this, TQ_SLOT(slotWidthPixelsChanged(int)));
 
-    connect (m_page->intHeight, TQT_SIGNAL(valueChanged(int)),
-         this, TQT_SLOT(slotHeightPixelsChanged(int)));
+    connect (m_page->intHeight, TQ_SIGNAL(valueChanged(int)),
+         this, TQ_SLOT(slotHeightPixelsChanged(int)));
 
-    connect (m_page->intWidthPercent, TQT_SIGNAL(valueChanged(int)),
-         this, TQT_SLOT(slotWidthPercentChanged(int)));
+    connect (m_page->intWidthPercent, TQ_SIGNAL(valueChanged(int)),
+         this, TQ_SLOT(slotWidthPercentChanged(int)));
 
-    connect (m_page->intHeightPercent, TQT_SIGNAL(valueChanged(int)),
-         this, TQT_SLOT(slotHeightPercentChanged(int)));
+    connect (m_page->intHeightPercent, TQ_SIGNAL(valueChanged(int)),
+         this, TQ_SLOT(slotHeightPercentChanged(int)));
 
 
 }
diff --git a/chalk/plugins/viewplugins/imagesize/dlg_layersize.cpp b/chalk/plugins/viewplugins/imagesize/dlg_layersize.cpp
index 77979805..c0dbbc63 100644
--- a/chalk/plugins/viewplugins/imagesize/dlg_layersize.cpp
+++ b/chalk/plugins/viewplugins/imagesize/dlg_layersize.cpp
@@ -64,8 +64,8 @@ DlgLayerSize::DlgLayerSize( TQWidget *  parent,
     unblockAll();
 
 
-    connect(this, TQT_SIGNAL(okClicked()),
-        this, TQT_SLOT(okClicked()));
+    connect(this, TQ_SIGNAL(okClicked()),
+        this, TQ_SLOT(okClicked()));
 
 }
 
@@ -243,17 +243,17 @@ void DlgLayerSize::blockAll()
 void DlgLayerSize::unblockAll()
 {
     // XXX: more efficient to use blockSignals?
-    connect (m_page->intWidth, TQT_SIGNAL(valueChanged(int)),
-         this, TQT_SLOT(slotWidthPixelsChanged(int)));
+    connect (m_page->intWidth, TQ_SIGNAL(valueChanged(int)),
+         this, TQ_SLOT(slotWidthPixelsChanged(int)));
 
-    connect (m_page->intHeight, TQT_SIGNAL(valueChanged(int)),
-         this, TQT_SLOT(slotHeightPixelsChanged(int)));
+    connect (m_page->intHeight, TQ_SIGNAL(valueChanged(int)),
+         this, TQ_SLOT(slotHeightPixelsChanged(int)));
 
-    connect (m_page->intWidthPercent, TQT_SIGNAL(valueChanged(int)),
-         this, TQT_SLOT(slotWidthPercentChanged(int)));
+    connect (m_page->intWidthPercent, TQ_SIGNAL(valueChanged(int)),
+         this, TQ_SLOT(slotWidthPercentChanged(int)));
 
-    connect (m_page->intHeightPercent, TQT_SIGNAL(valueChanged(int)),
-         this, TQT_SLOT(slotHeightPercentChanged(int)));
+    connect (m_page->intHeightPercent, TQ_SIGNAL(valueChanged(int)),
+         this, TQ_SLOT(slotHeightPercentChanged(int)));
 
 
 }
diff --git a/chalk/plugins/viewplugins/imagesize/imagesize.cpp b/chalk/plugins/viewplugins/imagesize/imagesize.cpp
index af9c2570..644592b2 100644
--- a/chalk/plugins/viewplugins/imagesize/imagesize.cpp
+++ b/chalk/plugins/viewplugins/imagesize/imagesize.cpp
@@ -66,13 +66,13 @@ ImageSize::ImageSize(TQObject *parent, const char *name, const TQStringList &)
         setInstance(ImageSizeFactory::instance());
         setXMLFile(locate("data","chalkplugins/imagesize.rc"), true);
 
-        (void) new TDEAction(i18n("Change &Image Size..."), 0, "Shift-s", this, TQT_SLOT(slotImageSize()), actionCollection(), "imagesize");
-        (void) new TDEAction(i18n("&Scale Layer..."), 0, 0, this, TQT_SLOT(slotLayerSize()), actionCollection(), "layerscale");
+        (void) new TDEAction(i18n("Change &Image Size..."), 0, "Shift-s", this, TQ_SLOT(slotImageSize()), actionCollection(), "imagesize");
+        (void) new TDEAction(i18n("&Scale Layer..."), 0, 0, this, TQ_SLOT(slotLayerSize()), actionCollection(), "layerscale");
 
 
         m_view = (KisView*) parent;
         // Selection manager takes ownership?
-        TDEAction * a = new TDEAction(i18n("&Scale Selection..."), 0, 0, this, TQT_SLOT(slotSelectionScale()), actionCollection(), "selectionscale");
+        TDEAction * a = new TDEAction(i18n("&Scale Selection..."), 0, 0, this, TQ_SLOT(slotSelectionScale()), actionCollection(), "selectionscale");
         TQ_CHECK_PTR(a);
         m_view ->canvasSubject()-> selectionManager()->addSelectionAction(a);
     }
diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cpp b/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cpp
index 8e2bc4de..5f686eec 100644
--- a/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cpp
+++ b/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cpp
@@ -47,7 +47,7 @@ DlgBorderSelection::DlgBorderSelection( TQWidget *  parent, const char * name) :
     setMainWidget(m_page);
     resize(m_page->sizeHint());
 
-    connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked()));
+    connect(this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(okClicked()));
 }
 
 DlgBorderSelection::~DlgBorderSelection()
diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cpp b/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cpp
index ae590eba..95996643 100644
--- a/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cpp
+++ b/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cpp
@@ -47,7 +47,7 @@ DlgGrowSelection::DlgGrowSelection( TQWidget *  parent, const char * name) : sup
     setMainWidget(m_page);
     resize(m_page->sizeHint());
 
-    connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked()));
+    connect(this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(okClicked()));
 }
 
 DlgGrowSelection::~DlgGrowSelection()
diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cpp b/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cpp
index ce4ce9d3..1d66e89a 100644
--- a/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cpp
+++ b/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cpp
@@ -47,7 +47,7 @@ DlgShrinkSelection::DlgShrinkSelection( TQWidget *  parent, const char * name) :
     setMainWidget(m_page);
     resize(m_page->sizeHint());
 
-    connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked()));
+    connect(this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(okClicked()));
 }
 
 DlgShrinkSelection::~DlgShrinkSelection()
diff --git a/chalk/plugins/viewplugins/modify_selection/modify_selection.cpp b/chalk/plugins/viewplugins/modify_selection/modify_selection.cpp
index 82389995..89ccd171 100644
--- a/chalk/plugins/viewplugins/modify_selection/modify_selection.cpp
+++ b/chalk/plugins/viewplugins/modify_selection/modify_selection.cpp
@@ -66,9 +66,9 @@ ModifySelection::ModifySelection(TQObject *parent, const char *name, const TQStr
         m_view = (KisView*) parent;
 
         // Selection manager takes ownership?
-        TDEAction* a = new TDEAction(i18n("Grow Selection..."), 0, 0, this, TQT_SLOT(slotGrowSelection()), actionCollection(), "growselection");
-        TDEAction* b = new TDEAction(i18n("Shrink Selection..."), 0, 0, this, TQT_SLOT(slotShrinkSelection()), actionCollection(), "shrinkselection");
-        TDEAction* c = new TDEAction(i18n("Border Selection..."), 0, 0, this, TQT_SLOT(slotBorderSelection()), actionCollection(), "borderselection");
+        TDEAction* a = new TDEAction(i18n("Grow Selection..."), 0, 0, this, TQ_SLOT(slotGrowSelection()), actionCollection(), "growselection");
+        TDEAction* b = new TDEAction(i18n("Shrink Selection..."), 0, 0, this, TQ_SLOT(slotShrinkSelection()), actionCollection(), "shrinkselection");
+        TDEAction* c = new TDEAction(i18n("Border Selection..."), 0, 0, this, TQ_SLOT(slotBorderSelection()), actionCollection(), "borderselection");
 
         TQ_CHECK_PTR(a);
         TQ_CHECK_PTR(b);
diff --git a/chalk/plugins/viewplugins/performancetest/dlg_perftest.cpp b/chalk/plugins/viewplugins/performancetest/dlg_perftest.cpp
index 326d9727..d3dbbb9b 100644
--- a/chalk/plugins/viewplugins/performancetest/dlg_perftest.cpp
+++ b/chalk/plugins/viewplugins/performancetest/dlg_perftest.cpp
@@ -51,11 +51,11 @@ DlgPerfTest::DlgPerfTest( TQWidget *  parent,
     setMainWidget(m_page);
     resize(m_page->sizeHint());
 
-    connect(this, TQT_SIGNAL(okClicked()),
-        this, TQT_SLOT(okClicked()));
+    connect(this, TQ_SIGNAL(okClicked()),
+        this, TQ_SLOT(okClicked()));
 
-    connect(m_page->btnSelectAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectAllClicked()));
-    connect(m_page->btnDeselectAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(deselectAllClicked()));
+    connect(m_page->btnSelectAll, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectAllClicked()));
+    connect(m_page->btnDeselectAll, TQ_SIGNAL(clicked()), this, TQ_SLOT(deselectAllClicked()));
 }
 
 DlgPerfTest::~DlgPerfTest()
diff --git a/chalk/plugins/viewplugins/performancetest/perftest.cpp b/chalk/plugins/viewplugins/performancetest/perftest.cpp
index fa544551..b3fdcb44 100644
--- a/chalk/plugins/viewplugins/performancetest/perftest.cpp
+++ b/chalk/plugins/viewplugins/performancetest/perftest.cpp
@@ -86,7 +86,7 @@ PerfTest::PerfTest(TQObject *parent, const char *name, const TQStringList &)
         setInstance(PerfTestFactory::instance());
         setXMLFile(locate("data","chalkplugins/perftest.rc"), true);
 
-        (void) new TDEAction(i18n("&Performance Test..."), 0, 0, this, TQT_SLOT(slotPerfTest()), actionCollection(), "perf_test");
+        (void) new TDEAction(i18n("&Performance Test..."), 0, 0, this, TQ_SLOT(slotPerfTest()), actionCollection(), "perf_test");
 
         m_view = (KisView*) parent;
     }
diff --git a/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cpp b/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cpp
index e7c3a8ce..550988a3 100644
--- a/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cpp
+++ b/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cpp
@@ -51,10 +51,10 @@ DlgRotateImage::DlgRotateImage( TQWidget *  parent,
     setMainWidget(m_page);
     resize(m_page->sizeHint());
 
-    connect(this, TQT_SIGNAL(okClicked()),
-        this, TQT_SLOT(okClicked()));
-        connect( m_page->doubleCustom, TQT_SIGNAL( valueChanged ( double ) ),
-                 this, TQT_SLOT( slotAngleValueChanged( double ) ) );
+    connect(this, TQ_SIGNAL(okClicked()),
+        this, TQ_SLOT(okClicked()));
+        connect( m_page->doubleCustom, TQ_SIGNAL( valueChanged ( double ) ),
+                 this, TQ_SLOT( slotAngleValueChanged( double ) ) );
 
 }
 
diff --git a/chalk/plugins/viewplugins/rotateimage/rotateimage.cpp b/chalk/plugins/viewplugins/rotateimage/rotateimage.cpp
index ba5c4859..47bec8d9 100644
--- a/chalk/plugins/viewplugins/rotateimage/rotateimage.cpp
+++ b/chalk/plugins/viewplugins/rotateimage/rotateimage.cpp
@@ -59,16 +59,16 @@ RotateImage::RotateImage(TQObject *parent, const char *name, const TQStringList
         setInstance(RotateImageFactory::instance());
         setXMLFile(locate("data","chalkplugins/rotateimage.rc"), true);
         m_view = (KisView*) parent;
-        (void) new TDEAction(i18n("&Rotate Image..."), 0, 0, this, TQT_SLOT(slotRotateImage()), actionCollection(), "rotateimage");
-        (void) new TDEAction(i18n("Rotate Image CW"), "object-rotate-right", 0, this, TQT_SLOT(slotRotateImage90()), actionCollection(), "rotateImageCW90");
-        (void) new TDEAction(i18n("Rotate Image 1&80"), 0, 0, this, TQT_SLOT(slotRotateImage180()), actionCollection(), "rotateImage180");
-        (void) new TDEAction(i18n("Rotate Image CCW"), "object-rotate-left", 0, this, TQT_SLOT(slotRotateImage270()), actionCollection(), "rotateImageCCW90");
+        (void) new TDEAction(i18n("&Rotate Image..."), 0, 0, this, TQ_SLOT(slotRotateImage()), actionCollection(), "rotateimage");
+        (void) new TDEAction(i18n("Rotate Image CW"), "object-rotate-right", 0, this, TQ_SLOT(slotRotateImage90()), actionCollection(), "rotateImageCW90");
+        (void) new TDEAction(i18n("Rotate Image 1&80"), 0, 0, this, TQ_SLOT(slotRotateImage180()), actionCollection(), "rotateImage180");
+        (void) new TDEAction(i18n("Rotate Image CCW"), "object-rotate-left", 0, this, TQ_SLOT(slotRotateImage270()), actionCollection(), "rotateImageCCW90");
 
-        (void) new TDEAction(i18n("&Rotate Layer..."), 0, 0, this, TQT_SLOT(slotRotateLayer()), actionCollection(), "rotatelayer");
+        (void) new TDEAction(i18n("&Rotate Layer..."), 0, 0, this, TQ_SLOT(slotRotateLayer()), actionCollection(), "rotatelayer");
 
-        (void)new TDEAction(i18n("Rotate 1&80"), 0, m_view, TQT_SLOT(rotateLayer180()), actionCollection(), "rotateLayer180");
-        (void)new TDEAction(i18n("Rotate CCW"), "object-rotate-left", 0, m_view, TQT_SLOT(rotateLayerLeft90()), actionCollection(), "rotateLayerCCW90");
-        (void)new TDEAction(i18n("Rotate CW"), "object-rotate-right", 0, m_view, TQT_SLOT(rotateLayerRight90()), actionCollection(), "rotateLayerCW90");
+        (void)new TDEAction(i18n("Rotate 1&80"), 0, m_view, TQ_SLOT(rotateLayer180()), actionCollection(), "rotateLayer180");
+        (void)new TDEAction(i18n("Rotate CCW"), "object-rotate-left", 0, m_view, TQ_SLOT(rotateLayerLeft90()), actionCollection(), "rotateLayerCCW90");
+        (void)new TDEAction(i18n("Rotate CW"), "object-rotate-right", 0, m_view, TQ_SLOT(rotateLayerRight90()), actionCollection(), "rotateLayerCW90");
     }
 }
 
diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
index dd28d925..fd2680fe 100644
--- a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
+++ b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
@@ -78,10 +78,10 @@ KSnapshot::KSnapshot(TQWidget *parent, const char *name)
 
     mainWidget->btnSave->hide();
     mainWidget->btnPrint->hide();
-    connect(mainWidget, TQT_SIGNAL(startImageDrag()), TQT_SLOT(slotDragSnapshot()));
+    connect(mainWidget, TQ_SIGNAL(startImageDrag()), TQ_SLOT(slotDragSnapshot()));
 
-    connect( mainWidget, TQT_SIGNAL( newClicked() ), TQT_SLOT( slotGrab() ) );
-    connect( mainWidget, TQT_SIGNAL( printClicked() ), TQT_SLOT( slotPrint() ) );
+    connect( mainWidget, TQ_SIGNAL( newClicked() ), TQ_SLOT( slotGrab() ) );
+    connect( mainWidget, TQ_SIGNAL( printClicked() ), TQ_SLOT( slotPrint() ) );
 
     grabber->show();
     grabber->grabMouse( waitCursor );
@@ -97,16 +97,16 @@ KSnapshot::KSnapshot(TQWidget *parent, const char *name)
     mainWidget->setMode( conf->readNumEntry( "mode", 0 ) );
     mainWidget->setIncludeDecorations(conf->readBoolEntry("includeDecorations",true));
 
-    connect( &grabTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT(  grabTimerDone() ) );
+    connect( &grabTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT(  grabTimerDone() ) );
 
     TDEAccel* accel = new TDEAccel(this);
     TQ_CHECK_PTR(accel);
-    accel->insert(TDEStdAccel::Print, this, TQT_SLOT(slotPrint()));
-    accel->insert(TDEStdAccel::New, this, TQT_SLOT(slotGrab()));
+    accel->insert(TDEStdAccel::Print, this, TQ_SLOT(slotPrint()));
+    accel->insert(TDEStdAccel::New, this, TQ_SLOT(slotGrab()));
 
-    accel->insert( "Print2", TQt::Key_P, this, TQT_SLOT(slotPrint()));
-    accel->insert( "New2", TQt::Key_N, this, TQT_SLOT(slotGrab()));
-    accel->insert( "New3", TQt::Key_Space, this, TQT_SLOT(slotGrab()));
+    accel->insert( "Print2", TQt::Key_P, this, TQ_SLOT(slotPrint()));
+    accel->insert( "New2", TQt::Key_N, this, TQ_SLOT(slotGrab()));
+    accel->insert( "New3", TQt::Key_Space, this, TQ_SLOT(slotGrab()));
 
     mainWidget->btnNew->setFocus();
     
@@ -181,8 +181,8 @@ void KSnapshot::slotGrab()
     {
         rgnGrab = new RegionGrabber();
         TQ_CHECK_PTR(rgnGrab);
-        connect( rgnGrab, TQT_SIGNAL( regionGrabbed( const TQPixmap & ) ),
-             TQT_SLOT( slotRegionGrabbed( const TQPixmap & ) ) );
+        connect( rgnGrab, TQ_SIGNAL( regionGrabbed( const TQPixmap & ) ),
+             TQ_SLOT( slotRegionGrabbed( const TQPixmap & ) ) );
     }
     else
     {
diff --git a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp
index a05ce3e2..c44e7112 100644
--- a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp
+++ b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp
@@ -75,9 +75,9 @@ RegionGrabber::RegionGrabber()
 
   tipTimer = new TQTimer( this );
   TQ_CHECK_PTR(tipTimer);
-  connect( tipTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( updateSizeTip() ) );
+  connect( tipTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( updateSizeTip() ) );
 
-  TQTimer::singleShot( 200, this, TQT_SLOT( initGrabber() ) );
+  TQTimer::singleShot( 200, this, TQ_SLOT( initGrabber() ) );
 }
 
 RegionGrabber::~RegionGrabber()
diff --git a/chalk/plugins/viewplugins/screenshot/screenshot.cpp b/chalk/plugins/viewplugins/screenshot/screenshot.cpp
index e1d18605..c0a1a4d7 100644
--- a/chalk/plugins/viewplugins/screenshot/screenshot.cpp
+++ b/chalk/plugins/viewplugins/screenshot/screenshot.cpp
@@ -51,9 +51,9 @@ Screenshot::Screenshot(TQObject *parent, const char *name, const TQStringList &)
 
     snapshot = new KSnapshot();
     TQ_CHECK_PTR(snapshot);
-    connect( snapshot, TQT_SIGNAL( screenGrabbed() ), TQT_SLOT( slotScreenGrabbed() ) );
+    connect( snapshot, TQ_SIGNAL( screenGrabbed() ), TQ_SLOT( slotScreenGrabbed() ) );
 
-    (void) new TDEAction(i18n("&Screenshot..."), SmallIcon("tool_screenshot"), 0, this, TQT_SLOT(slotScreenshot()), actionCollection(), "screenshot");
+    (void) new TDEAction(i18n("&Screenshot..."), SmallIcon("tool_screenshot"), 0, this, TQ_SLOT(slotScreenshot()), actionCollection(), "screenshot");
 
 }
 
diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h b/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h
index 0a8426cb..a71cadd8 100644
--- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h
+++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h
@@ -49,7 +49,7 @@ class IteratorMemoryManager : public TQObject {
         IteratorMemoryManager(IteratorMemoryManaged* it) : m_it(it)
         {
             // Connect the Monitor to know when the invalidating of iterator is needed
-            connect(KisScriptMonitor::instance(), TQT_SIGNAL(executionFinished(const Kross::Api::ScriptAction* )), this, TQT_SLOT(invalidateIterator()));
+            connect(KisScriptMonitor::instance(), TQ_SIGNAL(executionFinished(const Kross::Api::ScriptAction* )), this, TQ_SLOT(invalidateIterator()));
 
         }
     public slots:
diff --git a/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_monitor.cpp b/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_monitor.cpp
index 3967ffe7..e7a94e93 100644
--- a/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_monitor.cpp
+++ b/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_monitor.cpp
@@ -34,8 +34,8 @@ KisScriptMonitor::~KisScriptMonitor()
 
 void KisScriptMonitor::monitor(Kross::Api::ScriptGUIClient* guiClient)
 {
-    connect(guiClient, TQT_SIGNAL(executionFinished( const Kross::Api::ScriptAction* )), TQT_SIGNAL(executionFinished( const Kross::Api::ScriptAction* )));
-    connect(guiClient, TQT_SIGNAL(executionStarted( const Kross::Api::ScriptAction* )), TQT_SIGNAL(executionStarted( const Kross::Api::ScriptAction* )));
+    connect(guiClient, TQ_SIGNAL(executionFinished( const Kross::Api::ScriptAction* )), TQ_SIGNAL(executionFinished( const Kross::Api::ScriptAction* )));
+    connect(guiClient, TQ_SIGNAL(executionStarted( const Kross::Api::ScriptAction* )), TQ_SIGNAL(executionStarted( const Kross::Api::ScriptAction* )));
 }
 
 KisScriptMonitor* KisScriptMonitor::s_instance = 0;
diff --git a/chalk/plugins/viewplugins/scripting/scripting.cpp b/chalk/plugins/viewplugins/scripting/scripting.cpp
index 5c317ad2..0642af52 100644
--- a/chalk/plugins/viewplugins/scripting/scripting.cpp
+++ b/chalk/plugins/viewplugins/scripting/scripting.cpp
@@ -68,16 +68,16 @@ Scripting::Scripting(TQObject *parent, const char *name, const TQStringList &)
 //         m_scriptguiclient ->setXMLFile(locate("data","chalkplugins/scripting.rc"), true);
         //BEGIN TODO: understand why the ScriptGUIClient doesn't "link" its actions to the menu
         setXMLFile(locate("data","chalkplugins/scripting.rc"), true);
-        new TDEAction(i18n("Execute Script File..."), 0, 0, m_scriptguiclient, TQT_SLOT(executeScriptFile()), actionCollection(), "executescriptfile");
-        new TDEAction(i18n("Script Manager..."), 0, 0, m_scriptguiclient, TQT_SLOT(showScriptManager()), actionCollection(), "configurescripts");
+        new TDEAction(i18n("Execute Script File..."), 0, 0, m_scriptguiclient, TQ_SLOT(executeScriptFile()), actionCollection(), "executescriptfile");
+        new TDEAction(i18n("Script Manager..."), 0, 0, m_scriptguiclient, TQ_SLOT(showScriptManager()), actionCollection(), "configurescripts");
         //END TODO
 
         TQWidget * w = new Kross::Api::WdgScriptsManager(m_scriptguiclient, m_view);
 
         m_view->canvasSubject()->paletteManager()->addWidget(w, "Scripts Manager", chalk::LAYERBOX, 10,  PALETTE_DOCKER, false);
 
-        connect(m_scriptguiclient, TQT_SIGNAL(executionFinished( const Kross::Api::ScriptAction* )), this, TQT_SLOT(executionFinished(const Kross::Api::ScriptAction*)));
-        connect(m_scriptguiclient, TQT_SIGNAL(executionStarted( const Kross::Api::ScriptAction* )), this, TQT_SLOT(executionStarted(const Kross::Api::ScriptAction*)));
+        connect(m_scriptguiclient, TQ_SIGNAL(executionFinished( const Kross::Api::ScriptAction* )), this, TQ_SLOT(executionFinished(const Kross::Api::ScriptAction*)));
+        connect(m_scriptguiclient, TQ_SIGNAL(executionStarted( const Kross::Api::ScriptAction* )), this, TQ_SLOT(executionStarted(const Kross::Api::ScriptAction*)));
         KisScriptMonitor::instance()->monitor( m_scriptguiclient );
 
         Kross::Api::Manager::scriptManager()->addTQObject(m_view->canvasSubject()->document(), "ChalkDocument");
diff --git a/chalk/plugins/viewplugins/selectopaque/selectopaque.cpp b/chalk/plugins/viewplugins/selectopaque/selectopaque.cpp
index 61d85634..b3ed5cf5 100644
--- a/chalk/plugins/viewplugins/selectopaque/selectopaque.cpp
+++ b/chalk/plugins/viewplugins/selectopaque/selectopaque.cpp
@@ -61,7 +61,7 @@ SelectOpaque::SelectOpaque(TQObject *parent, const char *name, const TQStringLis
         setInstance(SelectOpaqueFactory::instance());
         setXMLFile(locate("data","chalkplugins/selectopaque.rc"), true);
         m_view = dynamic_cast<KisView*>(parent);
-        m_view->canvasSubject()->selectionManager()->addSelectionAction( new TDEAction(i18n("&Select All Opaque Pixels..."), 0, 0, this, TQT_SLOT(slotActivated()), actionCollection(), "selectopaque") );
+        m_view->canvasSubject()->selectionManager()->addSelectionAction( new TDEAction(i18n("&Select All Opaque Pixels..."), 0, 0, this, TQ_SLOT(slotActivated()), actionCollection(), "selectopaque") );
 
     }
 }
diff --git a/chalk/plugins/viewplugins/separate_channels/dlg_separate.cpp b/chalk/plugins/viewplugins/separate_channels/dlg_separate.cpp
index d650a045..ac30591e 100644
--- a/chalk/plugins/viewplugins/separate_channels/dlg_separate.cpp
+++ b/chalk/plugins/viewplugins/separate_channels/dlg_separate.cpp
@@ -47,11 +47,11 @@ DlgSeparate::DlgSeparate( const TQString & imageCS,
 
     m_page->lblColormodel->setText(layerCS);
     m_page->grpOutput->hide();
-    connect(m_page->grpSource, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotSetColorSpaceLabel(int)));
-    connect(m_page->chkColors, TQT_SIGNAL(toggled(bool)), m_page->chkDownscale, TQT_SLOT(setDisabled(bool)));
+    connect(m_page->grpSource, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotSetColorSpaceLabel(int)));
+    connect(m_page->chkColors, TQ_SIGNAL(toggled(bool)), m_page->chkDownscale, TQ_SLOT(setDisabled(bool)));
 
-    connect(this, TQT_SIGNAL(okClicked()),
-        this, TQT_SLOT(okClicked()));
+    connect(this, TQ_SIGNAL(okClicked()),
+        this, TQ_SLOT(okClicked()));
 }
 
 DlgSeparate::~DlgSeparate()
diff --git a/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cpp b/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cpp
index db356a16..ecf98d37 100644
--- a/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cpp
+++ b/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cpp
@@ -47,7 +47,7 @@ KisSeparateChannelsPlugin::KisSeparateChannelsPlugin(TQObject *parent, const cha
         setInstance(KGenericFactory<KisSeparateChannelsPlugin>::instance());
         setXMLFile(locate("data","chalkplugins/imageseparate.rc"), true);
         m_view = (KisView*) parent;
-        (void) new TDEAction(i18n("Separate Image..."), 0, 0, this, TQT_SLOT(slotSeparate()), actionCollection(), "separate");
+        (void) new TDEAction(i18n("Separate Image..."), 0, 0, this, TQ_SLOT(slotSeparate()), actionCollection(), "separate");
     }
 }
 
diff --git a/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cpp b/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cpp
index d295493d..4a56a45d 100644
--- a/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cpp
+++ b/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cpp
@@ -52,8 +52,8 @@ DlgShearImage::DlgShearImage( TQWidget *  parent,
     setMainWidget(m_page);
     resize(m_page->sizeHint());
 
-    connect(this, TQT_SIGNAL(okClicked()),
-        this, TQT_SLOT(okClicked()));
+    connect(this, TQ_SIGNAL(okClicked()),
+        this, TQ_SLOT(okClicked()));
 
 }
 
diff --git a/chalk/plugins/viewplugins/shearimage/shearimage.cpp b/chalk/plugins/viewplugins/shearimage/shearimage.cpp
index 2596e62e..dca6a45d 100644
--- a/chalk/plugins/viewplugins/shearimage/shearimage.cpp
+++ b/chalk/plugins/viewplugins/shearimage/shearimage.cpp
@@ -59,8 +59,8 @@ ShearImage::ShearImage(TQObject *parent, const char *name, const TQStringList &)
         setInstance(ShearImageFactory::instance());
         setXMLFile(locate("data","chalkplugins/shearimage.rc"), true);
 
-        (void) new TDEAction(i18n("&Shear Image..."), 0, 0, this, TQT_SLOT(slotShearImage()), actionCollection(), "shearimage");
-        (void) new TDEAction(i18n("&Shear Layer..."), 0, 0, this, TQT_SLOT(slotShearLayer()), actionCollection(), "shearlayer");
+        (void) new TDEAction(i18n("&Shear Image..."), 0, 0, this, TQ_SLOT(slotShearImage()), actionCollection(), "shearimage");
+        (void) new TDEAction(i18n("&Shear Layer..."), 0, 0, this, TQ_SLOT(slotShearLayer()), actionCollection(), "shearlayer");
 
         m_view = (KisView*) parent;
     }
diff --git a/chalk/plugins/viewplugins/substrate/dlg_substrate.cpp b/chalk/plugins/viewplugins/substrate/dlg_substrate.cpp
index 78847f05..e3958c29 100644
--- a/chalk/plugins/viewplugins/substrate/dlg_substrate.cpp
+++ b/chalk/plugins/viewplugins/substrate/dlg_substrate.cpp
@@ -35,8 +35,8 @@ DlgSubstrate::DlgSubstrate( TQWidget *  parent,
     setMainWidget(m_page);
     resize(m_page -> size());
 
-    connect(this, TQT_SIGNAL(okClicked()),
-        this, TQT_SLOT(okClicked()));
+    connect(this, TQ_SIGNAL(okClicked()),
+        this, TQ_SLOT(okClicked()));
 }
 
 DlgSubstrate::~DlgSubstrate()
diff --git a/chalk/plugins/viewplugins/substrate/substrate.cpp b/chalk/plugins/viewplugins/substrate/substrate.cpp
index ce13710b..9b6411d4 100644
--- a/chalk/plugins/viewplugins/substrate/substrate.cpp
+++ b/chalk/plugins/viewplugins/substrate/substrate.cpp
@@ -53,7 +53,7 @@ SubstratePlugin::SubstratePlugin(TQObject *parent, const char *name, const TQStr
         setInstance(SubstrateFactory::instance());
         setXMLFile(locate("data","chalkplugins/substrate.rc"), true);
 
-        (void) new TDEAction(i18n("&Substrate..."), 0, 0, this, TQT_SLOT(slotSubstrateActivated()), actionCollection(), "substrate");
+        (void) new TDEAction(i18n("&Substrate..."), 0, 0, this, TQ_SLOT(slotSubstrateActivated()), actionCollection(), "substrate");
 
          m_view = (KisView*) parent;
     }
diff --git a/chalk/plugins/viewplugins/variations/dlg_variations.cpp b/chalk/plugins/viewplugins/variations/dlg_variations.cpp
index 4decbbd4..c086559b 100644
--- a/chalk/plugins/viewplugins/variations/dlg_variations.cpp
+++ b/chalk/plugins/viewplugins/variations/dlg_variations.cpp
@@ -35,8 +35,8 @@ DlgVariations::DlgVariations( TQWidget *  parent,
     setMainWidget(m_page);
     resize(m_page -> size());
 
-    connect(this, TQT_SIGNAL(okClicked()),
-        this, TQT_SLOT(okClicked()));
+    connect(this, TQ_SIGNAL(okClicked()),
+        this, TQ_SLOT(okClicked()));
 }
 
 DlgVariations::~DlgVariations()
diff --git a/chalk/plugins/viewplugins/variations/variations.cpp b/chalk/plugins/viewplugins/variations/variations.cpp
index 5e2d65ba..4a4e06d6 100644
--- a/chalk/plugins/viewplugins/variations/variations.cpp
+++ b/chalk/plugins/viewplugins/variations/variations.cpp
@@ -57,7 +57,7 @@ Variations::Variations(TQObject *parent, const char *name, const TQStringList &)
         setInstance(VariationsFactory::instance());
         setXMLFile(locate("data","chalkplugins/variations.rc"), true);
 
-        (void) new TDEAction(i18n("&Variations..."), 0, 0, this, TQT_SLOT(slotVariationsActivated()), actionCollection(), "variations");
+        (void) new TDEAction(i18n("&Variations..."), 0, 0, this, TQ_SLOT(slotVariationsActivated()), actionCollection(), "variations");
 
          m_view = (KisView*) parent;
     }