Remove various '#define' strings - part 6

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 3aab8aa05b954b80e336517f93463a9b5f50f3d6)

9 files changed, 115 insertions, 115 deletions

diff --git a/chalk/plugins/viewplugins/rotateimage/rotateimage.cpp b/chalk/plugins/viewplugins/rotateimage/rotateimage.cpp
index f58f7816..ba5c4859 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, TQT_TQOBJECT(this), TQT_SLOT(slotRotateImage()), actionCollection(), "rotateimage");
-        (void) new TDEAction(i18n("Rotate Image CW"), "object-rotate-right", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRotateImage90()), actionCollection(), "rotateImageCW90");
-        (void) new TDEAction(i18n("Rotate Image 1&80"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRotateImage180()), actionCollection(), "rotateImage180");
-        (void) new TDEAction(i18n("Rotate Image CCW"), "object-rotate-left", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRotateImage270()), actionCollection(), "rotateImageCCW90");
+        (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 Layer..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRotateLayer()), actionCollection(), "rotatelayer");
+        (void) new TDEAction(i18n("&Rotate Layer..."), 0, 0, this, TQT_SLOT(slotRotateLayer()), actionCollection(), "rotatelayer");
 
-        (void)new TDEAction(i18n("Rotate 1&80"), 0, TQT_TQOBJECT(m_view), TQT_SLOT(rotateLayer180()), actionCollection(), "rotateLayer180");
-        (void)new TDEAction(i18n("Rotate CCW"), "object-rotate-left", 0, TQT_TQOBJECT(m_view), TQT_SLOT(rotateLayerLeft90()), actionCollection(), "rotateLayerCCW90");
-        (void)new TDEAction(i18n("Rotate CW"), "object-rotate-right", 0, TQT_TQOBJECT(m_view), TQT_SLOT(rotateLayerRight90()), actionCollection(), "rotateLayerCW90");
+        (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");
     }
 }
 
diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
index 24b239b3..dd28d925 100644
--- a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
+++ b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
@@ -101,12 +101,12 @@ KSnapshot::KSnapshot(TQWidget *parent, const char *name)
 
     TDEAccel* accel = new TDEAccel(this);
     TQ_CHECK_PTR(accel);
-    accel->insert(TDEStdAccel::Print, TQT_TQOBJECT(this), TQT_SLOT(slotPrint()));
-    accel->insert(TDEStdAccel::New, TQT_TQOBJECT(this), TQT_SLOT(slotGrab()));
+    accel->insert(TDEStdAccel::Print, this, TQT_SLOT(slotPrint()));
+    accel->insert(TDEStdAccel::New, this, TQT_SLOT(slotGrab()));
 
-    accel->insert( "Print2", TQt::Key_P, TQT_TQOBJECT(this), TQT_SLOT(slotPrint()));
-    accel->insert( "New2", TQt::Key_N, TQT_TQOBJECT(this), TQT_SLOT(slotGrab()));
-    accel->insert( "New3", TQt::Key_Space, TQT_TQOBJECT(this), TQT_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()));
 
     mainWidget->btnNew->setFocus();
     
diff --git a/chalk/plugins/viewplugins/scripting/scripting.cpp b/chalk/plugins/viewplugins/scripting/scripting.cpp
index 207bc0ce..5c317ad2 100644
--- a/chalk/plugins/viewplugins/scripting/scripting.cpp
+++ b/chalk/plugins/viewplugins/scripting/scripting.cpp
@@ -81,7 +81,7 @@ Scripting::Scripting(TQObject *parent, const char *name, const TQStringList &)
         KisScriptMonitor::instance()->monitor( m_scriptguiclient );
 
         Kross::Api::Manager::scriptManager()->addTQObject(m_view->canvasSubject()->document(), "ChalkDocument");
-        Kross::Api::Manager::scriptManager()->addTQObject(TQT_TQOBJECT(m_view), "ChalkView");
+        Kross::Api::Manager::scriptManager()->addTQObject(m_view, "ChalkView");
         m_scriptProgress = new KisScriptProgress(m_view);
         Kross::Api::Manager::scriptManager()->addTQObject(m_scriptProgress, "ChalkScriptProgress");
 
diff --git a/chalk/ui/kis_controlframe.cpp b/chalk/ui/kis_controlframe.cpp
index 85f30454..9c90c68f 100644
--- a/chalk/ui/kis_controlframe.cpp
+++ b/chalk/ui/kis_controlframe.cpp
@@ -105,7 +105,7 @@ KisControlFrame::KisControlFrame( TDEMainWindow * /*window*/, KisView * view, co
     TDEAction * action = new KWidgetAction(m_brushWidget,
                                          i18n("&Brush"),
                                          0,
-                                         TQT_TQOBJECT(view),
+                                         view,
                                          0,
                                          view->actionCollection(),
                                          "brushes");
@@ -116,7 +116,7 @@ KisControlFrame::KisControlFrame( TDEMainWindow * /*window*/, KisView * view, co
     action = new KWidgetAction(m_patternWidget,
                                i18n("&Patterns"),
                                0,
-                               TQT_TQOBJECT(view),
+                               view,
                                0,
                                view->actionCollection(),
                                "patterns");
@@ -126,7 +126,7 @@ KisControlFrame::KisControlFrame( TDEMainWindow * /*window*/, KisView * view, co
     action = new KWidgetAction(m_gradientWidget,
                                i18n("&Gradients"),
                                0,
-                               TQT_TQOBJECT(view),
+                               view,
                                0,
                                view->actionCollection(),
                                "gradients");
@@ -135,7 +135,7 @@ KisControlFrame::KisControlFrame( TDEMainWindow * /*window*/, KisView * view, co
     action = new KWidgetAction(m_paintopBox,
                                i18n("&Painter's Tools"),
                                0,
-                               TQT_TQOBJECT(view),
+                               view,
                                0,
                                view->actionCollection(),
                                "paintops");
@@ -290,10 +290,10 @@ void KisControlFrame::createPatternsChooser(KisView * view)
     m_patternsTab->addTab( customPatterns, i18n("Custom Pattern"));
 
 
-    m_patternMediator = new KisResourceMediator( chooser, TQT_TQOBJECT(view));
+    m_patternMediator = new KisResourceMediator( chooser, view);
     connect( m_patternMediator, TQT_SIGNAL(activatedResource(KisResource*)), view, TQT_SLOT(patternActivated(KisResource*)));
     connect(customPatterns, TQT_SIGNAL(activatedResource(KisResource*)),
-            TQT_TQOBJECT(view), TQT_SLOT(patternActivated(KisResource*)));
+            view, TQT_SLOT(patternActivated(KisResource*)));
 
     KisResourceServerBase* rServer;
     rServer = KisResourceServerRegistry::instance()->get("PatternServer");
@@ -326,7 +326,7 @@ void KisControlFrame::createGradientsChooser(KisView * view)
     m_gradientChooser->setMinimumSize(200, 150);
     m_gradientTab->addTab( m_gradientChooser, i18n("Gradients"));
 
-    m_gradientMediator = new KisResourceMediator( m_gradientChooser, TQT_TQOBJECT(view));
+    m_gradientMediator = new KisResourceMediator( m_gradientChooser, view);
     connect(m_gradientMediator, TQT_SIGNAL(activatedResource(KisResource*)), view, TQT_SLOT(gradientActivated(KisResource*)));
 
     KisResourceServerBase* rServer;
diff --git a/chalk/ui/kis_custom_palette.cpp b/chalk/ui/kis_custom_palette.cpp
index 631b9abe..8fb2a9db 100644
--- a/chalk/ui/kis_custom_palette.cpp
+++ b/chalk/ui/kis_custom_palette.cpp
@@ -91,7 +91,7 @@ void KisCustomPalette::slotAddNew() {
         return;
 
     bool ok;
-    TQRegExpValidator validator(TQRegExp(".*"), TQT_TQOBJECT(this));
+    TQRegExpValidator validator(TQRegExp(".*"), this);
     TQString name = KInputDialog::getText(i18n("Add Color to Palette"),
                                          i18n("Color name (optional):"),
                                          TQString(), &ok,
diff --git a/chalk/ui/kis_layerbox.cpp b/chalk/ui/kis_layerbox.cpp
index 1d769fb4..7e924f5a 100644
--- a/chalk/ui/kis_layerbox.cpp
+++ b/chalk/ui/kis_layerbox.cpp
@@ -123,7 +123,7 @@ KisLayerBox::KisLayerBox(KisCanvasSubject *subject, TQWidget *parent, const char
     m_newLayerMenu->insertItem( SmallIconSet( "document-new" ), i18n( "&New Layer..." ), PAINT_LAYER );
     m_newLayerMenu->insertItem( SmallIconSet( "folder" ), i18n( "New &Group Layer..." ), GROUP_LAYER );
     m_newLayerMenu->insertItem( SmallIconSet( "tool_filter" ), i18n( "New &Adjustment Layer..." ), ADJUSTMENT_LAYER );
-    m_partLayerAction = new KoPartSelectAction( i18n( "New &Object Layer" ), "gear", TQT_TQOBJECT(this) );
+    m_partLayerAction = new KoPartSelectAction( i18n( "New &Object Layer" ), "gear", this );
     m_partLayerAction->plug( m_newLayerMenu );
     connect(m_partLayerAction, TQT_SIGNAL(activated()), this, TQT_SLOT(slotAddMenuActivated()));
     connect(m_newLayerMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotAddMenuActivated(int)));
diff --git a/chalk/ui/kis_layerlist.cpp b/chalk/ui/kis_layerlist.cpp
index 5839634d..38032f0d 100644
--- a/chalk/ui/kis_layerlist.cpp
+++ b/chalk/ui/kis_layerlist.cpp
@@ -38,7 +38,7 @@
 KisLayerList::KisLayerList( TQWidget *parent, const char *name )
     : super( parent, name )
 {
-    m_partLayerAction = new KoPartSelectAction( i18n( "New &Object Layer" ), "gear", TQT_TQOBJECT(this) );
+    m_partLayerAction = new KoPartSelectAction( i18n( "New &Object Layer" ), "gear", this );
 }
 
 static const int ADJUSTMENT_LAYER = 5384; //hack?
diff --git a/chalk/ui/kis_view.cpp b/chalk/ui/kis_view.cpp
index 3a810538..08cbcd05 100644
--- a/chalk/ui/kis_view.cpp
+++ b/chalk/ui/kis_view.cpp
@@ -302,7 +302,7 @@ KisView::KisView(KisDoc *doc, KisUndoAdapter *adapter, TQWidget *parent, const c
     dcopObject();
 
 
-    connect(TQT_TQOBJECT(this), TQT_SIGNAL(autoScroll(const TQPoint &)), TQT_SLOT(slotAutoScroll(const TQPoint &)));
+    connect(this, TQT_SIGNAL(autoScroll(const TQPoint &)), TQT_SLOT(slotAutoScroll(const TQPoint &)));
 
     setMouseTracking(true);
 
@@ -322,7 +322,7 @@ KisView::KisView(KisDoc *doc, KisUndoAdapter *adapter, TQWidget *parent, const c
         KService::Ptr service = *iter;
         int errCode = 0;
         KParts::Plugin* plugin =
-             KParts::ComponentFactory::createInstanceFromService<KParts::Plugin> ( service, TQT_TQOBJECT(this), 0, TQStringList(), &errCode);
+             KParts::ComponentFactory::createInstanceFromService<KParts::Plugin> ( service, this, 0, TQStringList(), &errCode);
         if ( plugin ) {
             kdDebug(41006) << "found plugin " << service->property("Name").toString() << "\n";
             insertChildClient(plugin);
@@ -340,7 +340,7 @@ KisView::KisView(KisDoc *doc, KisUndoAdapter *adapter, TQWidget *parent, const c
     {
         slotLoadingFinished();
     } else {
-        connect(doc, TQT_SIGNAL(loadingFinished()), TQT_TQOBJECT(this), TQT_SLOT(slotLoadingFinished()));
+        connect(doc, TQT_SIGNAL(loadingFinished()), this, TQT_SLOT(slotLoadingFinished()));
     }
 
     setFocus();
@@ -427,19 +427,19 @@ void KisView::createLayerBox()
     m_layerBox->setCaption(i18n("Layers"));
 
     connect(m_layerBox, TQT_SIGNAL(sigRequestLayer(KisGroupLayerSP, KisLayerSP)),
-            TQT_TQOBJECT(this), TQT_SLOT(addLayer(KisGroupLayerSP, KisLayerSP)));
+            this, TQT_SLOT(addLayer(KisGroupLayerSP, KisLayerSP)));
     connect(m_layerBox, TQT_SIGNAL(sigRequestGroupLayer(KisGroupLayerSP, KisLayerSP)),
-            TQT_TQOBJECT(this), TQT_SLOT(addGroupLayer(KisGroupLayerSP, KisLayerSP)));
+            this, TQT_SLOT(addGroupLayer(KisGroupLayerSP, KisLayerSP)));
     connect(m_layerBox, TQT_SIGNAL(sigRequestAdjustmentLayer(KisGroupLayerSP, KisLayerSP)),
-            TQT_TQOBJECT(this), TQT_SLOT(addAdjustmentLayer(KisGroupLayerSP, KisLayerSP)));
+            this, TQT_SLOT(addAdjustmentLayer(KisGroupLayerSP, KisLayerSP)));
     connect(m_layerBox, TQT_SIGNAL(sigRequestPartLayer(KisGroupLayerSP, KisLayerSP, const KoDocumentEntry&)),
-            TQT_TQOBJECT(this), TQT_SLOT(addPartLayer(KisGroupLayerSP, KisLayerSP, const KoDocumentEntry&)));
+            this, TQT_SLOT(addPartLayer(KisGroupLayerSP, KisLayerSP, const KoDocumentEntry&)));
     connect(m_layerBox, TQT_SIGNAL(sigRequestLayerProperties(KisLayerSP)),
-            TQT_TQOBJECT(this), TQT_SLOT(showLayerProperties(KisLayerSP)));
-    connect(m_layerBox, TQT_SIGNAL(sigOpacityChanged(int, bool)), TQT_TQOBJECT(this), TQT_SLOT(layerOpacity(int, bool)));
+            this, TQT_SLOT(showLayerProperties(KisLayerSP)));
+    connect(m_layerBox, TQT_SIGNAL(sigOpacityChanged(int, bool)), this, TQT_SLOT(layerOpacity(int, bool)));
     connect(m_layerBox, TQT_SIGNAL(sigOpacityFinishedChanging(int, int)),
-            TQT_TQOBJECT(this), TQT_SLOT(layerOpacityFinishedChanging(int, int)));
-    connect(m_layerBox, TQT_SIGNAL(sigItemComposite(const KisCompositeOp&)), TQT_TQOBJECT(this), TQT_SLOT(layerCompositeOp(const KisCompositeOp&)));
+            this, TQT_SLOT(layerOpacityFinishedChanging(int, int)));
+    connect(m_layerBox, TQT_SIGNAL(sigItemComposite(const KisCompositeOp&)), this, TQT_SLOT(layerCompositeOp(const KisCompositeOp&)));
 
     paletteManager()->addWidget(m_layerBox, "layerbox", chalk::LAYERBOX, 0);
 
@@ -468,8 +468,8 @@ void KisView::setupScrollBars()
     m_hScroll->setGeometry(20, height() - 16, width() - 36, 16);
     m_hScroll->setValue(0);
     m_vScroll->setValue(0);
-    TQObject::connect(m_vScroll, TQT_SIGNAL(valueChanged(int)), TQT_TQOBJECT(this), TQT_SLOT(scrollV(int)));
-    TQObject::connect(m_hScroll, TQT_SIGNAL(valueChanged(int)), TQT_TQOBJECT(this), TQT_SLOT(scrollH(int)));
+    TQObject::connect(m_vScroll, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(scrollV(int)));
+    TQObject::connect(m_hScroll, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(scrollH(int)));
 }
 
 void KisView::setupRulers()
@@ -601,85 +601,85 @@ void KisView::setupActions()
 
 
     m_fullScreen = KStdAction::fullScreen( NULL, NULL, actionCollection(), this );
-    connect( m_fullScreen, TQT_SIGNAL( toggled( bool )), TQT_TQOBJECT(this), TQT_SLOT( slotUpdateFullScreen( bool )));
+    connect( m_fullScreen, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT( slotUpdateFullScreen( bool )));
 
-    m_imgProperties = new TDEAction(i18n("Image Properties"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotImageProperties()), actionCollection(), "img_properties");
+    m_imgProperties = new TDEAction(i18n("Image Properties"), 0, this, TQT_SLOT(slotImageProperties()), actionCollection(), "img_properties");
     m_imgScan = 0; // How the hell do I get a TDEAction to the scan plug-in?!?
-    m_imgResizeToLayer = new TDEAction(i18n("Resize Image to Size of Current Layer"), 0, TQT_TQOBJECT(this), TQT_SLOT(imgResizeToActiveLayer()), actionCollection(), "resizeimgtolayer");
+    m_imgResizeToLayer = new TDEAction(i18n("Resize Image to Size of Current Layer"), 0, this, TQT_SLOT(imgResizeToActiveLayer()), actionCollection(), "resizeimgtolayer");
 
     // view actions
-    m_zoomIn = KStdAction::zoomIn(TQT_TQOBJECT(this), TQT_SLOT(slotZoomIn()), actionCollection(), "zoom_in");
-    m_zoomOut = KStdAction::zoomOut(TQT_TQOBJECT(this), TQT_SLOT(slotZoomOut()), actionCollection(), "zoom_out");
-    m_actualPixels = new TDEAction(i18n("Actual Pixels"), "Ctrl+0", TQT_TQOBJECT(this), TQT_SLOT(slotActualPixels()), actionCollection(), "actual_pixels");
-    m_actualSize = KStdAction::actualSize(TQT_TQOBJECT(this), TQT_SLOT(slotActualSize()), actionCollection(), "actual_size");
+    m_zoomIn = KStdAction::zoomIn(this, TQT_SLOT(slotZoomIn()), actionCollection(), "zoom_in");
+    m_zoomOut = KStdAction::zoomOut(this, TQT_SLOT(slotZoomOut()), actionCollection(), "zoom_out");
+    m_actualPixels = new TDEAction(i18n("Actual Pixels"), "Ctrl+0", this, TQT_SLOT(slotActualPixels()), actionCollection(), "actual_pixels");
+    m_actualSize = KStdAction::actualSize(this, TQT_SLOT(slotActualSize()), actionCollection(), "actual_size");
     m_actualSize->setEnabled(false);
-    m_fitToCanvas = KStdAction::fitToPage(TQT_TQOBJECT(this), TQT_SLOT(slotFitToCanvas()), actionCollection(), "fit_to_canvas");
+    m_fitToCanvas = KStdAction::fitToPage(this, TQT_SLOT(slotFitToCanvas()), actionCollection(), "fit_to_canvas");
 
     // layer actions
-    m_layerAdd = new TDEAction(i18n("&Add..."), "Ctrl+Shift+N", TQT_TQOBJECT(this), TQT_SLOT(layerAdd()), actionCollection(), "insert_layer");
+    m_layerAdd = new TDEAction(i18n("&Add..."), "Ctrl+Shift+N", this, TQT_SLOT(layerAdd()), actionCollection(), "insert_layer");
 
     m_actionPartLayer = new KoPartSelectAction( i18n( "&Object Layer" ), "frame_query",
-                                                    TQT_TQOBJECT(this), TQT_SLOT( addPartLayer() ),
+                                                    this, TQT_SLOT( addPartLayer() ),
                                                     actionCollection(), "insert_part_layer" );
 
 
     m_actionAdjustmentLayer = new TDEAction( i18n( "&Adjustment Layer" ), 0,
-            TQT_TQOBJECT(this), TQT_SLOT( addAdjustmentLayer() ),
+            this, TQT_SLOT( addAdjustmentLayer() ),
             actionCollection(), "insert_adjustment_layer" );
 
 
-    m_layerRm = new TDEAction(i18n("&Remove"), 0, TQT_TQOBJECT(this), TQT_SLOT(layerRemove()), actionCollection(), "remove_layer");
-    m_layerDup = new TDEAction(i18n("Duplicate"), 0, TQT_TQOBJECT(this), TQT_SLOT(layerDuplicate()), actionCollection(), "duplicate_layer");
-    m_layerHide = new TDEToggleAction(i18n("&Hide"), 0, TQT_TQOBJECT(this), TQT_SLOT(layerToggleVisible()), actionCollection(), "hide_layer");
+    m_layerRm = new TDEAction(i18n("&Remove"), 0, this, TQT_SLOT(layerRemove()), actionCollection(), "remove_layer");
+    m_layerDup = new TDEAction(i18n("Duplicate"), 0, this, TQT_SLOT(layerDuplicate()), actionCollection(), "duplicate_layer");
+    m_layerHide = new TDEToggleAction(i18n("&Hide"), 0, this, TQT_SLOT(layerToggleVisible()), actionCollection(), "hide_layer");
     m_layerHide->setCheckedState(KGuiItem(i18n("&Show")));
     m_layerHide->setChecked(false);
 
-    m_layerRaise = new TDEAction(i18n("Raise"), "raise", "Ctrl+]", TQT_TQOBJECT(this), TQT_SLOT(layerRaise()), actionCollection(), "raiselayer");
-    m_layerLower = new TDEAction(i18n("Lower"), "lower", "Ctrl+[", TQT_TQOBJECT(this), TQT_SLOT(layerLower()), actionCollection(), "lowerlayer");
-    m_layerTop = new TDEAction(i18n("To Top"), "bring_forward", "Ctrl+Shift+]", TQT_TQOBJECT(this), TQT_SLOT(layerFront()), actionCollection(), "toplayer");
-    m_layerBottom = new TDEAction(i18n("To Bottom"), "send_backward", "Ctrl+Shift+[", TQT_TQOBJECT(this), TQT_SLOT(layerBack()), actionCollection(), "bottomlayer");
-    m_layerProperties = new TDEAction(i18n("Properties"), 0, TQT_TQOBJECT(this), TQT_SLOT(layerProperties()), actionCollection(), "layer_properties");
-    (void)new TDEAction(i18n("I&nsert Image as Layer..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInsertImageAsLayer()), actionCollection(), "insert_image_as_layer");
-    m_layerSaveAs = new TDEAction(i18n("Save Layer as Image..."), "document-save", TQT_TQOBJECT(this), TQT_SLOT(saveLayerAsImage()), actionCollection(), "save_layer_as_image");
-    (void)new TDEAction(i18n("Flip on &X Axis"), "view_left_right", 0, TQT_TQOBJECT(this), TQT_SLOT(mirrorLayerX()), actionCollection(), "mirrorLayerX");
-    (void)new TDEAction(i18n("Flip on &Y Axis"), "view_top_bottom", 0, TQT_TQOBJECT(this), TQT_SLOT(mirrorLayerY()), actionCollection(), "mirrorLayerY");
-
-    m_createMask = new TDEAction(i18n("Create Mask"), 0, TQT_TQOBJECT(this),
+    m_layerRaise = new TDEAction(i18n("Raise"), "raise", "Ctrl+]", this, TQT_SLOT(layerRaise()), actionCollection(), "raiselayer");
+    m_layerLower = new TDEAction(i18n("Lower"), "lower", "Ctrl+[", this, TQT_SLOT(layerLower()), actionCollection(), "lowerlayer");
+    m_layerTop = new TDEAction(i18n("To Top"), "bring_forward", "Ctrl+Shift+]", this, TQT_SLOT(layerFront()), actionCollection(), "toplayer");
+    m_layerBottom = new TDEAction(i18n("To Bottom"), "send_backward", "Ctrl+Shift+[", this, TQT_SLOT(layerBack()), actionCollection(), "bottomlayer");
+    m_layerProperties = new TDEAction(i18n("Properties"), 0, this, TQT_SLOT(layerProperties()), actionCollection(), "layer_properties");
+    (void)new TDEAction(i18n("I&nsert Image as Layer..."), 0, this, TQT_SLOT(slotInsertImageAsLayer()), actionCollection(), "insert_image_as_layer");
+    m_layerSaveAs = new TDEAction(i18n("Save Layer as Image..."), "document-save", this, TQT_SLOT(saveLayerAsImage()), actionCollection(), "save_layer_as_image");
+    (void)new TDEAction(i18n("Flip on &X Axis"), "view_left_right", 0, this, TQT_SLOT(mirrorLayerX()), actionCollection(), "mirrorLayerX");
+    (void)new TDEAction(i18n("Flip on &Y Axis"), "view_top_bottom", 0, this, TQT_SLOT(mirrorLayerY()), actionCollection(), "mirrorLayerY");
+
+    m_createMask = new TDEAction(i18n("Create Mask"), 0, this,
                                TQT_SLOT(slotCreateMask()), actionCollection(), "create_mask");
-    m_maskFromSelection = new TDEAction(i18n("Mask From Selection"), 0, TQT_TQOBJECT(this),
+    m_maskFromSelection = new TDEAction(i18n("Mask From Selection"), 0, this,
                                       TQT_SLOT(slotMaskFromSelection()), actionCollection(),
                                       "mask_fromsel");
-    m_maskToSelection = new TDEAction(i18n("Mask to Selection"), 0, TQT_TQOBJECT(this),
+    m_maskToSelection = new TDEAction(i18n("Mask to Selection"), 0, this,
                                TQT_SLOT(slotMaskToSelection()), actionCollection(), "mask_tosel");
-    m_applyMask = new TDEAction(i18n("Apply Mask"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotApplyMask()),
+    m_applyMask = new TDEAction(i18n("Apply Mask"), 0, this, TQT_SLOT(slotApplyMask()),
                               actionCollection(), "apply_mask");
-    m_removeMask = new TDEAction(i18n("Remove Mask"), 0, TQT_TQOBJECT(this),
+    m_removeMask = new TDEAction(i18n("Remove Mask"), 0, this,
                                TQT_SLOT(slotRemoveMask()), actionCollection(), "remove_mask");
-    m_showMask = new TDEToggleAction(i18n( "Show Mask" ), 0, TQT_TQOBJECT(this),
+    m_showMask = new TDEToggleAction(i18n( "Show Mask" ), 0, this,
                                    TQT_SLOT(slotShowMask()), actionCollection(), "show_mask");
-    m_editMask = new TDEToggleAction(i18n( "Edit Mask" ), 0, TQT_TQOBJECT(this),
+    m_editMask = new TDEToggleAction(i18n( "Edit Mask" ), 0, this,
                                    TQT_SLOT(slotEditMask()), actionCollection(), "edit_mask");
 
     // image actions
-    m_imgFlatten = new TDEAction(i18n("&Flatten Image"), "Ctrl+Shift+E", TQT_TQOBJECT(this), TQT_SLOT(flattenImage()), actionCollection(), "flatten_image");
-    m_imgMergeLayer = new TDEAction(i18n("&Merge with Layer Below"), "Ctrl+E", TQT_TQOBJECT(this), TQT_SLOT(mergeLayer()), actionCollection(), "merge_layer");
+    m_imgFlatten = new TDEAction(i18n("&Flatten Image"), "Ctrl+Shift+E", this, TQT_SLOT(flattenImage()), actionCollection(), "flatten_image");
+    m_imgMergeLayer = new TDEAction(i18n("&Merge with Layer Below"), "Ctrl+E", this, TQT_SLOT(mergeLayer()), actionCollection(), "merge_layer");
 
     // setting actions
-    KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(preferences()), actionCollection(), "preferences");
+    KStdAction::preferences(this, TQT_SLOT(preferences()), actionCollection(), "preferences");
 
-    m_RulerAction = new TDEToggleAction( i18n( "Show Rulers" ), "Ctrl+R", TQT_TQOBJECT(this), TQT_SLOT( showRuler() ), actionCollection(), "view_ruler" );
+    m_RulerAction = new TDEToggleAction( i18n( "Show Rulers" ), "Ctrl+R", this, TQT_SLOT( showRuler() ), actionCollection(), "view_ruler" );
     m_RulerAction->setChecked(cfg.showRulers());
     m_RulerAction->setCheckedState(i18n("Hide Rulers"));
     m_RulerAction->setWhatsThis( i18n("The rulers show the horizontal and vertical positions of the mouse on the image "
                                       "and can be used to position your mouse at the right place on the canvas. <p>Uncheck this to disable "
                                       "the rulers from being displayed." ) );
 
-    //m_guideAction = new TDEToggleAction( i18n( "Guide Lines" ), 0, TQT_TQOBJECT(this), TQT_SLOT( viewGuideLines() ), actionCollection(), "view_guidelines" );
+    //m_guideAction = new TDEToggleAction( i18n( "Guide Lines" ), 0, this, TQT_SLOT( viewGuideLines() ), actionCollection(), "view_guidelines" );
 
     // Add new palette
-    new TDEAction(i18n("Add New Palette..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddPalette()),
+    new TDEAction(i18n("Add New Palette..."), 0, this, TQT_SLOT(slotAddPalette()),
                 actionCollection(), "add_palette");
-    new TDEAction(i18n("Edit Palette..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditPalette()),
+    new TDEAction(i18n("Edit Palette..."), 0, this, TQT_SLOT(slotEditPalette()),
                 actionCollection(), "edit_palette");
 
     // XXX: This triggers a repaint of the image, but way too early
@@ -2803,11 +2803,11 @@ void KisView::addPartLayer(KisGroupLayerSP parent, KisLayerSP above, const KoDoc
             m_partHandler, TQT_SLOT(gotKeyPressEvent(TQKeyEvent*)));
 
     connect(m_partHandler, TQT_SIGNAL(sigGotMoveEvent(KisMoveEvent*)),
-            TQT_TQOBJECT(this), TQT_SLOT(canvasGotMoveEvent(KisMoveEvent*)));
+            this, TQT_SLOT(canvasGotMoveEvent(KisMoveEvent*)));
     connect(m_partHandler, TQT_SIGNAL(sigGotKeyPressEvent(TQKeyEvent*)),
-            TQT_TQOBJECT(this), TQT_SLOT(canvasGotKeyPressEvent(TQKeyEvent*)));
+            this, TQT_SLOT(canvasGotKeyPressEvent(TQKeyEvent*)));
     connect(m_partHandler, TQT_SIGNAL(handlerDone()),
-            TQT_TQOBJECT(this), TQT_SLOT(reconnectAfterPartInsert()));
+            this, TQT_SLOT(reconnectAfterPartInsert()));
 }
 
 void KisView::insertPart(const TQRect& viewRect, const KoDocumentEntry& entry,
@@ -2836,13 +2836,13 @@ void KisView::insertPart(const TQRect& viewRect, const KoDocumentEntry& entry,
 
 void KisView::reconnectAfterPartInsert() {
     connect(m_canvas, TQT_SIGNAL(sigGotButtonPressEvent(KisButtonPressEvent*)),
-            TQT_TQOBJECT(this), TQT_SLOT(canvasGotButtonPressEvent(KisButtonPressEvent*)));
+            this, TQT_SLOT(canvasGotButtonPressEvent(KisButtonPressEvent*)));
     connect(m_canvas, TQT_SIGNAL(sigGotButtonReleaseEvent(KisButtonReleaseEvent*)),
-            TQT_TQOBJECT(this), TQT_SLOT(canvasGotButtonReleaseEvent(KisButtonReleaseEvent*)));
+            this, TQT_SLOT(canvasGotButtonReleaseEvent(KisButtonReleaseEvent*)));
     connect(m_canvas, TQT_SIGNAL(sigGotMoveEvent(KisMoveEvent*)),
-            TQT_TQOBJECT(this), TQT_SLOT(canvasGotMoveEvent(KisMoveEvent*)));
+            this, TQT_SLOT(canvasGotMoveEvent(KisMoveEvent*)));
     connect(m_canvas, TQT_SIGNAL(sigGotKeyPressEvent(TQKeyEvent*)),
-            TQT_TQOBJECT(this), TQT_SLOT(canvasGotKeyPressEvent(TQKeyEvent*)));
+            this, TQT_SLOT(canvasGotKeyPressEvent(TQKeyEvent*)));
 
     delete m_partHandler;
     m_partHandler = 0;
@@ -3162,26 +3162,26 @@ void KisView::setupCanvas()
 {
     m_canvas = new KisCanvas(this, "kis_canvas");
     m_canvas->setFocusPolicy( TQWidget::StrongFocus );
-    TQObject::connect(m_canvas, TQT_SIGNAL(sigGotButtonPressEvent(KisButtonPressEvent*)), TQT_TQOBJECT(this), TQT_SLOT(canvasGotButtonPressEvent(KisButtonPressEvent*)));
-    TQObject::connect(m_canvas, TQT_SIGNAL(sigGotButtonReleaseEvent(KisButtonReleaseEvent*)), TQT_TQOBJECT(this), TQT_SLOT(canvasGotButtonReleaseEvent(KisButtonReleaseEvent*)));
-    TQObject::connect(m_canvas, TQT_SIGNAL(sigGotDoubleClickEvent(KisDoubleClickEvent*)), TQT_TQOBJECT(this), TQT_SLOT(canvasGotDoubleClickEvent(KisDoubleClickEvent*)));
-    TQObject::connect(m_canvas, TQT_SIGNAL(sigGotMoveEvent(KisMoveEvent*)), TQT_TQOBJECT(this), TQT_SLOT(canvasGotMoveEvent(KisMoveEvent*)));
-    TQObject::connect(m_canvas, TQT_SIGNAL(sigGotPaintEvent(TQPaintEvent*)), TQT_TQOBJECT(this), TQT_SLOT(canvasGotPaintEvent(TQPaintEvent*)));
-    TQObject::connect(m_canvas, TQT_SIGNAL(sigGotEnterEvent(TQEvent*)), TQT_TQOBJECT(this), TQT_SLOT(canvasGotEnterEvent(TQEvent*)));
-    TQObject::connect(m_canvas, TQT_SIGNAL(sigGotLeaveEvent(TQEvent*)), TQT_TQOBJECT(this), TQT_SLOT(canvasGotLeaveEvent(TQEvent*)));
-    TQObject::connect(m_canvas, TQT_SIGNAL(sigGotMouseWheelEvent(TQWheelEvent*)), TQT_TQOBJECT(this), TQT_SLOT(canvasGotMouseWheelEvent(TQWheelEvent*)));
-    TQObject::connect(m_canvas, TQT_SIGNAL(sigGotKeyPressEvent(TQKeyEvent*)), TQT_TQOBJECT(this), TQT_SLOT(canvasGotKeyPressEvent(TQKeyEvent*)));
-    TQObject::connect(m_canvas, TQT_SIGNAL(sigGotKeyReleaseEvent(TQKeyEvent*)), TQT_TQOBJECT(this), TQT_SLOT(canvasGotKeyReleaseEvent(TQKeyEvent*)));
-    TQObject::connect(m_canvas, TQT_SIGNAL(sigGotDragEnterEvent(TQDragEnterEvent*)), TQT_TQOBJECT(this), TQT_SLOT(canvasGotDragEnterEvent(TQDragEnterEvent*)));
-    TQObject::connect(m_canvas, TQT_SIGNAL(sigGotDropEvent(TQDropEvent*)), TQT_TQOBJECT(this), TQT_SLOT(canvasGotDropEvent(TQDropEvent*)));
+    TQObject::connect(m_canvas, TQT_SIGNAL(sigGotButtonPressEvent(KisButtonPressEvent*)), this, TQT_SLOT(canvasGotButtonPressEvent(KisButtonPressEvent*)));
+    TQObject::connect(m_canvas, TQT_SIGNAL(sigGotButtonReleaseEvent(KisButtonReleaseEvent*)), this, TQT_SLOT(canvasGotButtonReleaseEvent(KisButtonReleaseEvent*)));
+    TQObject::connect(m_canvas, TQT_SIGNAL(sigGotDoubleClickEvent(KisDoubleClickEvent*)), this, TQT_SLOT(canvasGotDoubleClickEvent(KisDoubleClickEvent*)));
+    TQObject::connect(m_canvas, TQT_SIGNAL(sigGotMoveEvent(KisMoveEvent*)), this, TQT_SLOT(canvasGotMoveEvent(KisMoveEvent*)));
+    TQObject::connect(m_canvas, TQT_SIGNAL(sigGotPaintEvent(TQPaintEvent*)), this, TQT_SLOT(canvasGotPaintEvent(TQPaintEvent*)));
+    TQObject::connect(m_canvas, TQT_SIGNAL(sigGotEnterEvent(TQEvent*)), this, TQT_SLOT(canvasGotEnterEvent(TQEvent*)));
+    TQObject::connect(m_canvas, TQT_SIGNAL(sigGotLeaveEvent(TQEvent*)), this, TQT_SLOT(canvasGotLeaveEvent(TQEvent*)));
+    TQObject::connect(m_canvas, TQT_SIGNAL(sigGotMouseWheelEvent(TQWheelEvent*)), this, TQT_SLOT(canvasGotMouseWheelEvent(TQWheelEvent*)));
+    TQObject::connect(m_canvas, TQT_SIGNAL(sigGotKeyPressEvent(TQKeyEvent*)), this, TQT_SLOT(canvasGotKeyPressEvent(TQKeyEvent*)));
+    TQObject::connect(m_canvas, TQT_SIGNAL(sigGotKeyReleaseEvent(TQKeyEvent*)), this, TQT_SLOT(canvasGotKeyReleaseEvent(TQKeyEvent*)));
+    TQObject::connect(m_canvas, TQT_SIGNAL(sigGotDragEnterEvent(TQDragEnterEvent*)), this, TQT_SLOT(canvasGotDragEnterEvent(TQDragEnterEvent*)));
+    TQObject::connect(m_canvas, TQT_SIGNAL(sigGotDropEvent(TQDropEvent*)), this, TQT_SLOT(canvasGotDropEvent(TQDropEvent*)));
 }
 
 void KisView::connectCurrentImg()
 {
     if (m_image) {
         connect(m_image, TQT_SIGNAL(sigActiveSelectionChanged(KisImageSP)), m_selectionManager, TQT_SLOT(imgSelectionChanged(KisImageSP)));
-        connect(m_image, TQT_SIGNAL(sigActiveSelectionChanged(KisImageSP)), TQT_TQOBJECT(this), TQT_SLOT(updateCanvas()));
-        connect(m_image, TQT_SIGNAL(sigColorSpaceChanged(KisColorSpace *)), TQT_TQOBJECT(this), TQT_SLOT(updateStatusBarProfileLabel()));
+        connect(m_image, TQT_SIGNAL(sigActiveSelectionChanged(KisImageSP)), this, TQT_SLOT(updateCanvas()));
+        connect(m_image, TQT_SIGNAL(sigColorSpaceChanged(KisColorSpace *)), this, TQT_SLOT(updateStatusBarProfileLabel()));
         connect(m_image, TQT_SIGNAL(sigProfileChanged(KisProfile * )), TQT_SLOT(profileChanged(KisProfile * )));
 
         connect(m_image, TQT_SIGNAL(sigLayersChanged(KisGroupLayerSP)), TQT_SLOT(layersUpdated()));
@@ -3239,7 +3239,7 @@ void KisView::handlePartLayerAdded(KisLayerSP layer)
     if (!l)
         return;
 
-    connect(TQT_TQOBJECT(this), TQT_SIGNAL(childActivated(KoDocumentChild*)),
+    connect(this, TQT_SIGNAL(childActivated(KoDocumentChild*)),
             layer, TQT_SLOT(childActivated(KoDocumentChild*)));
 }
 
@@ -3811,26 +3811,26 @@ void KisView::createDockers()
     m_hsvwidget = new KoHSVWidget(this, "hsv");
     m_hsvwidget->setCaption(i18n("HSV"));
 
-    connect(m_hsvwidget, TQT_SIGNAL(sigFgColorChanged(const TQColor &)), TQT_TQOBJECT(this), TQT_SLOT(slotSetFGQColor(const TQColor &)));
-    connect(m_hsvwidget, TQT_SIGNAL(sigBgColorChanged(const TQColor &)), TQT_TQOBJECT(this), TQT_SLOT(slotSetBGQColor(const TQColor &)));
-    connect(TQT_TQOBJECT(this), TQT_SIGNAL(sigFGQColorChanged(const TQColor &)), m_hsvwidget, TQT_SLOT(setFgColor(const TQColor &)));
-    connect(TQT_TQOBJECT(this), TQT_SIGNAL(sigBGQColorChanged(const TQColor &)), m_hsvwidget, TQT_SLOT(setBgColor(const TQColor &)));
+    connect(m_hsvwidget, TQT_SIGNAL(sigFgColorChanged(const TQColor &)), this, TQT_SLOT(slotSetFGQColor(const TQColor &)));
+    connect(m_hsvwidget, TQT_SIGNAL(sigBgColorChanged(const TQColor &)), this, TQT_SLOT(slotSetBGQColor(const TQColor &)));
+    connect(this, TQT_SIGNAL(sigFGQColorChanged(const TQColor &)), m_hsvwidget, TQT_SLOT(setFgColor(const TQColor &)));
+    connect(this, TQT_SIGNAL(sigBGQColorChanged(const TQColor &)), m_hsvwidget, TQT_SLOT(setBgColor(const TQColor &)));
     m_paletteManager->addWidget( m_hsvwidget, "hsvwidget", chalk::COLORBOX, 0, PALETTE_DOCKER, true);
 
     m_rgbwidget = new KoRGBWidget(this, "rgb");
     m_rgbwidget->setCaption(i18n("RGB"));
-    connect(m_rgbwidget, TQT_SIGNAL(sigFgColorChanged(const TQColor &)), TQT_TQOBJECT(this), TQT_SLOT(slotSetFGQColor(const TQColor &)));
-    connect(m_rgbwidget, TQT_SIGNAL(sigBgColorChanged(const TQColor &)), TQT_TQOBJECT(this), TQT_SLOT(slotSetBGQColor(const TQColor &)));
-    connect(TQT_TQOBJECT(this), TQT_SIGNAL(sigFGQColorChanged(const TQColor &)), m_rgbwidget, TQT_SLOT(setFgColor(const TQColor &)));
-    connect(TQT_TQOBJECT(this), TQT_SIGNAL(sigBGQColorChanged(const TQColor &)), m_rgbwidget, TQT_SLOT(setBgColor(const TQColor &)));
+    connect(m_rgbwidget, TQT_SIGNAL(sigFgColorChanged(const TQColor &)), this, TQT_SLOT(slotSetFGQColor(const TQColor &)));
+    connect(m_rgbwidget, TQT_SIGNAL(sigBgColorChanged(const TQColor &)), this, TQT_SLOT(slotSetBGQColor(const TQColor &)));
+    connect(this, TQT_SIGNAL(sigFGQColorChanged(const TQColor &)), m_rgbwidget, TQT_SLOT(setFgColor(const TQColor &)));
+    connect(this, TQT_SIGNAL(sigBGQColorChanged(const TQColor &)), m_rgbwidget, TQT_SLOT(setBgColor(const TQColor &)));
     m_paletteManager->addWidget( m_rgbwidget, "rgbwidget", chalk::COLORBOX);
 
     m_graywidget = new KoGrayWidget(this, "gray");
     m_graywidget->setCaption(i18n("Gray"));
-    connect(m_graywidget, TQT_SIGNAL(sigFgColorChanged(const TQColor &)), TQT_TQOBJECT(this), TQT_SLOT(slotSetFGQColor(const TQColor &)));
-    connect(m_graywidget, TQT_SIGNAL(sigBgColorChanged(const TQColor &)), TQT_TQOBJECT(this), TQT_SLOT(slotSetBGQColor(const TQColor &)));
-    connect(TQT_TQOBJECT(this), TQT_SIGNAL(sigFGQColorChanged(const TQColor &)), m_graywidget, TQT_SLOT(setFgColor(const TQColor &)));
-    connect(TQT_TQOBJECT(this), TQT_SIGNAL(sigBGQColorChanged(const TQColor &)), m_graywidget, TQT_SLOT(setBgColor(const TQColor &)));
+    connect(m_graywidget, TQT_SIGNAL(sigFgColorChanged(const TQColor &)), this, TQT_SLOT(slotSetFGQColor(const TQColor &)));
+    connect(m_graywidget, TQT_SIGNAL(sigBgColorChanged(const TQColor &)), this, TQT_SLOT(slotSetBGQColor(const TQColor &)));
+    connect(this, TQT_SIGNAL(sigFGQColorChanged(const TQColor &)), m_graywidget, TQT_SLOT(setFgColor(const TQColor &)));
+    connect(this, TQT_SIGNAL(sigBGQColorChanged(const TQColor &)), m_graywidget, TQT_SLOT(setBgColor(const TQColor &)));
     m_paletteManager->addWidget( m_graywidget, "graywidget", chalk::COLORBOX);
 
     //make sure the color chooser get right default values
@@ -3840,7 +3840,7 @@ void KisView::createDockers()
     m_palettewidget = new KisPaletteWidget(this);
     m_palettewidget->setCaption(i18n("Palettes"));
     connect(m_palettewidget, TQT_SIGNAL(colorSelected(const TQColor &)),
-            TQT_TQOBJECT(this), TQT_SLOT(slotSetFGQColor(const TQColor &)));
+            this, TQT_SLOT(slotSetFGQColor(const TQColor &)));
     // No BGColor or reverse slotFGChanged->palette connections, since that's not useful here
 
     KisResourceServerBase* rServer;
@@ -3850,7 +3850,7 @@ void KisView::createDockers()
     for ( it = resources.begin(); it != resources.end(); ++it ) {
         m_palettewidget->slotAddPalette( *it );
     }
-    connect(m_palettewidget, TQT_SIGNAL(colorSelected(const KisColor &)), TQT_TQOBJECT(this), TQT_SLOT(slotSetFGColor(const KisColor &)));
+    connect(m_palettewidget, TQT_SIGNAL(colorSelected(const KisColor &)), this, TQT_SLOT(slotSetFGColor(const KisColor &)));
     m_paletteManager->addWidget( m_palettewidget, "palettewidget", chalk::COLORBOX, 10, PALETTE_DOCKER, true);
 }
 
@@ -3880,7 +3880,7 @@ TQPoint KisView::reverseViewTransformations(const TQPoint& p) const {
 
 void KisView::canvasAddChild(KoViewChild *child) {
     super::canvasAddChild(child);
-    connect(TQT_TQOBJECT(this), TQT_SIGNAL(viewTransformationsChanged()), child, TQT_SLOT(reposition()));
+    connect(this, TQT_SIGNAL(viewTransformationsChanged()), child, TQT_SLOT(reposition()));
     m_vScroll->raise();
     m_hScroll->raise();
     m_vScroll->raise();
@@ -3894,7 +3894,7 @@ void KisView::slotLoadingFinished()
     setCurrentImage(document()->currentImage());
     m_paletteManager->showWidget( "layerbox" );
     m_canvas->show();
-    disconnect(document(), TQT_SIGNAL(loadingFinished()), TQT_TQOBJECT(this), TQT_SLOT(slotLoadingFinished()));
+    disconnect(document(), TQT_SIGNAL(loadingFinished()), this, TQT_SLOT(slotLoadingFinished()));
 
     m_imageLoaded = true;
     startInitialZoomTimerIfReady();
diff --git a/chalk/ui/kobirdeyepanel.cpp b/chalk/ui/kobirdeyepanel.cpp
index b096725e..683caeba 100644
--- a/chalk/ui/kobirdeyepanel.cpp
+++ b/chalk/ui/kobirdeyepanel.cpp
@@ -71,8 +71,8 @@ KoBirdEyePanel::KoBirdEyePanel( KoZoomAdapter * zoomListener,
     m_page->view->installEventFilter(this);
     m_page->view->setBackgroundMode(TQt::NoBackground);
 
-    m_zoomIn = new TDEAction( i18n("Zoom In"), "birdeye_zoom_plus", 0, TQT_TQOBJECT(this), TQT_SLOT(zoomPlus()), TQT_TQOBJECT(this), "zoomIn" );
-    m_zoomOut = new TDEAction( i18n("Zoom Out"), "birdeye_zoom_minus", 0, TQT_TQOBJECT(this), TQT_SLOT(zoomMinus()), TQT_TQOBJECT(this), "zoomOut" );
+    m_zoomIn = new TDEAction( i18n("Zoom In"), "birdeye_zoom_plus", 0, this, TQT_SLOT(zoomPlus()), this, "zoomIn" );
+    m_zoomOut = new TDEAction( i18n("Zoom Out"), "birdeye_zoom_minus", 0, this, TQT_SLOT(zoomMinus()), this, "zoomOut" );
 
     l->addWidget(m_page);