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

diff --git a/kspread/functions.h b/kspread/functions.h
index 5a52ad57..9cf7faf2 100644
--- a/kspread/functions.h
+++ b/kspread/functions.h
@@ -22,10 +22,10 @@
 #ifndef KSPREAD_FUNCTIONS
 #define KSPREAD_FUNCTIONS
 
-#include <qstringlist.h>
-#include <qvaluevector.h>
+#include <tqstringlist.h>
+#include <tqvaluevector.h>
 
-class QDomElement;
+class TQDomElement;
 
 namespace KSpread
 {
@@ -33,14 +33,14 @@ class Sheet;
 class Value;
 class ValueCalc;
 
-typedef QValueVector<Value> valVector;
+typedef TQValueVector<Value> valVector;
 
 struct rangeInfo {
   int col1, col2, row1, row2;
 };
 struct FuncExtra {
   // here we'll add all the extras a function may need
-  QValueVector<rangeInfo> ranges;
+  TQValueVector<rangeInfo> ranges;
   Sheet *sheet;
   int myrow, mycol;
 };
@@ -50,7 +50,7 @@ typedef Value (*FunctionPtr)(valVector, ValueCalc *, FuncExtra *);
 class Function
 {
 public:
-  Function (const QString& name, FunctionPtr ptr);
+  Function (const TQString& name, FunctionPtr ptr);
   ~Function();
   /**
   setParamCount sets allowed parameter count for a function.
@@ -65,10 +65,10 @@ public:
   void setAcceptArray (bool accept = true);
   bool needsExtra ();
   void setNeedsExtra (bool extra);
-  QString name() const;
-  QString localizedName() const;
-  QString helpText() const;
-  void setHelpText( const QString& text );
+  TQString name() const;
+  TQString localizedName() const;
+  TQString helpText() const;
+  void setHelpText( const TQString& text );
   Value exec (valVector args, ValueCalc *calc, FuncExtra *extra = 0);
   
 private:
@@ -83,14 +83,14 @@ class FunctionParameter
 public:
   FunctionParameter();
   FunctionParameter( const FunctionParameter& param );
-  FunctionParameter( const QDomElement& element );
+  FunctionParameter( const TQDomElement& element );
   
-  QString helpText() const { return m_help; }
+  TQString helpText() const { return m_help; }
   ParameterType type() const { return m_type; }
   bool hasRange() const { return m_range; }
     
 private:
-  QString m_help;
+  TQString m_help;
   ParameterType m_type;
   bool m_range;
 };
@@ -99,33 +99,33 @@ class FunctionDescription
 {
 public:
   FunctionDescription();
-  FunctionDescription (const QDomElement& element);
+  FunctionDescription (const TQDomElement& element);
   FunctionDescription (const FunctionDescription& desc);
   
-  const QStringList& examples() { return m_examples; }
-  const QStringList& syntax() { return m_syntax; }
-  const QStringList& related() { return m_related; }
-  const QStringList& helpText() const { return m_help; }
-  QString name() const { return m_name; }
+  const TQStringList& examples() { return m_examples; }
+  const TQStringList& syntax() { return m_syntax; }
+  const TQStringList& related() { return m_related; }
+  const TQStringList& helpText() const { return m_help; }
+  TQString name() const { return m_name; }
   ParameterType type() const { return m_type; }
   
   int params() const { return m_params.count(); }
   FunctionParameter& param( int i ) { return m_params[ i ]; }
   
-  void setGroup( const QString& g ) { m_group = g; }
-  QString group() const { return m_group; }
+  void setGroup( const TQString& g ) { m_group = g; }
+  TQString group() const { return m_group; }
   
-  QString toQML() const;
+  TQString toTQML() const;
     
 private:
-  QString m_group;
-  QStringList m_examples;
-  QStringList m_syntax;
-  QStringList m_related;
-  QStringList m_help;
-  QString m_name;
+  TQString m_group;
+  TQStringList m_examples;
+  TQStringList m_syntax;
+  TQStringList m_related;
+  TQStringList m_help;
+  TQString m_name;
   ParameterType m_type;
-  QValueList<FunctionParameter> m_params;
+  TQValueList<FunctionParameter> m_params;
 };
 
 class FunctionRepository
@@ -138,14 +138,14 @@ public:
     
   void add (Function *function);
   
-  Function *function (const QString& name);
+  Function *function (const TQString& name);
 
-  FunctionDescription *functionInfo (const QString& name);
+  FunctionDescription *functionInfo (const TQString& name);
 
   /** return functions within a group, or all if no group given */
-  QStringList functionNames (const QString& group = QString::null);
+  TQStringList functionNames (const TQString& group = TQString());
     
-  const QStringList &groups () const { return m_groups; }
+  const TQStringList &groups () const { return m_groups; }
     
 private:
 
@@ -155,9 +155,9 @@ private:
   static FunctionRepository* s_self;
 
   /** loads function descriptions from a XML file */
-  void loadFile (const QString& filename);
+  void loadFile (const TQString& filename);
   
-  QStringList m_groups;
+  TQStringList m_groups;
   
   // no copy or assign
   FunctionRepository( const FunctionRepository& );