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

diff --git a/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp b/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp
index 0004cf92..afcad047 100644
--- a/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp
+++ b/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp
@@ -34,17 +34,17 @@ using namespace KexiDB;
 
 unsigned int pqxxSqlCursor_trans_num=0; //!< debug helper
 
-static QByteArray pgsqlByteaToByteArray(const pqxx::result::field& r)
+static TQByteArray pgsqlByteaToByteArray(const pqxx::result::field& r)
 {
 	return KexiDB::pgsqlByteaToByteArray(r.c_str(), r.size());
 }
 
 //==================================================================================
 //Constructor based on query statement
-pqxxSqlCursor::pqxxSqlCursor(KexiDB::Connection* conn, const QString& statement, uint options):
+pqxxSqlCursor::pqxxSqlCursor(KexiDB::Connection* conn, const TQString& statement, uint options):
 	Cursor(conn,statement, options)
 {
-//	KexiDBDrvDbg << "PQXXSQLCURSOR: constructor for query statement" << endl;
+//	KexiDBDrvDbg << "PTQXXSQLCURSOR: constructor for query statement" << endl;
 	my_conn = static_cast<pqxxSqlConnection*>(conn)->d->pqxxsql;
 	m_options = Buffered;
 	m_res = 0;
@@ -57,7 +57,7 @@ pqxxSqlCursor::pqxxSqlCursor(KexiDB::Connection* conn, const QString& statement,
 pqxxSqlCursor::pqxxSqlCursor(Connection* conn, QuerySchema& query, uint options )
 	: Cursor( conn, query, options )
 {
-//	KexiDBDrvDbg << "PQXXSQLCURSOR: constructor for query schema" << endl;
+//	KexiDBDrvDbg << "PTQXXSQLCURSOR: constructor for query schema" << endl;
 	my_conn = static_cast<pqxxSqlConnection*>(conn)->d->pqxxsql;
 	m_options = Buffered;
 	m_res = 0;
@@ -86,7 +86,7 @@ bool pqxxSqlCursor::drv_open()
 		return false;
 	}
 		
-	QCString cur_name;
+	TQCString cur_name;
 	//Set up a transaction
 	try
 	{
@@ -117,8 +117,8 @@ bool pqxxSqlCursor::drv_open()
 	}
 	catch (const std::exception &e)
 	{
-		setError(ERR_DB_SPECIFIC, QString::fromUtf8( e.what()) );
-		KexiDBDrvWarn << "pqxxSqlCursor::drv_open:exception - " << QString::fromUtf8( e.what() ) << endl;
+		setError(ERR_DB_SPECIFIC, TQString::fromUtf8( e.what()) );
+		KexiDBDrvWarn << "pqxxSqlCursor::drv_open:exception - " << TQString::fromUtf8( e.what() ) << endl;
 	}
 	catch(...)
 	{
@@ -193,31 +193,31 @@ void pqxxSqlCursor::drv_getPrevRecord()
 
 //==================================================================================
 //Return the value for a given column for the current record
-QVariant pqxxSqlCursor::value(uint pos)
+TQVariant pqxxSqlCursor::value(uint pos)
 {
 	if (pos < m_fieldCount)
 		return pValue(pos);
 	else
-		return QVariant();
+		return TQVariant();
 }
 
 //==================================================================================
 //Return the value for a given column for the current record - Private const version
-QVariant pqxxSqlCursor::pValue(uint pos)const
+TQVariant pqxxSqlCursor::pValue(uint pos)const
 {	
 	if (m_res->size() <= 0)
 	{
 		KexiDBDrvWarn << "pqxxSqlCursor::value - ERROR: result size not greater than 0" << endl;
-		return QVariant();
+		return TQVariant();
 	}
 
 	if (pos>=(m_fieldCount+(m_containsROWIDInfo ? 1 : 0)))
 	{
 //		KexiDBDrvWarn << "pqxxSqlCursor::value - ERROR: requested position is greater than the number of fields" << endl;
-		return QVariant();
+		return TQVariant();
 	}
 
-	KexiDB::Field *f = (m_fieldsExpanded && pos<QMIN(m_fieldsExpanded->count(), m_fieldCount)) 
+	KexiDB::Field *f = (m_fieldsExpanded && pos<TQMIN(m_fieldsExpanded->count(), m_fieldCount)) 
 		? m_fieldsExpanded->at(pos)->field : 0;
 
 //	KexiDBDrvDbg << "pqxxSqlCursor::value(" << pos << ")" << endl;
@@ -231,7 +231,7 @@ QVariant pqxxSqlCursor::pValue(uint pos)const
 		}
 		else if (f->isTextType())
 		{
-			return QString::fromUtf8((*m_res)[at()][pos].c_str()); //utf8?
+			return TQString::fromUtf8((*m_res)[at()][pos].c_str()); //utf8?
 		}
 		else if (f->isFPNumericType())
 		{
@@ -249,7 +249,7 @@ QVariant pqxxSqlCursor::pValue(uint pos)const
 		return pgsqlCStrToVariant((*m_res)[at()][pos]);
 	}
 
-	return QString::fromUtf8((*m_res)[at()][pos].c_str(), (*m_res)[at()][pos].size()); //utf8?
+	return TQString::fromUtf8((*m_res)[at()][pos].c_str(), (*m_res)[at()][pos].size()); //utf8?
 }
 
 //==================================================================================
@@ -332,7 +332,7 @@ void pqxxSqlCursor::drv_bufferMovePointerPrev()
 //==================================================================================
 //Move internal pointer to internal buffer to N
 //Implementation required but no need in this driver
-void pqxxSqlCursor::drv_bufferMovePointerTo(Q_LLONG to)
+void pqxxSqlCursor::drv_bufferMovePointerTo(TQ_LLONG to)
 {
 	Q_UNUSED(to);
 }