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, 18 insertions, 17 deletions

diff --git a/krita/ui/kis_part_layer.h b/krita/ui/kis_part_layer.h
index efe57c28..8980daea 100644
--- a/krita/ui/kis_part_layer.h
+++ b/krita/ui/kis_part_layer.h
@@ -18,7 +18,7 @@
 #ifndef _KIS_PART_LAYER_
 #define _KIS_PART_LAYER_
 
-#include <qrect.h>
+#include <tqrect.h>
 
 #include <KoDocument.h>
 #include <KoDocumentChild.h>
@@ -41,12 +41,12 @@ class KisChildDoc : public KoDocumentChild
 {
 
 public:
-    KisChildDoc ( KisDoc * kisDoc, const QRect& rect, KoDocument * childDoc );
+    KisChildDoc ( KisDoc * kisDoc, const TQRect& rect, KoDocument * childDoc );
     KisChildDoc ( KisDoc * kisDdoc );
 
     virtual ~KisChildDoc();
 
-    KisDoc * parent() const { return m_doc; }
+    KisDoc * tqparent() const { return m_doc; }
 
     void setPartLayer (KisPartLayerSP layer) { m_partLayer = layer; }
 
@@ -73,6 +73,7 @@ protected:
  */
 class KisPartLayerImpl : public KisPartLayer {
     Q_OBJECT
+  TQ_OBJECT
     typedef KisPartLayer super;
 public:
     KisPartLayerImpl(KisImageSP img, KisChildDoc * doc);
@@ -89,30 +90,30 @@ public:
     /// Returns the childDoc so that we can access the doc from other places, if need be (KisDoc)
     virtual KisChildDoc* childDoc() const { return m_doc; }
 
-    void setDocType(const QString& type) { m_docType = type; }
-    QString docType() const { return m_docType; }
+    void setDocType(const TQString& type) { m_docType = type; }
+    TQString docType() const { return m_docType; }
 
-    virtual void setX(Q_INT32 x);
-    virtual void setY(Q_INT32 y);
-    virtual Q_INT32 x() const { return m_doc->geometry() . x(); }
-    virtual Q_INT32 y() const { return m_doc->geometry() . y(); } //m_paintLayer->y(); }
-    virtual QRect extent() const { return m_doc->geometry(); }
-    virtual QRect exactBounds() const { return m_doc->geometry(); }
+    virtual void setX(TQ_INT32 x);
+    virtual void setY(TQ_INT32 y);
+    virtual TQ_INT32 x() const { return m_doc->tqgeometry() . x(); }
+    virtual TQ_INT32 y() const { return m_doc->tqgeometry() . y(); } //m_paintLayer->y(); }
+    virtual TQRect extent() const { return m_doc->tqgeometry(); }
+    virtual TQRect exactBounds() const { return m_doc->tqgeometry(); }
 
-    virtual QImage createThumbnail(Q_INT32 w, Q_INT32 h);
+    virtual TQImage createThumbnail(TQ_INT32 w, TQ_INT32 h);
 
     virtual bool accept(KisLayerVisitor& visitor) {
         return visitor.visit(this);
     }
 
-    virtual KisPaintDeviceSP prepareProjection(KisPaintDeviceSP projection, const QRect& r);
+    virtual KisPaintDeviceSP prepareProjection(KisPaintDeviceSP projection, const TQRect& r);
 
-    virtual void paintSelection(QImage &img, Q_INT32 x, Q_INT32 y, Q_INT32 w, Q_INT32 h);
+    virtual void paintSelection(TQImage &img, TQ_INT32 x, TQ_INT32 y, TQ_INT32 w, TQ_INT32 h);
 
-    virtual bool saveToXML(QDomDocument doc, QDomElement elem);
+    virtual bool saveToXML(TQDomDocument doc, TQDomElement elem);
 private slots:
     /// Repaints our device with the data from the embedded part
-    //void repaint();
+    //void tqrepaint();
     /// When we activate the embedding, we clear ourselves
     void childActivated(KoDocumentChild* child);
     void childDeactivated(bool activated);
@@ -123,7 +124,7 @@ private:
     KisPaintDeviceSP m_cache;
     KoFrame * m_frame; // The widget that holds the editable view of the embedded part
     KisChildDoc * m_doc; // The sub-document
-    QString m_docType;
+    TQString m_docType;
     bool m_activated;
 };