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

diff --git a/kspread/manipulator.h b/kspread/manipulator.h
index 84cb1451..9af94032 100644
--- a/kspread/manipulator.h
+++ b/kspread/manipulator.h
@@ -21,9 +21,9 @@
 #ifndef KSPREAD_MANIPULATOR
 #define KSPREAD_MANIPULATOR
 
-#include <qrect.h>
-#include <qstring.h>
-#include <qvaluelist.h>
+#include <tqrect.h>
+#include <tqstring.h>
+#include <tqvaluelist.h>
 
 #include <kcommand.h>
 #include <klocale.h>
@@ -42,18 +42,18 @@ class RowFormat;
 class Sheet;
 
 
-// struct layoutCell {
+// struct tqlayoutCell {
 //   int row;
 //   int col;
 //   Format *l;
 // };
 // 
-// struct layoutColumn {
+// struct tqlayoutColumn {
 //   int col;
 //   ColumnFormat *l;
 // };
 // 
-// struct layoutRow {
+// struct tqlayoutRow {
 //   int row;
 //   RowFormat *l;
 // };
@@ -84,13 +84,13 @@ public:
   virtual void execute();
   virtual void unexecute();
 
-  virtual void setArgument(const QString& /*arg*/, const QString& /*val*/) {};
+  virtual void setArgument(const TQString& /*arg*/, const TQString& /*val*/) {};
 
   virtual void setReverse(bool reverse) { m_reverse = reverse; }
   void setRegisterUndo(bool registerUndo) { m_register = registerUndo; }
 
-  virtual void setName (const QString &n) { m_name = n; }
-  virtual QString name() const { return m_name; };
+  virtual void setName (const TQString &n) { m_name = n; }
+  virtual TQString name() const { return m_name; };
 
 protected:
   virtual bool process(Element*);
@@ -102,7 +102,7 @@ protected:
 
 
   Sheet* m_sheet;
-  QString m_name;
+  TQString m_name;
   bool   m_creation : 1;
   bool   m_reverse  : 1;
   bool   m_firstrun : 1;
@@ -127,7 +127,7 @@ public:
 
   // SetSelectionFontWorker
   // SetSelectionSizeWorker
-  void setFontFamily(const QString& font) { m_properties |= Format::PFont; m_font = font; }
+  void setFontFamily(const TQString& font) { m_properties |= Format::PFont; m_font = font; }
   void setFontSize(int size) { m_properties |= Format::PFont; m_size = size; }
   void setFontBold(uint bold) { m_properties |= Format::PFont; m_bold = bold; }
   void setFontItalic(uint italic) { m_properties |= Format::PFont; m_italic = italic; }
@@ -136,24 +136,24 @@ public:
   // SetSelectionAngleWorker
   void setAngle(int angle) { m_properties |= Format::PAngle; m_angle = angle; }
   // SetSelectionTextColorWorker
-  void setTextColor(const QColor& textColor) { m_properties |= Format::PTextPen; m_textColor = textColor; }
+  void setTextColor(const TQColor& textColor) { m_properties |= Format::PTextPen; m_textColor = textColor; }
   // SetSelectionBgColorWorker
-  void setBackgroundColor(const QColor& bgColor) { m_properties |= Format::PBackgroundColor; m_backgroundColor = bgColor; }
+  void setBackgroundColor(const TQColor& bgColor) { m_properties |= Format::PBackgroundColor; m_backgroundColor = bgColor; }
   // SetSelectionBorderAllWorker
-  void setTopBorderPen(const QPen& pen) { m_properties |= Format::PTopBorder; m_topBorderPen = pen; }
-  void setBottomBorderPen(const QPen& pen) { m_properties |= Format::PBottomBorder; m_bottomBorderPen = pen; }
-  void setLeftBorderPen(const QPen& pen) { m_properties |= Format::PLeftBorder; m_leftBorderPen = pen; }
-  void setRightBorderPen(const QPen& pen) { m_properties |= Format::PRightBorder; m_rightBorderPen = pen; }
-  void setHorizontalPen(const QPen& pen) { m_properties |= Format::PTopBorder | Format::PBottomBorder; m_horizontalPen = pen; }
-  void setVerticalPen(const QPen& pen) { m_properties |= Format::PLeftBorder | Format::PRightBorder; m_verticalPen = pen; }
-  void setFallDiagonalPen(const QPen& pen) { m_properties |= Format::PFallDiagonal; m_fallDiagonalPen = pen; }
-  void setGoUpDiagonalPen(const QPen& pen) { m_properties |= Format::PGoUpDiagonal; m_goUpDiagonalPen = pen; }
+  void setTopBorderPen(const TQPen& pen) { m_properties |= Format::PTopBorder; m_topBorderPen = pen; }
+  void setBottomBorderPen(const TQPen& pen) { m_properties |= Format::PBottomBorder; m_bottomBorderPen = pen; }
+  void setLeftBorderPen(const TQPen& pen) { m_properties |= Format::PLeftBorder; m_leftBorderPen = pen; }
+  void setRightBorderPen(const TQPen& pen) { m_properties |= Format::PRightBorder; m_rightBorderPen = pen; }
+  void setHorizontalPen(const TQPen& pen) { m_properties |= Format::PTopBorder | Format::PBottomBorder; m_horizontalPen = pen; }
+  void setVerticalPen(const TQPen& pen) { m_properties |= Format::PLeftBorder | Format::PRightBorder; m_verticalPen = pen; }
+  void setFallDiagonalPen(const TQPen& pen) { m_properties |= Format::PFallDiagonal; m_fallDiagonalPen = pen; }
+  void setGoUpDiagonalPen(const TQPen& pen) { m_properties |= Format::PGoUpDiagonal; m_goUpDiagonalPen = pen; }
   // SetSelectionAlignWorker
   void setHorizontalAlignment(Format::Align align) { m_properties |= Format::PAlign; m_horAlign = align; }
   // SetSelectionAlignWorker
   void setVerticalAlignment(Format::AlignY align) { m_properties |= Format::PAlignY; m_verAlign = align; }
 
-  void setBackgroundBrush(const QBrush& brush) { m_properties |= Format::PBackgroundBrush; m_backgroundBrush = brush; }
+  void setBackgroundBrush(const TQBrush& brush) { m_properties |= Format::PBackgroundBrush; m_backgroundBrush = brush; }
   void setIndent(double indent) { m_properties |= Format::PIndent; m_indent = indent; }
   void setMultiRow(bool multiRow) { m_properties |= Format::PMultiRow; m_multiRow = multiRow; }
   void setVerticalText(bool verticalText) { m_properties |= Format::PVerticalText; m_verticalText = verticalText; }
@@ -161,42 +161,42 @@ public:
   void setNotProtected(bool notProtected) { m_properties |= Format::PNotProtected; m_notProtected = notProtected; }
   void setHideAll(bool hideAll) { m_properties |= Format::PHideAll; m_hideAll = hideAll; }
   void setHideFormula(bool hideFormula) { m_properties |= Format::PHideFormula; m_hideFormula = hideFormula; }
-  void setComment(const QString& comment) { m_properties |= Format::PComment; m_comment = comment; }
-  void setPrefix(const QString& prefix) { m_properties |= Format::PPrefix; m_prefix = prefix; }
-  void setPostfix(const QString& postfix) { m_properties |= Format::PPostfix; m_postfix = postfix; }
+  void setComment(const TQString& comment) { m_properties |= Format::PComment; m_comment = comment; }
+  void setPrefix(const TQString& prefix) { m_properties |= Format::PPrefix; m_prefix = prefix; }
+  void setPostfix(const TQString& postfix) { m_properties |= Format::PPostfix; m_postfix = postfix; }
   void setPrecision(int precision) { m_properties |= Format::PPrecision; m_precision = precision; }
   void setFloatFormat(Format::FloatFormat floatFormat) { m_properties |= Format::PFloatFormat; m_floatFormat = floatFormat; }
   void setFloatColor(Format::FloatColor floatColor) { m_properties |= Format::PFloatColor; m_floatColor = floatColor; }
   void setFormatType(FormatType formatType) { m_properties |= Format::PFormatType; m_formatType = formatType; }
