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

diff --git a/kspread/kspread_condition.h b/kspread/kspread_condition.h
index a95c9260..87e235d3 100644
--- a/kspread/kspread_condition.h
+++ b/kspread/kspread_condition.h
@@ -22,16 +22,16 @@
 #ifndef __kspread_condition_h__
 #define __kspread_condition_h__
 
-#include <qdom.h>
-#include <qvaluelist.h>
+#include <tqdom.h>
+#include <tqvaluelist.h>
 
 #include <koffice_export.h>
 
 #include "kspread_global.h"
 
-class QColor;
-class QFont;
-class QString;
+class TQColor;
+class TQFont;
+class TQString;
 class KoGenStyle;
 
 namespace KSpread
@@ -51,11 +51,11 @@ public:
 
   double         val1;
   double         val2;
-  QString *      strVal1;
-  QString *      strVal2;
-  QColor  *      colorcond;
-  QFont   *      fontcond;
-  QString *      styleName;
+  TQString *      strVal1;
+  TQString *      strVal2;
+  TQColor  *      colorcond;
+  TQFont   *      fontcond;
+  TQString *      styleName;
   Style *        style;
   Type           cond;
 
@@ -97,26 +97,26 @@ class Conditions
   /**
    * Retrieve the current list of conditions we're checking
    */
-  QValueList<Conditional> conditionList() const;
+  TQValueList<Conditional> conditionList() const;
 
   /**
    * Replace the current list of conditions with this new one
    */
-  void setConditionList( const QValueList<Conditional> & list );
+  void setConditionList( const TQValueList<Conditional> & list );
 
   /**
    * Saves the conditions to a DOM tree structure.
    * @return the DOM element for the conditions.
    */
-  QDomElement saveConditions( QDomDocument & doc ) const;
+  TQDomElement saveConditions( TQDomDocument & doc ) const;
 
   /**
    * Takes a parsed DOM element and recreates the conditions structure out of
    * it
    */
-  void loadConditions( const QDomElement & element );
+  void loadConditions( const TQDomElement & element );
 
-  void loadOasisConditions( const QDomElement & element );
+  void loadOasisConditions( const TQDomElement & element );
 
     void saveOasisConditions( KoGenStyle &currentCellStyle );
 
@@ -134,14 +134,14 @@ class Conditions
  private:
   Conditions() {}
 
-    QString saveOasisConditionValue(Conditional &cond);
-    void loadOasisConditionValue( const QString &styleCondition, Conditional &newCondition );
-    void loadOasisValidationValue( const QStringList &listVal, Conditional &newCondition );
-    void loadOasisCondition( QString &valExpression, Conditional &newCondition );
+    TQString saveOasisConditionValue(Conditional &cond);
+    void loadOasisConditionValue( const TQString &styleCondition, Conditional &newCondition );
+    void loadOasisValidationValue( const TQStringList &listVal, Conditional &newCondition );
+    void loadOasisCondition( TQString &valExpression, Conditional &newCondition );
 
 
   const Cell * m_cell;
-  QValueList<Conditional> m_condList;
+  TQValueList<Conditional> m_condList;
   Style * m_matchedStyle;
 };