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

diff --git a/kspread/commands.h b/kspread/commands.h
index 81bcca9a..d0bd9132 100644
--- a/kspread/commands.h
+++ b/kspread/commands.h
@@ -24,8 +24,8 @@
 #include <KoPageLayout.h>
 #include <KoQueryTrader.h>
 #include <KoUnit.h>
-#include <qrect.h>
-#include <qstring.h>
+#include <tqrect.h>
+#include <tqstring.h>
 
 #include <kcommand.h>
 
@@ -93,7 +93,7 @@ public:
 
   virtual void execute();
   virtual void unexecute();
-  virtual QString name() const;
+  virtual TQString name() const;
 
 protected:
   UndoAction* undoAction;
@@ -111,7 +111,7 @@ public:
 
   virtual void execute();
   virtual void unexecute();
-  virtual QString name() const;
+  virtual TQString name() const;
 
 protected:
   Cell* cell;
@@ -119,7 +119,7 @@ protected:
   int rowSpan;
   int oldColSpan;
   int oldRowSpan;
-  QString rangeName;
+  TQString rangeName;
 };
 
 
@@ -133,7 +133,7 @@ public:
 
   virtual void execute();
   virtual void unexecute();
-  virtual QString name() const;
+  virtual TQString name() const;
 
 protected:
   Cell* cell;
@@ -151,16 +151,16 @@ protected:
 class RenameSheetCommand : public KCommand
 {
 public:
-  RenameSheetCommand( Sheet* sheet, const QString &name );
+  RenameSheetCommand( Sheet* sheet, const TQString &name );
 
   virtual void execute();
   virtual void unexecute();
-  virtual QString name() const;
+  virtual TQString name() const;
 
 protected:
   Sheet* sheet;
-  QString oldName;
-  QString newName;
+  TQString oldName;
+  TQString newName;
 };
 
 class HideSheetCommand : public KCommand
@@ -170,11 +170,11 @@ public:
 
   virtual void execute();
   virtual void unexecute();
-  virtual QString name() const;
+  virtual TQString name() const;
 
 protected:
   Doc* doc;
-  QString sheetName;
+  TQString sheetName;
 };
 
 class ShowSheetCommand : public KCommand
@@ -184,11 +184,11 @@ public:
 
   virtual void execute();
   virtual void unexecute();
-  virtual QString name() const;
+  virtual TQString name() const;
 
 protected:
   Doc* doc;
-  QString sheetName;
+  TQString sheetName;
 };
 
 
@@ -199,7 +199,7 @@ public:
 
   virtual void execute();
   virtual void unexecute();
-  virtual QString name() const;
+  virtual TQString name() const;
 
 protected:
     Sheet* sheet;
@@ -214,7 +214,7 @@ public:
 
   virtual void execute();
   virtual void unexecute();
-  virtual QString name() const;
+  virtual TQString name() const;
 
 protected:
     Sheet* sheet;
@@ -244,7 +244,7 @@ public:
 
   virtual void execute();
   virtual void unexecute();
-  virtual QString name() const;
+  virtual TQString name() const;
 
 protected:
   Sheet* sheet;
@@ -270,11 +270,11 @@ public:
 
   virtual void execute();
   virtual void unexecute();
-  virtual QString name() const;
+  virtual TQString name() const;
 
 protected:
     Doc* doc;
-    QString sheetName;
+    TQString sheetName;
     unsigned int insertPosColumn;
     unsigned int nbColumnInserted;
 
@@ -288,12 +288,12 @@ public:
 
   virtual void execute();
   virtual void unexecute();
-  virtual QString name() const;
+  virtual TQString name() const;
 
 protected:
     Doc* doc;
-    QString sheetName;
-    QRect printRangeRedo, printRange;
+    TQString sheetName;
+    TQRect printRangeRedo, printRange;
 };
 
 
@@ -304,11 +304,11 @@ public:
 
   virtual void execute();
   virtual void unexecute();
-  virtual QString name() const;
+  virtual TQString name() const;
 
 protected:
     Doc* doc;
-    QString sheetName;
+    TQString sheetName;
     KoPageLayout pl;
     KoPageLayout plRedo;
     KoHeadFoot hf;
@@ -321,12 +321,12 @@ protected:
     bool printCommentIndicatorRedo;
     bool printFormulaIndicator;
     bool printFormulaIndicatorRedo;
-    QRect printRange;
-    QRect printRangeRedo;
-    QPair<int, int> printRepeatColumns;
-    QPair<int, int> printRepeatColumnsRedo;
-    QPair<int, int> printRepeatRows;
-    QPair<int, int> printRepeatRowsRedo;
+    TQRect printRange;
+    TQRect printRangeRedo;
+    TQPair<int, int> printRepeatColumns;
+    TQPair<int, int> printRepeatColumnsRedo;
+    TQPair<int, int> printRepeatRows;
+    TQPair<int, int> printRepeatRowsRedo;
     double zoom;
     double zoomRedo;
     int pageLimitX;
