TQt4 port kdegraphics

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1237557 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 21 insertions, 21 deletions

diff --git a/kolourpaint/kpmainwindow_image.cpp b/kolourpaint/kpmainwindow_image.cpp
index a00f0fd3..7de1b158 100644
--- a/kolourpaint/kpmainwindow_image.cpp
+++ b/kolourpaint/kpmainwindow_image.cpp
@@ -89,38 +89,38 @@ void kpMainWindow::setupImageMenuActions ()
 {
     KActionCollection *ac = actionCollection ();
 
-    m_actionResizeScale = new KAction (i18n ("R&esize / Scale..."), Qt::CTRL + Qt::Key_E,
-        this, TQT_SLOT (slotResizeScale ()), ac, "image_resize_scale");
+    m_actionResizeScale = new KAction (i18n ("R&esize / Scale..."), TQt::CTRL + TQt::Key_E,
+        TQT_TQOBJECT(this), TQT_SLOT (slotResizeScale ()), ac, "image_resize_scale");
 
-    m_actionCrop = new KAction (i18n ("Se&t as Image (Crop)"), Qt::CTRL + Qt::Key_T,
-        this, TQT_SLOT (slotCrop ()), ac, "image_crop");
+    m_actionCrop = new KAction (i18n ("Se&t as Image (Crop)"), TQt::CTRL + TQt::Key_T,
+        TQT_TQOBJECT(this), TQT_SLOT (slotCrop ()), ac, "image_crop");
 
-    m_actionAutoCrop = new KAction (autoCropText (), Qt::CTRL + Qt::Key_U,
-        this, TQT_SLOT (slotAutoCrop ()), ac, "image_auto_crop");
+    m_actionAutoCrop = new KAction (autoCropText (), TQt::CTRL + TQt::Key_U,
+        TQT_TQOBJECT(this), TQT_SLOT (slotAutoCrop ()), ac, "image_auto_crop");
 
-    m_actionFlip = new KAction (i18n ("&Flip..."), Qt::CTRL + Qt::Key_F,
-        this, TQT_SLOT (slotFlip ()), ac, "image_flip");
+    m_actionFlip = new KAction (i18n ("&Flip..."), TQt::CTRL + TQt::Key_F,
+        TQT_TQOBJECT(this), TQT_SLOT (slotFlip ()), ac, "image_flip");
 
-    m_actionRotate = new KAction (i18n ("&Rotate..."), Qt::CTRL + Qt::Key_R,
-        this, TQT_SLOT (slotRotate ()), ac, "image_rotate");
+    m_actionRotate = new KAction (i18n ("&Rotate..."), TQt::CTRL + TQt::Key_R,
+        TQT_TQOBJECT(this), TQT_SLOT (slotRotate ()), ac, "image_rotate");
 
-    m_actionSkew = new KAction (i18n ("S&kew..."), Qt::CTRL + Qt::Key_K,
-        this, TQT_SLOT (slotSkew ()), ac, "image_skew");
+    m_actionSkew = new KAction (i18n ("S&kew..."), TQt::CTRL + TQt::Key_K,
+        TQT_TQOBJECT(this), TQT_SLOT (slotSkew ()), ac, "image_skew");
 
     m_actionConvertToBlackAndWhite = new KAction (i18n ("Reduce to Mo&nochrome (Dithered)"), 0,
-        this, TQT_SLOT (slotConvertToBlackAndWhite ()), ac, "image_convert_to_black_and_white");
+        TQT_TQOBJECT(this), TQT_SLOT (slotConvertToBlackAndWhite ()), ac, "image_convert_to_black_and_white");
 
     m_actionConvertToGrayscale = new KAction (i18n ("Reduce to &Grayscale"), 0,
-        this, TQT_SLOT (slotConvertToGrayscale ()), ac, "image_convert_to_grayscale");
+        TQT_TQOBJECT(this), TQT_SLOT (slotConvertToGrayscale ()), ac, "image_convert_to_grayscale");
 
-    m_actionInvertColors = new KAction (i18n ("&Invert Colors"), Qt::CTRL + Qt::Key_I,
-        this, TQT_SLOT (slotInvertColors ()), ac, "image_invert_colors");
+    m_actionInvertColors = new KAction (i18n ("&Invert Colors"), TQt::CTRL + TQt::Key_I,
+        TQT_TQOBJECT(this), TQT_SLOT (slotInvertColors ()), ac, "image_invert_colors");
 
-    m_actionClear = new KAction (i18n ("C&lear"), Qt::CTRL + Qt::SHIFT + Qt::Key_N,
-        this, TQT_SLOT (slotClear ()), ac, "image_clear");
+    m_actionClear = new KAction (i18n ("C&lear"), TQt::CTRL + TQt::SHIFT + TQt::Key_N,
+        TQT_TQOBJECT(this), TQT_SLOT (slotClear ()), ac, "image_clear");
 
-    m_actionMoreEffects = new KAction (i18n ("&More Effects..."), Qt::CTRL + Qt::Key_M,
-        this, TQT_SLOT (slotMoreEffects ()), ac, "image_more_effects");
+    m_actionMoreEffects = new KAction (i18n ("&More Effects..."), TQt::CTRL + TQt::Key_M,
+        TQT_TQOBJECT(this), TQT_SLOT (slotMoreEffects ()), ac, "image_more_effects");
 
     enableImageMenuDocumentActions (false);
 }
@@ -260,7 +260,7 @@ void kpMainWindow::addImageOrSelectionCommand (kpCommand *cmd,
         kpMacroCommand *macroCmd = new kpMacroCommand (cmd->name (), this);
 
         macroCmd->addCommand (new kpToolSelectionPullFromDocumentCommand (
-            TQString::null/*uninteresting child of macro cmd*/,
+            TQString()/*uninteresting child of macro cmd*/,
             this));
 
         macroCmd->addCommand (cmd);