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/roweditbuffer.h b/kexi/kexidb/roweditbuffer.h
index edf48206..438e525e 100644
--- a/kexi/kexidb/roweditbuffer.h
+++ b/kexi/kexidb/roweditbuffer.h
@@ -20,7 +20,7 @@
 #ifndef KEXIDB_ROWEDITBUFFER_H
 #define KEXIDB_ROWEDITBUFFER_H
 
-#include <qmap.h>
+#include <tqmap.h>
 
 #include <kexidb/field.h>
 #include <kexidb/queryschema.h>
@@ -64,17 +64,17 @@ namespace KexiDB {
 	// KexiDB::Connection::updateRow(), KexiDB::Connection::insertRow()
 	</code>
 
-	You can use QMap::clear() to clear buffer contents,
-	QMap::isEmpty() to see if buffer is empty.
-	For more, see QMap documentation.
+	You can use TQMap::clear() to clear buffer contents,
+	TQMap::isEmpty() to see if buffer is empty.
+	For more, see TQMap documentation.
 
 	Notes: added fields should come from the same (common) QuerySchema object.
-	However, this isn't checked at QValue& EditBuffer::operator[]( const Field& f ) level.
+	However, this isn't checked at TQValue& EditBuffer::operator[]( const Field& f ) level.
 */
 class KEXI_DB_EXPORT RowEditBuffer {
 public:
-	typedef QMap<QString,QVariant> SimpleMap;
-	typedef QMap<QueryColumnInfo*,QVariant> DBMap;
+	typedef TQMap<TQString,TQVariant> SimpleMap;
+	typedef TQMap<QueryColumnInfo*,TQVariant> DBMap;
 
 	RowEditBuffer(bool dbAwareBuffer);
 	~RowEditBuffer();
@@ -86,7 +86,7 @@ public:
 	bool isEmpty() const;
 
 	//! Inserts value \a val for db-aware buffer's column \a ci
-	inline void insert( QueryColumnInfo& ci, QVariant &val ) {
+	inline void insert( QueryColumnInfo& ci, TQVariant &val ) {
 		if (m_dbBuffer) {
 			m_dbBuffer->insert(&ci, val);
 			m_defaultValuesDbBuffer->remove(&ci);
@@ -94,7 +94,7 @@ public:
 	}
 
 	//! Inserts value \a val for not-db-aware buffer's column \a fname
-	inline void insert( const QString& fname, QVariant &val ) 
+	inline void insert( const TQString& fname, TQVariant &val ) 
 		{ if (m_simpleBuffer) m_simpleBuffer->insert(fname,val); }
 
 	/*! Useful only for db-aware buffer. \return value for column \a ci
@@ -102,18 +102,18 @@ public:
 	 default value obtained from \a ci if \a useDefaultValueIfPossible is true. 
 	 Note that if the column is declared as unique (especially: primary key), 
 	 default value will not be used. */
-	const QVariant* at( QueryColumnInfo& ci, bool useDefaultValueIfPossible = true ) const;
+	const TQVariant* at( QueryColumnInfo& ci, bool useDefaultValueIfPossible = true ) const;
 	
 	//! Useful only for not-db-aware buffer. \return value for field \a f
-	const QVariant* at( Field& f ) const;
+	const TQVariant* at( Field& f ) const;
 
 	//! Useful only for not-db-aware buffer. \return value for field \a fname
-	const QVariant* at( const QString& fname ) const;
+	const TQVariant* at( const TQString& fname ) const;
 
 	//! Useful only for db-aware buffer: \return true if the value available as
 	//! at( ci ) is obtained from column's default value
 	inline bool hasDefaultValueAt( QueryColumnInfo& ci ) const {
-		return m_defaultValuesDbBuffer->contains(&ci) && (*m_defaultValuesDbBuffer)[ &ci ];
+		return m_defaultValuesDbBuffer->tqcontains(&ci) && (*m_defaultValuesDbBuffer)[ &ci ];
 	}
 
 	inline const SimpleMap simpleBuffer() { return *m_simpleBuffer; }
@@ -127,8 +127,8 @@ protected:
 	SimpleMap::ConstIterator *m_simpleBufferIt;
 	DBMap *m_dbBuffer;
 	DBMap::Iterator *m_dbBufferIt;
-	QMap<QueryColumnInfo*,bool> *m_defaultValuesDbBuffer;
-	QMap<QueryColumnInfo*,bool>::ConstIterator *m_defaultValuesDbBufferIt;
+	TQMap<QueryColumnInfo*,bool> *m_defaultValuesDbBuffer;
+	TQMap<QueryColumnInfo*,bool>::ConstIterator *m_defaultValuesDbBufferIt;
 };
 
 } //namespace KexiDB