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

diff --git a/kexi/kexidb/object.cpp b/kexi/kexidb/object.cpp
index f4228bc72..2e32274d8 100644
--- a/kexi/kexidb/object.cpp
+++ b/kexi/kexidb/object.cpp
@@ -50,7 +50,7 @@ Object::~Object()
 	KexiDBDbg << "Object ERROR: " << m_previousServerResultNum2 << ": " \
 		<< m_previousServerResultName2 <<endl
 
-void Object::setError( int code, const QString &msg )
+void Object::setError( int code, const TQString &msg )
 {
 	STORE_PREV_ERR;
 
@@ -66,17 +66,17 @@ void Object::setError( int code, const QString &msg )
 		ERRMSG(this);
 }
 
-void Object::setError( const QString &msg )
+void Object::setError( const TQString &msg )
 {
 	setError( ERR_OTHER, msg );
 }
 
-void Object::setError( const QString& title, const QString &msg )
+void Object::setError( const TQString& title, const TQString &msg )
 {
 	STORE_PREV_ERR;
 
 	m_errno=ERR_OTHER;
-	QString origMsgTitle( m_msgTitle ); //store
+	TQString origMsgTitle( m_msgTitle ); //store
 	
 	m_msgTitle += title;
 	m_errMsg = msg;
@@ -88,12 +88,12 @@ void Object::setError( const QString& title, const QString &msg )
 	m_msgTitle = origMsgTitle; //revert 
 }
 
-void Object::setError( KexiDB::Object *obj, const QString& prependMessage )
+void Object::setError( KexiDB::Object *obj, const TQString& prependMessage )
 {
 	setError( obj, obj ? obj->errorNum() : ERR_OTHER, prependMessage );
 }
 
-void Object::setError( KexiDB::Object *obj, int code, const QString& prependMessage )
+void Object::setError( KexiDB::Object *obj, int code, const TQString& prependMessage )
 {
 	if (obj && (obj->errorNum()!=0 || !obj->serverErrorMsg().isEmpty())) {
 		STORE_PREV_ERR;
@@ -104,7 +104,7 @@ void Object::setError( KexiDB::Object *obj, int code, const QString& prependMess
 			m_errno = code;
 			m_hasError = true;
 		}
-		m_errMsg = (prependMessage.isEmpty() ? QString::null : (prependMessage + " ")) 
+		m_errMsg = (prependMessage.isEmpty() ? TQString() : (prependMessage + " ")) 
 			+ obj->errorMsg();
 		m_sql = obj->m_sql;
 		m_errorSql = obj->m_errorSql;
@@ -132,16 +132,16 @@ void Object::clearError()
 { 
 	m_errno = 0;
 	m_hasError = false;
-	m_errMsg = QString::null;
-	m_sql = QString::null;
-	m_errorSql = QString::null;
+	m_errMsg = TQString();
+	m_sql = TQString();
+	m_errorSql = TQString();
 	m_serverResult = 0;
-	m_serverResultName = QString::null;
-	m_serverErrorMsg = QString::null;
+	m_serverResultName = TQString();
+	m_serverErrorMsg = TQString();
 	drv_clearServerResult();
 }
 
-QString Object::serverErrorMsg()
+TQString Object::serverErrorMsg()
 {
 	return m_serverErrorMsg;
 }
@@ -151,7 +151,7 @@ int Object::serverResult()
 	return m_serverResult;
 }
 
-QString Object::serverResultName()
+TQString Object::serverResultName()
 {
 	return m_serverResultName;
 }
@@ -160,7 +160,7 @@ void Object::debugError()
 {
 	if (error()) {
 		KexiDBDbg << "KEXIDB ERROR: " << errorMsg() << endl;
-		QString s = serverErrorMsg(), sn = serverResultName();
+		TQString s = serverErrorMsg(), sn = serverResultName();
 		if (!s.isEmpty())
 			KexiDBDbg << "KEXIDB SERVER ERRMSG: " << s << endl;
 		if (!sn.isEmpty())
@@ -171,11 +171,11 @@ void Object::debugError()
 		KexiDBDbg << "KEXIDB OK." << endl;
 }
 
-int Object::askQuestion( const QString& message, 
+int Object::askQuestion( const TQString& message, 
 	KMessageBox::DialogType dlgType, KMessageBox::ButtonCode defaultResult,
 	const KGuiItem &buttonYes, 
 	const KGuiItem &buttonNo,
-	const QString &dontShowAskAgainName,
+	const TQString &dontShowAskAgainName,
 	int options, 
 	MessageHandler* msgHandler )
 {