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

2 files changed, 12 insertions, 11 deletions

diff --git a/krita/plugins/viewplugins/selectopaque/selectopaque.cc b/krita/plugins/viewplugins/selectopaque/selectopaque.cc
index cfbcb4e7..c83250ee 100644
--- a/krita/plugins/viewplugins/selectopaque/selectopaque.cc
+++ b/krita/plugins/viewplugins/selectopaque/selectopaque.cc
@@ -23,8 +23,8 @@
 
 #include <stdlib.h>
 
-#include <qcursor.h>
-#include <qapplication.h>
+#include <tqcursor.h>
+#include <tqapplication.h>
 
 #include <klocale.h>
 #include <kiconloader.h>
@@ -53,15 +53,15 @@
 typedef KGenericFactory<SelectOpaque> SelectOpaqueFactory;
 K_EXPORT_COMPONENT_FACTORY( kritaselectopaque, SelectOpaqueFactory( "krita" ) )
 
-SelectOpaque::SelectOpaque(QObject *parent, const char *name, const QStringList &)
-    : KParts::Plugin(parent, name)
+SelectOpaque::SelectOpaque(TQObject *tqparent, const char *name, const TQStringList &)
+    : KParts::Plugin(tqparent, name)
 {
 
-    if (parent->inherits("KisView")) {
+    if (tqparent->inherits("KisView")) {
         setInstance(SelectOpaqueFactory::instance());
         setXMLFile(locate("data","kritaplugins/selectopaque.rc"), true);
-        m_view = dynamic_cast<KisView*>(parent);
-        m_view->canvasSubject()->selectionManager()->addSelectionAction( new KAction(i18n("&Select All Opaque Pixels..."), 0, 0, this, SLOT(slotActivated()), actionCollection(), "selectopaque") );
+        m_view = dynamic_cast<KisView*>(tqparent);
+        m_view->canvasSubject()->selectionManager()->addSelectionAction( new KAction(i18n("&Select All Opaque Pixels..."), 0, 0, this, TQT_SLOT(slotActivated()), actionCollection(), "selectopaque") );
 
     }
 }
@@ -76,11 +76,11 @@ void SelectOpaque::slotActivated()
 
     KisPaintDeviceSP layer = m_view->canvasSubject()->currentImg()->activeDevice();
     if (!layer) return;
-    QApplication::setOverrideCursor(KisCursor::waitCursor());
+    TQApplication::setOverrideCursor(KisCursor::waitCursor());
 
     if (layer->image()->undo()) transaction = new KisSelectedTransaction(i18n("Select Opaque Pixels"), layer);
     // XXX: Multithread this!
-    Q_INT32 x, y, w, h;
+    TQ_INT32 x, y, w, h;
     layer->exactBounds(x, y, w, h);
 
     KisColorSpace * cs = layer->colorSpace();
@@ -104,7 +104,7 @@ void SelectOpaque::slotActivated()
         hiter.nextRow();
         selIter.nextRow();
     }
-    QApplication::restoreOverrideCursor();
+    TQApplication::restoreOverrideCursor();
     layer->setDirty();
     layer->emitSelectionChanged();
 
diff --git a/krita/plugins/viewplugins/selectopaque/selectopaque.h b/krita/plugins/viewplugins/selectopaque/selectopaque.h
index 5215ecfe..86c66945 100644
--- a/krita/plugins/viewplugins/selectopaque/selectopaque.h
+++ b/krita/plugins/viewplugins/selectopaque/selectopaque.h
@@ -28,8 +28,9 @@ class KisView;
 class SelectOpaque : public KParts::Plugin
 {
         Q_OBJECT
+  TQ_OBJECT
     public:
-        SelectOpaque(QObject *parent, const char *name, const QStringList &);
+        SelectOpaque(TQObject *tqparent, const char *name, const TQStringList &);
         virtual ~SelectOpaque();
     
     private slots: