TQt4 port koffice

This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming


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

1 files changed, 8 insertions, 8 deletions

diff --git a/krita/ui/kis_import_catcher.cc b/krita/ui/kis_import_catcher.cc
index 656ab969..b2d04cab 100644
--- a/krita/ui/kis_import_catcher.cc
+++ b/krita/ui/kis_import_catcher.cc
@@ -27,7 +27,7 @@
 #include "kis_group_layer.h"
 
 KisImportCatcher::KisImportCatcher(KURL url, KisImageSP image)
-    : QObject()
+    : TQObject()
     , m_doc( new KisDoc() )
     , m_image( image )
     , m_url( url )
@@ -37,7 +37,7 @@ KisImportCatcher::KisImportCatcher(KURL url, KisImageSP image)
         slotLoadingFinished();
     }
     else {
-        connect(m_doc, SIGNAL(loadingFinished()), this, SLOT(slotLoadingFinished()));
+        connect(m_doc, TQT_SIGNAL(loadingFinished()), this, TQT_SLOT(slotLoadingFinished()));
     }
 }
 
@@ -54,23 +54,23 @@ void KisImportCatcher::slotLoadingFinished()
                 // Don't import the root if this is not a layered image (1 group layer
                 // plus 1 other).
                 importedImageLayer = importedImageLayer->firstChild();
-                importedImageLayer->parent()->removeLayer(importedImageLayer);
+                importedImageLayer->tqparent()->removeLayer(importedImageLayer);
             }
 
             importedImageLayer->setName(m_url.prettyURL());
 
-            KisGroupLayerSP parent = 0;
+            KisGroupLayerSP tqparent = 0;
             KisLayerSP currentActiveLayer = m_image->activeLayer();
 
             if (currentActiveLayer) {
-                parent = currentActiveLayer->parent();
+                tqparent = currentActiveLayer->tqparent();
             }
 
-            if (parent == 0) {
-                parent = m_image->rootLayer();
+            if (tqparent == 0) {
+                tqparent = m_image->rootLayer();
             }
 
-            m_image->addLayer(importedImageLayer.data(), parent, currentActiveLayer);
+            m_image->addLayer(importedImageLayer.data(), tqparent, currentActiveLayer);
         }
     }
     m_doc->deleteLater();