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

diff --git a/kexi/kexidb/tableschema.h b/kexi/kexidb/tableschema.h
index 7584d703..c2d38237 100644
--- a/kexi/kexidb/tableschema.h
+++ b/kexi/kexidb/tableschema.h
@@ -21,10 +21,10 @@
 #ifndef KEXIDB_TABLE_H
 #define KEXIDB_TABLE_H
 
-#include <qvaluelist.h>
-#include <qptrlist.h>
-#include <qstring.h>
-#include <qguardedptr.h>
+#include <tqvaluelist.h>
+#include <tqptrlist.h>
+#include <tqstring.h>
+#include <tqguardedptr.h>
 
 #include <kexidb/fieldlist.h>
 #include <kexidb/schemadata.h>
@@ -42,10 +42,10 @@ class LookupFieldSchema;
 class KEXI_DB_EXPORT TableSchema : public FieldList, public SchemaData
 {
 	public:
-		typedef QPtrList<TableSchema> List; //!< Type of tables list
-		typedef QPtrListIterator<TableSchema> ListIterator; //!< Iterator for tables list
+		typedef TQPtrList<TableSchema> List; //!< Type of tables list
+		typedef TQPtrListIterator<TableSchema> ListIterator; //!< Iterator for tables list
 
-		TableSchema(const QString & name);
+		TableSchema(const TQString & name);
 		TableSchema(const SchemaData& sdata);
 		TableSchema();
 
@@ -99,10 +99,10 @@ class KEXI_DB_EXPORT TableSchema : public FieldList, public SchemaData
 		/*! \return String for debugging purposes, if \a includeTableName is true,
 		 table name, caption, etc. is prepended, else only debug string for 
 		 the fields are returned. */
-		QString debugString(bool includeTableName);
+		TQString debugString(bool includeTableName);
 
 		/*! \return String for debugging purposes. Equal to debugString(true). */
-		virtual QString debugString();
+		virtual TQString debugString();
 
 		/*! \return connection object if table was created/retrieved using a connection, 
 			otherwise 0. */
@@ -150,7 +150,7 @@ class KEXI_DB_EXPORT TableSchema : public FieldList, public SchemaData
 		 Passing null \a lookupFieldSchema will remove the previously set lookup field.  
 		 \return true if \a lookupFieldSchema has been added, 
 		 or false if there is no such field \a fieldName. */
-		bool setLookupFieldSchema( const QString& fieldName, LookupFieldSchema *lookupFieldSchema );
+		bool setLookupFieldSchema( const TQString& fieldName, LookupFieldSchema *lookupFieldSchema );
 
 		/*! \return lookup field schema for \a field. 
 		 0 is returned if there is no such field in the table or this field has no lookup schema. 
@@ -160,19 +160,19 @@ class KEXI_DB_EXPORT TableSchema : public FieldList, public SchemaData
 		LookupFieldSchema *lookupFieldSchema( const Field& field ) const;
 
 		/*! \overload LookupFieldSchema *TableSchema::lookupFieldSchema( Field& field ) const */
-		LookupFieldSchema *lookupFieldSchema( const QString& fieldName );
+		LookupFieldSchema *lookupFieldSchema( const TQString& fieldName );
 
 		/*! \return list of lookup field schemas for this table. 
 		 The order is the same as the order of fields within the table. */
-		const QPtrVector<LookupFieldSchema>& lookupFieldsList();
+		const TQPtrVector<LookupFieldSchema>& lookupFieldsList();
 
 	protected:
 		/*! Automatically retrieves table schema via connection. */
-		TableSchema(Connection *conn, const QString & name = QString::null);
+		TableSchema(Connection *conn, const TQString & name = TQString());
 
 		IndexSchema::List m_indices;
 
-		QGuardedPtr<Connection> m_conn;
+		TQGuardedPtr<Connection> m_conn;
 		
 		IndexSchema *m_pkey;
 
@@ -200,7 +200,7 @@ class KEXI_DB_EXPORT TableSchema : public FieldList, public SchemaData
 class KEXI_DB_EXPORT InternalTableSchema : public TableSchema
 {
 	public:
-		InternalTableSchema(const QString& name);
+		InternalTableSchema(const TQString& name);
 		InternalTableSchema(const TableSchema& ts);
 		virtual ~InternalTableSchema();
 };