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, 38 insertions, 38 deletions

diff --git a/lib/kofficecore/KoTemplates.h b/lib/kofficecore/KoTemplates.h
index 4c9e3133..7547fd60 100644
--- a/lib/kofficecore/KoTemplates.h
+++ b/lib/kofficecore/KoTemplates.h
@@ -21,9 +21,9 @@
 #ifndef koTemplates_h
 #define koTemplates_h
 
-#include <qptrlist.h>
-#include <qstringlist.h>
-#include <qpixmap.h>
+#include <tqptrlist.h>
+#include <tqstringlist.h>
+#include <tqpixmap.h>
 #include <koffice_export.h>
 
 class KInstance;
@@ -32,57 +32,57 @@ class KInstance;
 class KOFFICECORE_EXPORT KoTemplate {
 
 public:
-    KoTemplate(const QString &name,
-               const QString &description=QString::null,
-               const QString &file=QString::null,
-               const QString &picture=QString::null,
-               const QString &fileName=QString::null,
-               const QString &_measureSystem=QString::null,
+    KoTemplate(const TQString &name,
+               const TQString &description=TQString(),
+               const TQString &file=TQString(),
+               const TQString &picture=TQString(),
+               const TQString &fileName=TQString(),
+               const TQString &_measureSystem=TQString(),
                bool hidden=false, bool touched=false);
     ~KoTemplate() {}
 
-    QString name() const { return m_name; }
-    QString description() const { return m_descr; };
-    QString file() const { return m_file; }
-    QString picture() const { return m_picture; }
-    QString fileName() const { return m_fileName; }
-    const QPixmap &loadPicture( KInstance* instance );
+    TQString name() const { return m_name; }
+    TQString description() const { return m_descr; };
+    TQString file() const { return m_file; }
+    TQString picture() const { return m_picture; }
+    TQString fileName() const { return m_fileName; }
+    const TQPixmap &loadPicture( KInstance* instance );
 
     bool isHidden() const { return m_hidden; }
     void setHidden(bool hidden=true) { m_hidden=hidden; m_touched=true; }
 
     bool touched() const { return m_touched; }
 
-    QString measureSystem() const { return m_measureSystem; }
-    void setMeasureSystem(const QString& system) { m_measureSystem = system; }
+    TQString measureSystem() const { return m_measureSystem; }
+    void setMeasureSystem(const TQString& system) { m_measureSystem = system; }
 
 private:
-    QString m_name, m_descr, m_file, m_picture, m_fileName;
+    TQString m_name, m_descr, m_file, m_picture, m_fileName;
     bool m_hidden;
     mutable bool m_touched;
     bool m_cached;
-    QPixmap m_pixmap;
-    QString m_measureSystem;
+    TQPixmap m_pixmap;
+    TQString m_measureSystem;
 };
 
 
 class KOFFICECORE_EXPORT KoTemplateGroup {
 
 public:
-    KoTemplateGroup(const QString &name,
-                    const QString &dir=QString::null,
+    KoTemplateGroup(const TQString &name,
+                    const TQString &dir=TQString(),
                     int _sortingWeight=0,
                     bool touched=false);
     ~KoTemplateGroup() {}
 
-    QString name() const { return m_name; }
-    QStringList dirs() const { return m_dirs; }
-    void addDir(const QString &dir) { m_dirs.append(dir); m_touched=true; }
+    TQString name() const { return m_name; }
+    TQStringList dirs() const { return m_dirs; }
+    void addDir(const TQString &dir) { m_dirs.append(dir); m_touched=true; }
     int sortingWeight() const { return m_sortingWeight; }
     void setSortingWeight(int weight) { m_sortingWeight = weight; }
-    /// If all children are hidden, we are hidden too
+    /// If all tqchildren are hidden, we are hidden too
     bool isHidden() const;
-    /// if we should hide, we hide all the children
+    /// if we should hide, we hide all the tqchildren
     void setHidden(bool hidden=true) const;
 
     KoTemplate *first() { return m_templates.first(); }
@@ -92,14 +92,14 @@ public:
     KoTemplate *current() { return m_templates.current(); }
 
     bool add(KoTemplate *t, bool force=false, bool touch=true);
-    KoTemplate *find(const QString &name) const;
+    KoTemplate *tqfind(const TQString &name) const;
 
     bool touched() const { return m_touched; }
 
 private:
-    QString m_name;
-    QStringList m_dirs;
-    QPtrList<KoTemplate> m_templates;
+    TQString m_name;
+    TQStringList m_dirs;
+    TQPtrList<KoTemplate> m_templates;
     mutable bool m_touched;
     int m_sortingWeight;
 };
@@ -108,11 +108,11 @@ private:
 class KoTemplateTree {
 
 public:
-    KoTemplateTree(const QCString &templateType, KInstance *instance,
+    KoTemplateTree(const TQCString &templateType, KInstance *instance,
 		   bool readTree=false);
     ~KoTemplateTree() {}
 
-    QCString templateType() const { return m_templateType; }
+    TQCString templateType() const { return m_templateType; }
     KInstance *instance() const { return m_instance; }
     void readTemplateTree();
     void writeTemplateTree();
@@ -124,7 +124,7 @@ public:
     KoTemplateGroup *current() { return m_groups.current(); }
 
     void add(KoTemplateGroup *g);
-    KoTemplateGroup *find(const QString &name) const;
+    KoTemplateGroup *tqfind(const TQString &name) const;
 
     KoTemplateGroup *defaultGroup() const { return m_defaultGroup; }
     KoTemplate *defaultTemplate() const { return m_defaultTemplate; }
@@ -133,18 +133,18 @@ private:
     void readGroups();
     void readTemplates();
     void writeTemplate(KoTemplate *t, KoTemplateGroup *group,
-		       const QString &localDir);
+		       const TQString &localDir);
 
-    QCString m_templateType;
+    TQCString m_templateType;
     KInstance *m_instance;
-    QPtrList<KoTemplateGroup> m_groups;
+    TQPtrList<KoTemplateGroup> m_groups;
     KoTemplateGroup *m_defaultGroup;
     KoTemplate *m_defaultTemplate;
 };
 
 
 namespace KoTemplates {
-QString stripWhiteSpace(const QString &string);
+TQString stripWhiteSpace(const TQString &string);
 }
 
 #endif