TQt4 port kpilot

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kpilot@1238903 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 9 insertions, 9 deletions

diff --git a/lib/recordConduit.cc b/lib/recordConduit.cc
index 0ffbbcf..ee01063 100644
--- a/lib/recordConduit.cc
+++ b/lib/recordConduit.cc
@@ -66,7 +66,7 @@ long version_record_conduit = Pilot::PLUGIN_API;
 	bool retrieved = false;
 	if (!openDatabases( fDBName, &retrieved))
 	{
-		emit logError(i18n("Unable to open the %1 database on the handheld.").arg( fDBName ) );
+		emit logError(i18n("Unable to open the %1 database on the handheld.").tqarg( fDBName ) );
 		return false;
 	}
 	if (retrieved) setFirstSync(true);
@@ -286,13 +286,13 @@ RecordConduit::~RecordConduit()
 	// Database names probably in latin1.
 	if( !openDatabases( dbName(), &fFirstSync ) )
 	{
-		emit logError(i18n("Unable to open the %1 database on the handheld.").arg( dbName() ) );
+		emit logError(i18n("Unable to open the %1 database on the handheld.").tqarg( dbName() ) );
 		return false;
 	}
 	_getAppInfo();
 	if( !mPCData->loadData() )
 	{
-		emit logError( i18n("Unable to open %1.").arg( mPCData->description() ) );
+		emit logError( i18n("Unable to open %1.").tqarg( mPCData->description() ) );
 		return false;
 	}
 	// get the addresseMap which maps Pilot unique record(address) id's to
@@ -496,7 +496,7 @@ void RecordConduit::slotDeletedRecord()
 	}
 
 	TQString uid = mEntryMap[ backupRec->id() ];
-	PCEntry *pcEntry = mPCData->tqfindByUid( uid );
+	PCEntry *pcEntry = mPCData->findByUid( uid );
 	PilotRecord *palmRec = fDatabase->readRecordById( backupRec->id() );
 	PilotAppCategory *backupEntry = 0L;
 	if (backupRec)
@@ -696,16 +696,16 @@ int RecordConduit::compareStr( const TQString & str1, const TQString & str2 )
 
 /**
  * _getCat returns the id of the category from the given categories list.
- * If the address has no categories on the PC, TQString::null is returned.
+ * If the address has no categories on the PC, TQString() is returned.
  * If the current category exists in the list of cats, it is returned
  * Otherwise the first cat in the list that exists on the HH is returned
- * If none of the categories exists on the palm, TQString::null is returned
+ * If none of the categories exists on the palm, TQString() is returned
  */
 TQString RecordConduit::getCatForHH( const TQStringList cats, const TQString curr ) const
 {
 	FUNCTIONSETUP;
 	if ( cats.size() < 1 )
-		return TQString::null;
+		return TQString();
 	if ( cats.tqcontains( curr ) )
 		return curr;
 	for ( TQStringList::ConstIterator it = cats.begin(); it != cats.end(); ++it)
@@ -721,7 +721,7 @@ TQString RecordConduit::getCatForHH( const TQStringList cats, const TQString cur
 	}
 	// If we have a free label, return the first possible cat
 	TQString lastCat( category( Pilot::CATEGORY_COUNT-1 ) );
-	return ( lastCat.isEmpty() ) ? ( cats.first() ) : ( TQString::null );
+	return ( lastCat.isEmpty() ) ? ( cats.first() ) : ( TQString() );
 }
 
 void RecordConduit::setCategory(PCEntry * pcEntry, TQString cat)
@@ -1102,7 +1102,7 @@ RecordConduit::PCEntry *RecordConduit::findMatch( PilotAppCategory *palmEntry )
 #endif
 		if( !id.isEmpty() )
 		{
-			PCEntry *res = mPCData->tqfindByUid( id );
+			PCEntry *res = mPCData->findByUid( id );
 			if ( !res && !res->isEmpty() ) return res;
 			KPILOT_DELETE( res );
 #ifdef DEBUG