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/kexi/kexidb/expression.h b/kexi/kexidb/expression.h
index 6ee98f32..ee2c9810 100644
--- a/kexi/kexidb/expression.h
+++ b/kexi/kexidb/expression.h
@@ -49,7 +49,7 @@ namespace KexiDB {
 //#define KEXIDB_CUSTOM_TOKEN 0x1000
 
 //! \return class name of class \a c
-KEXI_DB_EXPORT QString exprClassName(int c);
+KEXI_DB_EXPORT TQString exprClassName(int c);
 
 class ParseInfo;
 class NArgExpr;
@@ -66,8 +66,8 @@ class QuerySchemaParameterValueListIterator;
 class KEXI_DB_EXPORT BaseExpr
 {
 public:
-	typedef QPtrList<BaseExpr> List;
-	typedef QPtrListIterator<BaseExpr> ListIterator;
+	typedef TQPtrList<BaseExpr> List;
+	typedef TQPtrListIterator<BaseExpr> ListIterator;
 
 	BaseExpr(int token);
 	virtual ~BaseExpr();
@@ -80,7 +80,7 @@ public:
 	
 	virtual Field::Type type();
 	
-	BaseExpr* parent() const { return m_par; }
+	BaseExpr* tqparent() const { return m_par; }
 	
 	virtual void setParent(BaseExpr *p) { m_par = p; }
 	
@@ -89,7 +89,7 @@ public:
 	/*! \return string as a representation of this expression element by running recursive calls. 
 	 \a param, if not 0, points to a list item containing value of a query parameter
 	 (used in QueryParameterExpr). */
-	virtual QString toString(QuerySchemaParameterValueListIterator* params = 0) = 0;
+	virtual TQString toString(QuerySchemaParameterValueListIterator* params = 0) = 0;
 
 	/*! Collects query parameters (messages and types) reculsively and saves them to params.
 	 The leaf nodes are objects of QueryParameterExpr class. */
@@ -97,16 +97,16 @@ public:
 	
 	inline void debug() { KexiDBDbg << debugString() << endl; }
 	
-	virtual QString debugString();
+	virtual TQString debugString();
 	
 	/*! \return single character if the token is < 256 
 	 or token name, e.g. LESS_OR_EQUAL (for debugging). */
-	inline QString tokenToDebugString() { return tokenToDebugString(m_token); }
+	inline TQString tokenToDebugString() { return tokenToDebugString(m_token); }
 
-	static QString tokenToDebugString(int token);
+	static TQString tokenToDebugString(int token);
 
 	/*! \return string for token, like "<=" or ">" */
-	virtual QString tokenToString();
+	virtual TQString tokenToString();
 
 	int exprClass() const { return m_cl; }
 
@@ -121,7 +121,7 @@ public:
 
 protected:
 	int m_cl; //!< class
-	BaseExpr *m_par; //!< parent expression
+	BaseExpr *m_par; //!< tqparent expression
 	int m_token;
 };
 
@@ -138,8 +138,8 @@ public:
 	void prepend(BaseExpr *expr);
 	BaseExpr *arg(int n);
 	int args();
-	virtual QString debugString();
-	virtual QString toString(QuerySchemaParameterValueListIterator* params = 0);
+	virtual TQString debugString();
+	virtual TQString toString(QuerySchemaParameterValueListIterator* params = 0);
 	virtual void getQueryParameters(QuerySchemaParameterList& params);
 	virtual bool validate(ParseInfo& parseInfo);
 	BaseExpr::List list;
@@ -155,8 +155,8 @@ public:
 	//! \return a deep copy of this object.
 	virtual UnaryExpr* copy() const;
 	virtual Field::Type type();
-	virtual QString debugString();
-	virtual QString toString(QuerySchemaParameterValueListIterator* params = 0);
+	virtual TQString debugString();
+	virtual TQString toString(QuerySchemaParameterValueListIterator* params = 0);
 	virtual void getQueryParameters(QuerySchemaParameterList& params);
 	BaseExpr *arg() const { return m_arg; }
 	virtual bool validate(ParseInfo& parseInfo);
@@ -181,13 +181,13 @@ public:
 	//! \return a deep copy of this object.
 	virtual BinaryExpr* copy() const;
 	virtual Field::Type type();
-	virtual QString debugString();
-	virtual QString toString(QuerySchemaParameterValueListIterator* params = 0);
+	virtual TQString debugString();
+	virtual TQString toString(QuerySchemaParameterValueListIterator* params = 0);
 	virtual void getQueryParameters(QuerySchemaParameterList& params);
 	BaseExpr *left() const { return m_larg; }
 	BaseExpr *right() const { return m_rarg; }
 	virtual bool validate(ParseInfo& parseInfo);
-	virtual QString tokenToString();
+	virtual TQString tokenToString();
 
 	BaseExpr *m_larg;
 	BaseExpr *m_rarg;
@@ -199,17 +199,17 @@ public:
 class KEXI_DB_EXPORT ConstExpr : public BaseExpr
 {
 public:
-	ConstExpr(int token, const QVariant& val);
+	ConstExpr(int token, const TQVariant& val);
 	ConstExpr(const ConstExpr& expr);
 	virtual ~ConstExpr();
 	//! \return a deep copy of this object.
 	virtual ConstExpr* copy() const;
 	virtual Field::Type type();
-	virtual QString debugString();
-	virtual QString toString(QuerySchemaParameterValueListIterator* params = 0);
+	virtual TQString debugString();
+	virtual TQString toString(QuerySchemaParameterValueListIterator* params = 0);
 	virtual void getQueryParameters(QuerySchemaParameterList& params);
 	virtual bool validate(ParseInfo& parseInfo);
-	QVariant value;
+	TQVariant value;
 };
 
 //! Query parameter used to getting user input of constant values.
@@ -217,14 +217,14 @@ public:
 class KEXI_DB_EXPORT QueryParameterExpr : public ConstExpr
 {
 public:
-	QueryParameterExpr(const QString& message);
+	QueryParameterExpr(const TQString& message);
 	QueryParameterExpr(const QueryParameterExpr& expr);
 	virtual ~QueryParameterExpr();
 	//! \return a deep copy of this object.
 	virtual QueryParameterExpr* copy() const;
 	virtual Field::Type type();
 	/*! Sets expected type of the parameter. The default is String.
-	 This method is called from parent's expression validate().
+	 This method is called from tqparent's expression validate().
 	 This depends on the type of the related expression.
 	 For instance: query "SELECT * FROM cars WHERE name=[enter name]",
 	 "[enter name]" has parameter of the same type as "name" field.
@@ -232,8 +232,8 @@ public:
 	 of the expression and then the right side will have type set to String.
 	*/
 	void setType(Field::Type type);
-	virtual QString debugString();
-	virtual QString toString(QuerySchemaParameterValueListIterator* params = 0);
+	virtual TQString debugString();
+	virtual TQString toString(QuerySchemaParameterValueListIterator* params = 0);
 	virtual void getQueryParameters(QuerySchemaParameterList& params);
 	virtual bool validate(ParseInfo& parseInfo);
 protected:
@@ -244,14 +244,14 @@ protected:
 class KEXI_DB_EXPORT VariableExpr : public BaseExpr
 {
 public:
-	VariableExpr(const QString& _name);
+	VariableExpr(const TQString& _name);
 	VariableExpr(const VariableExpr& expr);
 	virtual ~VariableExpr();
 	//! \return a deep copy of this object.
 	virtual VariableExpr* copy() const;
 	virtual Field::Type type();
-	virtual QString debugString();
-	virtual QString toString(QuerySchemaParameterValueListIterator* params = 0);
+	virtual TQString debugString();
+	virtual TQString toString(QuerySchemaParameterValueListIterator* params = 0);
 	virtual void getQueryParameters(QuerySchemaParameterList& params);
 
 	/*! Validation. Sets field, tablePositionForField 
@@ -260,7 +260,7 @@ public:
 	virtual bool validate(ParseInfo& parseInfo);
 
 	/*! Verbatim name as returned by scanner. */
-	QString name;
+	TQString name;
 
 	/* NULL by default. After successful validate() it will point to a field,
 	 if the variable is of a form "tablename.fieldname" or "fieldname", 
@@ -288,21 +288,21 @@ public:
 class KEXI_DB_EXPORT FunctionExpr : public BaseExpr
 {
 public:
-	FunctionExpr(const QString& _name, NArgExpr* args_ = 0);
+	FunctionExpr(const TQString& _name, NArgExpr* args_ = 0);
 	FunctionExpr(const FunctionExpr& expr);
 	virtual ~FunctionExpr();
 	//! \return a deep copy of this object.
 	virtual FunctionExpr* copy() const;
 	virtual Field::Type type();
-	virtual QString debugString();
-	virtual QString toString(QuerySchemaParameterValueListIterator* params = 0);
+	virtual TQString debugString();
+	virtual TQString toString(QuerySchemaParameterValueListIterator* params = 0);
 	virtual void getQueryParameters(QuerySchemaParameterList& params);
 	virtual bool validate(ParseInfo& parseInfo);
 
-	static QValueList<QCString> builtInAggregates();
-	static bool isBuiltInAggregate(const QCString& fname);
+	static TQValueList<TQCString> builtInAggregates();
+	static bool isBuiltInAggregate(const TQCString& fname);
 
-	QString name;
+	TQString name;
 	NArgExpr* args;
 };