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

diff --git a/kexi/kexidb/cursor.cpp b/kexi/kexidb/cursor.cpp
index 4b9cdea3..dc95e30f 100644
--- a/kexi/kexidb/cursor.cpp
+++ b/kexi/kexidb/cursor.cpp
@@ -37,27 +37,27 @@ using namespace KexiDB;
 
 #endif
 
-Cursor::Cursor(Connection* conn, const QString& statement, uint options)
-	: QObject()
+Cursor::Cursor(Connection* conn, const TQString& statement, uint options)
+	: TQObject()
 	, m_conn(conn)
 	, m_query(0)
 	, m_rawStatement(statement)
 	, m_options(options)
 {
 #ifdef KEXI_DEBUG_GUI
-	KexiUtils::addKexiDBDebug(QString("Create cursor: ")+statement);
+	KexiUtils::addKexiDBDebug(TQString("Create cursor: ")+statement);
 #endif
 	init();
 }
 
 Cursor::Cursor(Connection* conn, QuerySchema& query, uint options )
-	: QObject()
+	: TQObject()
 	, m_conn(conn)
 	, m_query(&query)
 	, m_options(options)
 {
 #ifdef KEXI_DEBUG_GUI
-	KexiUtils::addKexiDBDebug(QString("Create cursor for query \"%1\": ").arg(query.name())+query.debugString());
+	KexiUtils::addKexiDBDebug(TQString("Create cursor for query \"%1\": ").tqarg(query.name())+query.debugString());
 #endif
 	init();
 }
@@ -108,9 +108,9 @@ Cursor::~Cursor()
 {
 #ifdef KEXI_DEBUG_GUI
 	if (m_query)
-		KexiUtils::addKexiDBDebug(QString("~ Delete cursor for query"));
+		KexiUtils::addKexiDBDebug(TQString("~ Delete cursor for query"));
 	else
-		KexiUtils::addKexiDBDebug(QString("~ Delete cursor: ")+m_rawStatement);
+		KexiUtils::addKexiDBDebug(TQString("~ Delete cursor: ")+m_rawStatement);
 #endif
 /*	if (!m_query)
 		KexiDBDbg << "Cursor::~Cursor() '" << m_rawStatement.latin1() << "'" << endl;
@@ -166,7 +166,7 @@ bool Cursor::open()
 
 //luci:	WHAT_EXACTLY_SHOULD_THAT_BE?
 //	if (!m_readAhead) // jowenn: to ensure before first state, without cluttering implementation code
-	if (m_conn->driver()->beh->_1ST_ROW_READ_AHEAD_REQUIRED_TO_KNOW_IF_THE_RESULT_IS_EMPTY) {
+	if (m_conn->driver()->beh->_1ST_ROW_READ_AHEAD_RETQUIRED_TO_KNOW_IF_THE_RESULT_IS_EMPTY) {
 //		KexiDBDbg << "READ AHEAD:" << endl;
 		m_readAhead = getNextRecord(); //true if any record in this query
 //		KexiDBDbg << "READ AHEAD = " << m_readAhead << endl;
@@ -346,7 +346,7 @@ bool Cursor::bof() const
 	return m_at==0;
 }
 
-Q_LLONG Cursor::at() const
+TQ_LLONG Cursor::at() const
 {
 	if (m_readAhead)
 		return 0;
@@ -494,9 +494,9 @@ bool Cursor::deleteAllRows()
 	return m_conn->deleteAllRows(*m_query);
 }
 
-QString Cursor::debugString() const
+TQString Cursor::debugString() const
 {
-	QString dbg = "CURSOR( ";
+	TQString dbg = "CURSOR( ";
 	if (!m_query) {
 		dbg += "RAW STATEMENT: '";
 		dbg += m_rawStatement;
@@ -516,7 +516,7 @@ QString Cursor::debugString() const
 	else
 		dbg += " NOT_BUFFERED";
 	dbg += " AT=";
-	dbg += QString::number((unsigned long)at());
+	dbg += TQString::number((unsigned long)at());
 	dbg += " )";
 	return dbg;
 }
@@ -526,7 +526,7 @@ void Cursor::debug() const
 	KexiDBDbg << debugString() << endl;
 }
 
-void Cursor::setOrderByColumnList(const QStringList& columnNames)
+void Cursor::setOrderByColumnList(const TQStringList& columnNames)
 {
 	Q_UNUSED(columnNames);
 //! @todo implement this:
@@ -537,9 +537,9 @@ void Cursor::setOrderByColumnList(const QStringList& columnNames)
 //TODO
 }
 
-/*! Convenience method, similar to setOrderBy(const QStringList&). */
-void Cursor::setOrderByColumnList(const QString& column1, const QString& column2, 
-	const QString& column3, const QString& column4, const QString& column5)
+/*! Convenience method, similar to setOrderBy(const TQStringList&). */
+void Cursor::setOrderByColumnList(const TQString& column1, const TQString& column2, 
+	const TQString& column3, const TQString& column4, const TQString& column5)
 {
 	Q_UNUSED(column1);
 	Q_UNUSED(column2);
@@ -555,15 +555,15 @@ QueryColumnInfo::Vector Cursor::orderByColumnList() const
 	return m_orderByColumnList ? *m_orderByColumnList: QueryColumnInfo::Vector();
 }
 
-QValueList<QVariant> Cursor::queryParameters() const
+TQValueList<TQVariant> Cursor::queryParameters() const
 {
-	return m_queryParameters ? *m_queryParameters : QValueList<QVariant>();
+	return m_queryParameters ? *m_queryParameters : TQValueList<TQVariant>();
 }
 
-void Cursor::setQueryParameters(const QValueList<QVariant>& params)
+void Cursor::setQueryParameters(const TQValueList<TQVariant>& params)
 {
 	if (!m_queryParameters)
-		m_queryParameters = new QValueList<QVariant>(params);
+		m_queryParameters = new TQValueList<TQVariant>(params);
 	else
 		*m_queryParameters = params;
 }