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

diff --git a/kexi/core/kexiprojectconnectiondata.cpp b/kexi/core/kexiprojectconnectiondata.cpp
index 6a73342f..7a3cc0cc 100644
--- a/kexi/core/kexiprojectconnectiondata.cpp
+++ b/kexi/core/kexiprojectconnectiondata.cpp
@@ -20,10 +20,10 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <qdom.h>
-#include <qdir.h>
-#include <qfile.h>
-#include <qregexp.h>
+#include <tqdom.h>
+#include <tqdir.h>
+#include <tqfile.h>
+#include <tqregexp.h>
 
 #include <kglobal.h>
 #include <kstandarddirs.h>
@@ -41,8 +41,8 @@ KexiProjectConnectionData::KexiProjectConnectionData(): KexiDB::ConnectionData()
 {
 }
 
-KexiProjectConnectionData::KexiProjectConnectionData(const QString& driverName, const QString& databaseName, const QString &host, 
-		unsigned short int rport, const QString& user, const QString &pass, const QString& file):KexiDB::ConnectionData()
+KexiProjectConnectionData::KexiProjectConnectionData(const TQString& driverName, const TQString& databaseName, const TQString &host, 
+		unsigned short int rport, const TQString& user, const TQString &pass, const TQString& file):KexiDB::ConnectionData()
 {
 	m_driverName=driverName;
 	m_databaseName=databaseName;
@@ -53,30 +53,30 @@ KexiProjectConnectionData::KexiProjectConnectionData(const QString& driverName,
 	setFileName(file);
 }
 
-KexiProjectConnectionData::KexiProjectConnectionData(const QString &driverName, const QString &fileName)
+KexiProjectConnectionData::KexiProjectConnectionData(const TQString &driverName, const TQString &fileName)
  : KexiDB::ConnectionData()
 {
 	m_driverName=driverName;
 	setFileName(fileName);
 }
 
-const QString &
+const TQString &
 KexiProjectConnectionData::generateTmpName()
 {
-	return QString::null;
+	return TQString();
 }
 
 KexiProjectConnectionData*
-KexiProjectConnectionData::loadInfo(QDomElement &rootElement)
+KexiProjectConnectionData::loadInfo(TQDomElement &rootElement)
 {
-	QDomElement engineElement = rootElement.namedItem("engine").toElement();
-	QDomElement hostElement = rootElement.namedItem("host").toElement();
-	QDomElement portElement = rootElement.namedItem("port").toElement();
-	QDomElement nameElement = rootElement.namedItem("name").toElement();
-	QDomElement userElement = rootElement.namedItem("user").toElement();
-	QDomElement passElement = rootElement.namedItem("password").toElement();
-	QDomElement persElement = rootElement.namedItem("persistant").toElement();
-	QDomElement encodingElement = rootElement.namedItem("encoding").toElement();
+	TQDomElement engineElement = rootElement.namedItem("engine").toElement();
+	TQDomElement hostElement = rootElement.namedItem("host").toElement();
+	TQDomElement portElement = rootElement.namedItem("port").toElement();
+	TQDomElement nameElement = rootElement.namedItem("name").toElement();
+	TQDomElement userElement = rootElement.namedItem("user").toElement();
+	TQDomElement passElement = rootElement.namedItem("password").toElement();
+	TQDomElement persElement = rootElement.namedItem("persistant").toElement();
+	TQDomElement encodingElement = rootElement.namedItem("encoding").toElement();
 
 	KexiProjectConnectionData *tmp=new KexiProjectConnectionData(
 		engineElement.text(), nameElement.text(),hostElement.text(),portElement.text().toInt(),
@@ -85,62 +85,62 @@ KexiProjectConnectionData::loadInfo(QDomElement &rootElement)
 	return tmp;
 }
 
-void    KexiProjectConnectionData::setDriverName(const QString &driverName) {
+void    KexiProjectConnectionData::setDriverName(const TQString &driverName) {
 	m_driverName=driverName;
 }
 
-void KexiProjectConnectionData::setDatabaseName(const QString &databaseName) {
+void KexiProjectConnectionData::setDatabaseName(const TQString &databaseName) {
 	m_databaseName=databaseName;
 }
 
-QString KexiProjectConnectionData::driverName() const {
+TQString KexiProjectConnectionData::driverName() const {
 	return m_driverName;
 }
 
-QString KexiProjectConnectionData::databaseName() const {
+TQString KexiProjectConnectionData::databaseName() const {
 	return m_databaseName;
 }
 
 
 void
-KexiProjectConnectionData::writeInfo(QDomDocument &domDoc)
+KexiProjectConnectionData::writeInfo(TQDomDocument &domDoc)
 {
-	QDomElement connectionElement = domDoc.createElement("KexiDBConnection");
+	TQDomElement connectionElement = domDoc.createElement("KexiDBConnection");
 	domDoc.documentElement().appendChild(connectionElement);
 
 //DB ENGINE
-	QDomElement engineElement = domDoc.createElement("engine");
+	TQDomElement engineElement = domDoc.createElement("engine");
 	connectionElement.appendChild(engineElement);
 
-	QDomText tEngine = domDoc.createTextNode(m_driverName);
+	TQDomText tEngine = domDoc.createTextNode(m_driverName);
 	engineElement.appendChild(tEngine);
 
 //HOST
-	QDomElement hostElement = domDoc.createElement("host");
+	TQDomElement hostElement = domDoc.createElement("host");
 	connectionElement.appendChild(hostElement);
 
-	QDomText tHost = domDoc.createTextNode(hostName);
+	TQDomText tHost = domDoc.createTextNode(hostName);
 	hostElement.appendChild(tHost);
 
 //DATABASE NAME
-	QDomElement nameElement = domDoc.createElement("name");
+	TQDomElement nameElement = domDoc.createElement("name");
 	connectionElement.appendChild(nameElement);
 
-	QDomText tName = domDoc.createTextNode(m_databaseName);
+	TQDomText tName = domDoc.createTextNode(m_databaseName);
 	nameElement.appendChild(tName);
 
 //USER
-	QDomElement userElement = domDoc.createElement("user");
+	TQDomElement userElement = domDoc.createElement("user");
 	connectionElement.appendChild(userElement);
 
-	QDomText tUser = domDoc.createTextNode(userName);
+	TQDomText tUser = domDoc.createTextNode(userName);
 	userElement.appendChild(tUser);
 
 //PASSWORD STUFF
-	QDomElement passElement = domDoc.createElement("password");
+	TQDomElement passElement = domDoc.createElement("password");
 	connectionElement.appendChild(passElement);
 
-	QDomText tPass=domDoc.createTextNode(password);
+	TQDomText tPass=domDoc.createTextNode(password);
 	passElement.appendChild(tPass);
 
 }