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

diff --git a/kexi/kexidb/roweditbuffer.cpp b/kexi/kexidb/roweditbuffer.cpp
index 7b5b5711..ba1bb7d5 100644
--- a/kexi/kexidb/roweditbuffer.cpp
+++ b/kexi/kexidb/roweditbuffer.cpp
@@ -30,8 +30,8 @@ RowEditBuffer::RowEditBuffer(bool dbAwareBuffer)
 , m_simpleBufferIt(dbAwareBuffer ? 0 : new SimpleMap::ConstIterator())
 , m_dbBuffer(dbAwareBuffer ? new DBMap() : 0)
 , m_dbBufferIt(dbAwareBuffer ? new DBMap::Iterator() : 0)
-, m_defaultValuesDbBuffer(dbAwareBuffer ? new QMap<QueryColumnInfo*,bool>() : 0)
-, m_defaultValuesDbBufferIt(dbAwareBuffer ? new QMap<QueryColumnInfo*,bool>::ConstIterator() : 0)
+, m_defaultValuesDbBuffer(dbAwareBuffer ? new TQMap<QueryColumnInfo*,bool>() : 0)
+, m_defaultValuesDbBufferIt(dbAwareBuffer ? new TQMap<QueryColumnInfo*,bool>::ConstIterator() : 0)
 {
 }
 
@@ -44,14 +44,14 @@ RowEditBuffer::~RowEditBuffer()
 	delete m_dbBufferIt;
 }
 
-const QVariant* RowEditBuffer::at( QueryColumnInfo& ci, bool useDefaultValueIfPossible ) const
+const TQVariant* RowEditBuffer::at( QueryColumnInfo& ci, bool useDefaultValueIfPossible ) const
 {
 	if (!m_dbBuffer) {
 		KexiDBWarn << "RowEditBuffer::at(QueryColumnInfo&): not db-aware buffer!" << endl;
 		return 0;
 	}
-	*m_dbBufferIt = m_dbBuffer->find( &ci );
-	QVariant* result = 0;
+	*m_dbBufferIt = m_dbBuffer->tqfind( &ci );
+	TQVariant* result = 0;
 	if (*m_dbBufferIt!=m_dbBuffer->end())
 		result = &(*m_dbBufferIt).data();
 	if ( useDefaultValueIfPossible 
@@ -65,28 +65,28 @@ const QVariant* RowEditBuffer::at( QueryColumnInfo& ci, bool useDefaultValueIfPo
 		result = &(*m_dbBuffer)[ &ci ];
 		m_defaultValuesDbBuffer->insert(&ci, true);
 	}
-	return (const QVariant*)result;
+	return (const TQVariant*)result;
 }
 
-const QVariant* RowEditBuffer::at( Field& f ) const
+const TQVariant* RowEditBuffer::at( Field& f ) const
 {
 	if (!m_simpleBuffer) {
 		KexiDBWarn << "RowEditBuffer::at(Field&): this is db-aware buffer!" << endl;
 		return 0;
 	}
-	*m_simpleBufferIt = m_simpleBuffer->find( f.name() );
+	*m_simpleBufferIt = m_simpleBuffer->tqfind( f.name() );
 	if (*m_simpleBufferIt==m_simpleBuffer->constEnd())
 		return 0;
 	return &(*m_simpleBufferIt).data();
 }
 
-const QVariant* RowEditBuffer::at( const QString& fname ) const
+const TQVariant* RowEditBuffer::at( const TQString& fname ) const
 {
 	if (!m_simpleBuffer) {
 		KexiDBWarn << "RowEditBuffer::at(Field&): this is db-aware buffer!" << endl;
 		return 0;
 	}
-	*m_simpleBufferIt = m_simpleBuffer->find( fname );
+	*m_simpleBufferIt = m_simpleBuffer->tqfind( fname );
 	if (*m_simpleBufferIt==m_simpleBuffer->constEnd())
 		return 0;
 	return &(*m_simpleBufferIt).data();
@@ -116,7 +116,7 @@ void RowEditBuffer::debug()
 		KexiDBDbg << "RowEditBuffer type=DB-AWARE, " << m_dbBuffer->count() <<" items"<< endl;
 		for (DBMap::ConstIterator it = m_dbBuffer->constBegin(); it!=m_dbBuffer->constEnd(); ++it) {
 			KexiDBDbg << "* field name=" <<it.key()->field->name()<<" val="
-				<< (it.data().isNull() ? QString("<NULL>") : it.data().toString()) 
+				<< (it.data().isNull() ? TQString("<NULL>") : it.data().toString()) 
 				<< (hasDefaultValueAt(*it.key()) ? " DEFAULT" : "") <<endl;
 		}
 		return;
@@ -124,6 +124,6 @@ void RowEditBuffer::debug()
 	KexiDBDbg << "RowEditBuffer type=SIMPLE, " << m_simpleBuffer->count() <<" items"<< endl;
 	for (SimpleMap::ConstIterator it = m_simpleBuffer->constBegin(); it!=m_simpleBuffer->constEnd(); ++it) {
 		KexiDBDbg << "* field name=" <<it.key()<<" val="
-			<< (it.data().isNull() ? QString("<NULL>") : it.data().toString()) <<endl;
+			<< (it.data().isNull() ? TQString("<NULL>") : it.data().toString()) <<endl;
 	}
 }