-  void setCurrency(int type, const QString& symbol) { m_currencyType = type; m_currencySymbol = symbol; }
+  void setCurrency(int type, const TQString& symbol) { m_currencyType = type; m_currencySymbol = symbol; }
 
 protected:
-  virtual QString name() const { return i18n("Format Change"); }
+  virtual TQString name() const { return i18n("Format Change"); }
 
   virtual bool preProcessing();
   virtual bool process(Element*);
 
-  void copyFormat(QValueList<layoutCell> &list,
-                  QValueList<layoutColumn> &listCol,
-                  QValueList<layoutRow> &listRow);
+  void copyFormat(TQValueList<tqlayoutCell> &list,
+                  TQValueList<tqlayoutColumn> &listCol,
+                  TQValueList<tqlayoutRow> &listRow);
   bool testCondition(RowFormat*);
   void doWork(Format*, bool isTop, bool isBottom, bool isLeft, bool isRight);
   void prepareCell(Cell*);
 
 private:
-  Q_UINT32 m_properties;
+  TQ_UINT32 m_properties;
 
   // TODO Stefan: find a more elegant way to store the format
-  QValueList<layoutCell> m_lstFormats;
-  QValueList<layoutCell> m_lstRedoFormats;
-  QValueList<layoutColumn> m_lstColFormats;
-  QValueList<layoutColumn> m_lstRedoColFormats;
-  QValueList<layoutRow> m_lstRowFormats;
-  QValueList<layoutRow> m_lstRedoRowFormats;
+  TQValueList<tqlayoutCell> m_lstFormats;
+  TQValueList<tqlayoutCell> m_lstRedoFormats;
+  TQValueList<tqlayoutColumn> m_lstColFormats;
+  TQValueList<tqlayoutColumn> m_lstRedoColFormats;
+  TQValueList<tqlayoutRow> m_lstRowFormats;
+  TQValueList<tqlayoutRow> m_lstRedoRowFormats;
 
   // SetSelectionFontWorker
   // SetSelectionSizeWorker
-  QString m_font;
+  TQString m_font;
   int m_size;
   signed char m_bold;
   signed char m_italic;
@@ -215,24 +215,24 @@ private:
   bool m_hideFormula;
 
   // SetSelectionTextColorWorker
-  QColor m_textColor;
+  TQColor m_textColor;
   // SetSelectionBgColorWorker
-  QColor m_backgroundColor;
+  TQColor m_backgroundColor;
   // SetSelectionBorderAllWorker
-  QPen m_topBorderPen;
-  QPen m_bottomBorderPen;
-  QPen m_leftBorderPen;
-  QPen m_rightBorderPen;
-  QPen m_horizontalPen;
-  QPen m_verticalPen;
-  QPen m_fallDiagonalPen;
-  QPen m_goUpDiagonalPen;
-
-  QBrush m_backgroundBrush;
-  QString m_comment;
-  QString m_prefix;
-  QString m_postfix;
-  QString m_currencySymbol;
+  TQPen m_topBorderPen;
+  TQPen m_bottomBorderPen;
+  TQPen m_leftBorderPen;
+  TQPen m_rightBorderPen;
+  TQPen m_horizontalPen;
+  TQPen m_verticalPen;
+  TQPen m_fallDiagonalPen;
+  TQPen m_goUpDiagonalPen;
+
+  TQBrush m_backgroundBrush;
+  TQString m_comment;
+  TQString m_prefix;
+  TQString m_postfix;
+  TQString m_currencySymbol;
 
   // SetSelectionAlignWorker
   Format::Align m_horAlign;
@@ -260,7 +260,7 @@ public:
 protected:
   virtual bool process(Element*);
 
-  virtual QString name() const { return i18n("Resize Column"); }
+  virtual TQString name() const { return i18n("Resize Column"); }
 
 private:
   double m_newSize;