@@ -339,19 +339,19 @@ protected:
 class LinkCommand : public KCommand
 {
 public:
-  LinkCommand( Cell* cell, const QString& text, const QString& link );
+  LinkCommand( Cell* cell, const TQString& text, const TQString& link );
 
   virtual void execute();
   virtual void unexecute();
-  virtual QString name() const;
+  virtual TQString name() const;
 
 protected:
   Cell* cell;
   Doc* doc;
-  QString oldText;
-  QString oldLink;
-  QString newText;
-  QString newLink;
+  TQString oldText;
+  TQString oldLink;
+  TQString newText;
+  TQString newLink;
 };
 
 
@@ -363,7 +363,7 @@ class ChangeObjectGeometryCommand : public KCommand
 
     virtual void execute();
     virtual void unexecute();
-    virtual QString name() const;
+    virtual TQString name() const;
 
   protected:
     KoPoint m_diff;
@@ -380,7 +380,7 @@ class RemoveObjectCommand : public KCommand
 
     virtual void execute();
     virtual void unexecute();
-    virtual QString name() const;
+    virtual TQString name() const;
 
   protected:
     EmbeddedObject *obj;
@@ -392,21 +392,21 @@ class RemoveObjectCommand : public KCommand
 class InsertObjectCommand : public KCommand
 {
   public:
-    InsertObjectCommand( const KoRect& _geometry, KoDocumentEntry&, Canvas *_canvas ); //child
-    InsertObjectCommand( const KoRect& _geometry, KoDocumentEntry&, const QRect& _data, Canvas *_canvas ); //chart
-    InsertObjectCommand( const KoRect& _geometry, KURL& _file, Canvas *_canvas ); //picture
+    InsertObjectCommand( const KoRect& _tqgeometry, KoDocumentEntry&, Canvas *_canvas ); //child
+    InsertObjectCommand( const KoRect& _tqgeometry, KoDocumentEntry&, const TQRect& _data, Canvas *_canvas ); //chart
+    InsertObjectCommand( const KoRect& _tqgeometry, KURL& _file, Canvas *_canvas ); //picture
     ~InsertObjectCommand();
 
     virtual void execute();
     virtual void unexecute();
-    virtual QString name() const;
+    virtual TQString name() const;
 
   protected:
-    KoRect geometry;
+    KoRect tqgeometry;
     Canvas *canvas;
     bool executed;
     KoDocumentEntry entry;
-    QRect data;
+    TQRect data;
     ObjType type;
     KURL file;
     EmbeddedObject *obj;
@@ -415,12 +415,12 @@ class InsertObjectCommand : public KCommand
 class RenameNameObjectCommand : public KNamedCommand
 {
 public:
-    RenameNameObjectCommand( const QString &_name, const QString &_objectName, EmbeddedObject *_obj, Doc *_doc );
+    RenameNameObjectCommand( const TQString &_name, const TQString &_objectName, EmbeddedObject *_obj, Doc *_doc );
     ~RenameNameObjectCommand();
     void execute();
     void unexecute();
 protected:
-    QString oldObjectName, newObjectName;
+    TQString oldObjectName, newObjectName;
     EmbeddedObject *object;
     Doc *doc;
     Sheet *m_page;
@@ -431,9 +431,9 @@ class GeometryPropertiesCommand : public KNamedCommand
 {
 public:
     enum KgpType { ProtectSize, KeepRatio};
-    GeometryPropertiesCommand( const QString &name, QPtrList<EmbeddedObject> &objects,
+    GeometryPropertiesCommand( const TQString &name, TQPtrList<EmbeddedObject> &objects,
                                   bool newValue, KgpType type, Doc *_doc );
-    GeometryPropertiesCommand( const QString &name, QValueList<bool> &lst, QPtrList<EmbeddedObject> &objects,
+    GeometryPropertiesCommand( const TQString &name, TQValueList<bool> &lst, TQPtrList<EmbeddedObject> &objects,
                                   bool newValue, KgpType type, Doc *_doc );
     ~GeometryPropertiesCommand();
 
@@ -441,8 +441,8 @@ public:
     virtual void unexecute();
 
 protected:
-    QValueList<bool> m_oldValue;
-    QPtrList<EmbeddedObject> m_objects;
+    TQValueList<bool> m_oldValue;
+    TQPtrList<EmbeddedObject> m_objects;
     bool m_newValue;
     KgpType m_type;
     Doc *m_doc;
@@ -451,7 +451,7 @@ protected:
 class MoveObjectByCmd : public KNamedCommand
 {
 public:
-    MoveObjectByCmd( const QString &_name, const KoPoint &_diff, QPtrList<EmbeddedObject> &_objects,
+    MoveObjectByCmd( const TQString &_name, const KoPoint &_diff, TQPtrList<EmbeddedObject> &_objects,
                Doc *_doc, Sheet *m_page );
     ~MoveObjectByCmd();
 
@@ -461,7 +461,7 @@ public:
 protected:
 
     KoPoint diff;
-    QPtrList<EmbeddedObject> objects;
+    TQPtrList<EmbeddedObject> objects;
     Doc *doc;
     Sheet *m_page;
 };