1 files changed, 29 insertions, 29 deletions

diff --git a/kpilot/lib/idmapper.cc b/kpilot/lib/idmapper.cc
index 6e1031ef..f4fc38c5 100644
--- a/kpilot/lib/idmapper.cc
+++ b/kpilot/lib/idmapper.cc
@@ -27,8 +27,8 @@
 #include "idmapperxml.h"
 #include "options.h"
 
-#include <qsqldatabase.h>
-#include <qfile.h>
+#include <tqsqldatabase.h>
+#include <tqfile.h>
 
 #include <kglobal.h>
 #include <kstandarddirs.h>
@@ -57,9 +57,9 @@ IDMapper::IDMapper()
 	
 	fP = new IDMapperPrivate();
 	
-	QString dbPath = KGlobal::dirs()->
+	TQString dbPath = KGlobal::dirs()->
 		saveLocation("data", CSL1("kpilot/") );
-	QString dbFile = dbPath + CSL1("mapping.xml");
+	TQString dbFile = dbPath + CSL1("mapping.xml");
 	
 	if( !openDatasource( dbFile ) )
 	{
@@ -67,7 +67,7 @@ IDMapper::IDMapper()
 	}
 }
 
-IDMapper::IDMapper( const QString &file)
+IDMapper::IDMapper( const TQString &file)
 {
 	FUNCTIONSETUP;
 	
@@ -84,7 +84,7 @@ IDMapper::~IDMapper()
 	KPILOT_DELETE(fP);
 }
 
-bool IDMapper::openDatasource( const QString &file )
+bool IDMapper::openDatasource( const TQString &file )
 {
 	FUNCTIONSETUP;
 	
@@ -92,7 +92,7 @@ bool IDMapper::openDatasource( const QString &file )
 	return fP->fXmlSource->open();
 }
 
-void IDMapper::registerPCObjectId( const QString &conduit, const QString &uid )
+void IDMapper::registerPCObjectId( const TQString &conduit, const TQString &uid )
 {
 	FUNCTIONSETUP;
 	
@@ -103,7 +103,7 @@ void IDMapper::registerPCObjectId( const QString &conduit, const QString &uid )
 	fP->fXmlSource->save();
 }
 
-void IDMapper::registerHHObjectId( const QString &conduit, recordid_t pid )
+void IDMapper::registerHHObjectId( const TQString &conduit, recordid_t pid )
 {
 	FUNCTIONSETUP;
 	
@@ -114,13 +114,13 @@ void IDMapper::registerHHObjectId( const QString &conduit, recordid_t pid )
 	fP->fXmlSource->save();
 }
 
-QValueList<QString> IDMapper::getPCObjectIds( const QString &conduit )
+TQValueList<TQString> IDMapper::getPCObjectIds( const TQString &conduit )
 {
 	FUNCTIONSETUP;
 	
-	QValueList<IDMapping> &mappings = fP->fXmlSource->mappings();
-	QValueList<IDMapping>::iterator it;
-	QValueList<QString> uids;
+	TQValueList<IDMapping> &mappings = fP->fXmlSource->mappings();
+	TQValueList<IDMapping>::iterator it;
+	TQValueList<TQString> uids;
 	
 	DEBUGKPILOT << fname << ": total " << mappings.count() << endl;
 	
@@ -141,13 +141,13 @@ QValueList<QString> IDMapper::getPCObjectIds( const QString &conduit )
 	return uids;
 }
 
-QValueList<recordid_t> IDMapper::getHHObjectIds( const QString &conduit )
+TQValueList<recordid_t> IDMapper::getHHObjectIds( const TQString &conduit )
 {
 	FUNCTIONSETUP;
 	
-	QValueList<IDMapping> &mappings = fP->fXmlSource->mappings();
-	QValueList<IDMapping>::iterator it;
-	QValueList<recordid_t> pids;
+	TQValueList<IDMapping> &mappings = fP->fXmlSource->mappings();
+	TQValueList<IDMapping>::iterator it;
+	TQValueList<recordid_t> pids;
 	
 	for ( it = mappings.begin(); it != mappings.end(); ++it )
 	{
@@ -164,12 +164,12 @@ QValueList<recordid_t> IDMapper::getHHObjectIds( const QString &conduit )
 	return pids;
 }
 
-bool IDMapper::hasPCId( const QString &conduit, recordid_t pid )
+bool IDMapper::hasPCId( const TQString &conduit, recordid_t pid )
 {
 	FUNCTIONSETUP;
 	
-	QValueList<IDMapping> &mappings = fP->fXmlSource->mappings();
-	QValueList<IDMapping>::iterator it;
+	TQValueList<IDMapping> &mappings = fP->fXmlSource->mappings();
+	TQValueList<IDMapping>::iterator it;
 	
 	for ( it = mappings.begin(); it != mappings.end(); ++it )
 	{
@@ -183,12 +183,12 @@ bool IDMapper::hasPCId( const QString &conduit, recordid_t pid )
 	return false;
 }
 
-bool IDMapper::hasHHId( const QString &conduit, const QString &uid )
+bool IDMapper::hasHHId( const TQString &conduit, const TQString &uid )
 {
 	FUNCTIONSETUP;
 	
-	QValueList<IDMapping> &mappings = fP->fXmlSource->mappings();
-	QValueList<IDMapping>::iterator it;
+	TQValueList<IDMapping> &mappings = fP->fXmlSource->mappings();
+	TQValueList<IDMapping>::iterator it;
 	
 	for ( it = mappings.begin(); it != mappings.end(); ++it )
 	{
@@ -202,15 +202,15 @@ bool IDMapper::hasHHId( const QString &conduit, const QString &uid )
 	return false;
 }
 
-void IDMapper::setHHObjectId( const QString &conduit, const QString &uid
+void IDMapper::setHHObjectId( const TQString &conduit, const TQString &uid
 		, recordid_t pid )
 {
 	FUNCTIONSETUP;
 	
 	bool modified = false;
 	
-	QValueList<IDMapping> &mappings = fP->fXmlSource->mappings();
-	QValueList<IDMapping>::iterator it;
+	TQValueList<IDMapping> &mappings = fP->fXmlSource->mappings();
+	TQValueList<IDMapping>::iterator it;
 	
 	for ( it = mappings.begin(); it != mappings.end(); ++it )
 	{
@@ -224,15 +224,15 @@ void IDMapper::setHHObjectId( const QString &conduit, const QString &uid
 	}
 }
 
-void IDMapper::setPCObjectId( const QString &conduit, recordid_t pid
-	, const QString &uid )
+void IDMapper::setPCObjectId( const TQString &conduit, recordid_t pid
+	, const TQString &uid )
 {
 	FUNCTIONSETUP;
 	
 	bool modified = false;
 	
-	QValueList<IDMapping> &mappings = fP->fXmlSource->mappings();
-	QValueList<IDMapping>::iterator it;
+	TQValueList<IDMapping> &mappings = fP->fXmlSource->mappings();
+	TQValueList<IDMapping>::iterator it;
 	
 	for ( it = mappings.begin(); it != mappings.end(); ++it )
 	{