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, 15 insertions, 14 deletions

diff --git a/krita/core/kis_resource.h b/krita/core/kis_resource.h
index d798d3cd2..6510be2c3 100644
--- a/krita/core/kis_resource.h
+++ b/krita/core/kis_resource.h
@@ -18,9 +18,9 @@
 #ifndef KIS_RESOURCE_H_
 #define KIS_RESOURCE_H_
 
-#include <qimage.h>
-#include <qobject.h>
-#include <qstring.h>
+#include <tqimage.h>
+#include <tqobject.h>
+#include <tqstring.h>
 
 
 /**
@@ -29,9 +29,10 @@
  *
  * This replaces the KisKrayon facility that used to be present in Krayon.
  */
-class KisResource : public QObject {
-    typedef QObject super;
+class KisResource : public TQObject {
+    typedef TQObject super;
     Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -41,7 +42,7 @@ public:
      *
      * @param filename the file name to save and load from.
      */
-    KisResource(const QString& filename);
+    KisResource(const TQString& filename);
     virtual ~KisResource();
 
 public:
@@ -57,15 +58,15 @@ public:
     virtual bool save() = 0;
 
     /**
-     * Returns a QImage representing this resource.  This image could be null.
+     * Returns a TQImage representing this resource.  This image could be null.
      */
-    virtual QImage img() = 0;
+    virtual TQImage img() = 0;
 
 public:
-    QString filename() const;
-    void setFilename(const QString& filename);
-    QString name() const;
-    void setName(const QString& name);
+    TQString filename() const;
+    void setFilename(const TQString& filename);
+    TQString name() const;
+    void setName(const TQString& name);
     bool valid() const;
     void setValid(bool valid);
 
@@ -74,8 +75,8 @@ private:
     KisResource& operator=(const KisResource&);
 
 private:
-    QString m_name;
-    QString m_filename;
+    TQString m_name;
+    TQString m_filename;
     bool m_valid;
 };