@@ -284,7 +284,7 @@ public:
 protected:
   virtual bool process(Element*);
 
-  virtual QString name() const { return i18n("Resize Row"); }
+  virtual TQString name() const { return i18n("Resize Row"); }
 
 private:
   double m_newSize;
@@ -303,7 +303,7 @@ public:
   ~BorderManipulator() {}
 
 protected:
-  virtual QString name() const { return i18n("Change Border"); }
+  virtual TQString name() const { return i18n("Change Border"); }
 
 private:
 };
@@ -320,7 +320,7 @@ public:
   ~BackgroundColorManipulator() {}
 
 protected:
-  virtual QString name() const { return i18n("Change Background Color"); }
+  virtual TQString name() const { return i18n("Change Background Color"); }
 
 private:
 };
@@ -337,7 +337,7 @@ public:
   ~FontColorManipulator() {}
 
 protected:
-  virtual QString name() const { return i18n("Change Text Color"); }
+  virtual TQString name() const { return i18n("Change Text Color"); }
 
 private:
 };
@@ -354,7 +354,7 @@ public:
   ~FontManipulator() {}
 
 protected:
-  virtual QString name() const { return i18n("Change Font"); }
+  virtual TQString name() const { return i18n("Change Font"); }
 
 private:
 };
@@ -371,7 +371,7 @@ class AngleManipulator : public FormatManipulator
     ~AngleManipulator() {}
 
   protected:
-    virtual QString name() const { return i18n("Change Angle"); }
+    virtual TQString name() const { return i18n("Change Angle"); }
 
   private:
 };
@@ -388,7 +388,7 @@ class HorAlignManipulator : public FormatManipulator
     ~HorAlignManipulator() {}
 
   protected:
-    virtual QString name() const { return i18n("Change Horizontal Alignment"); }
+    virtual TQString name() const { return i18n("ChangeQt::Horizontal Alignment"); }
 
   private:
 };
@@ -405,7 +405,7 @@ class VerAlignManipulator : public FormatManipulator
     ~VerAlignManipulator() {}
 
   protected:
-    virtual QString name() const { return i18n("Change Vertical Alignment"); }
+    virtual TQString name() const { return i18n("ChangeQt::Vertical Alignment"); }
 
   private:
 };
@@ -433,7 +433,7 @@ protected:
 
   virtual bool postProcessing();
 
-  virtual QString name() const;
+  virtual TQString name() const;
 
   bool m_merge;
 private:
@@ -457,7 +457,7 @@ public:
   virtual void unexecute();
 
 protected:
-  virtual QString name() const { return i18n("Dilate Region"); }
+  virtual TQString name() const { return i18n("Dilate Region"); }
 
 private:
 };
@@ -480,7 +480,7 @@ public:
   void setAdjustRow(bool state) { m_adjustRow = state; }
 
 protected:
-  virtual QString name() const;
+  virtual TQString name() const;
 
   double adjustColumnHelper( Cell * c, int _col, int _row );
   double adjustRowHelper( Cell * c, int _col, int _row );
@@ -488,10 +488,10 @@ protected:
 private:
   bool m_adjustColumn : 1;
   bool m_adjustRow    : 1;
-  QMap<int, double> m_newWidths;
-  QMap<int, double> m_oldWidths;
-  QMap<int, double> m_newHeights;
-  QMap<int, double> m_oldHeights;
+  TQMap<int, double> m_newWidths;
+  TQMap<int, double> m_oldWidths;
+  TQMap<int, double> m_newHeights;
+  TQMap<int, double> m_oldHeights;
 };
 
 
@@ -513,7 +513,7 @@ public:
   void setManipulateRows(bool state) { m_manipulateRows = state; }
 
 protected:
-  virtual QString name() const;
+  virtual TQString name() const;
 
 private:
   bool m_manipulateColumns : 1;
@@ -550,7 +550,7 @@ class ManipulatorManager
   public:
     static ManipulatorManager* self();
     ~ManipulatorManager();
-    Manipulator* create(const QString&);
+    Manipulator* create(const TQString&);
 
   private:
     ManipulatorManager();