Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

38 files changed, 145 insertions, 145 deletions

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