summaryrefslogtreecommitdiffstats
path: root/kresources/groupwise/kabc_resourcegroupwise.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kresources/groupwise/kabc_resourcegroupwise.cpp')
-rw-r--r--kresources/groupwise/kabc_resourcegroupwise.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/kresources/groupwise/kabc_resourcegroupwise.cpp b/kresources/groupwise/kabc_resourcegroupwise.cpp
index 7c87508e4..d1300f9c9 100644
--- a/kresources/groupwise/kabc_resourcegroupwise.cpp
+++ b/kresources/groupwise/kabc_resourcegroupwise.cpp
@@ -287,7 +287,7 @@ bool ResourceGroupwise::asyncLoad()
if ( !mProgress )
{
mProgress = KPIM::ProgressManager::instance()->createProgressItem(
- KPIM::ProgressManager::getUniqueID(), i18n( "Loading GroupWise resource %1" ).arg( resourceName() ), TQString::null, true /*CanBeCancelled*/, mPrefs->url().startsWith("https" ) );
+ KPIM::ProgressManager::getUniqueID(), i18n( "Loading GroupWise resource %1" ).arg( resourceName() ), TQString(), true /*CanBeCancelled*/, mPrefs->url().startsWith("https" ) );
connect( mProgress, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ),
TQT_SLOT( cancelLoad() ) );
}
@@ -338,7 +338,7 @@ void ResourceGroupwise::fetchAddressBooks( const BookType bookType )
}
mState = ( bookType == System ? FetchingSAB : FetchingUAB );
- mJobData = TQString::null;
+ mJobData = TQString();
if ( mJob )
{
@@ -347,7 +347,7 @@ void ResourceGroupwise::fetchAddressBooks( const BookType bookType )
}
mJob = KIO::get( url, false, false ); // TODO: make the GW jobs call finished if the URL
- // tqcontains no address book IDs
+ // contains no address book IDs
kdDebug() << " Job address: " << mJob << endl;
connect( mJob, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ),
TQT_SLOT( slotReadJobData( KIO::Job *, const TQByteArray & ) ) );
@@ -360,7 +360,7 @@ void ResourceGroupwise::fetchAddressBooks( const BookType bookType )
TQT_SLOT( fetchSABResult( KIO::Job * ) ) );
mSABProgress = KPIM::ProgressManager::instance()->createProgressItem(
mProgress, KPIM::ProgressManager::getUniqueID(),
- i18n( "Fetching System Address Book" ), TQString::null,
+ i18n( "Fetching System Address Book" ), TQString(),
false /*CannotBeCancelled*/,
mPrefs->url().startsWith("https" ) );
}
@@ -370,7 +370,7 @@ void ResourceGroupwise::fetchAddressBooks( const BookType bookType )
TQT_SLOT( fetchUABResult( KIO::Job * ) ) );
mUABProgress = KPIM::ProgressManager::instance()->createProgressItem(
mProgress, KPIM::ProgressManager::getUniqueID(),
- i18n( "Fetching User Address Books" ), TQString::null,
+ i18n( "Fetching User Address Books" ), TQString(),
false /*CannotBeCancelled*/,
mPrefs->url().startsWith("https" ) );
}
@@ -437,10 +437,10 @@ void ResourceGroupwise::updateSystemAddressBook()
KURL url = createAccessUrl( System, Update, mPrefs->lastSequenceNumber(), mPrefs->lastTimePORebuild() );
kdDebug() << " Update URL: " << url << endl;
- mJobData = TQString::null;
+ mJobData = TQString();
mSABProgress = KPIM::ProgressManager::instance()->createProgressItem(
mProgress, KPIM::ProgressManager::getUniqueID(),
- i18n( "Updating System Address Book" ), TQString::null,
+ i18n( "Updating System Address Book" ), TQString(),
false /*CannotBeCancelled*/,
mPrefs->url().startsWith("https" ) );
@@ -517,7 +517,7 @@ void ResourceGroupwise::slotReadJobData( KIO::Job *job , const TQByteArray &data
clearChange( addr );
}
}
- mJobData = TQString::null;
+ mJobData = TQString();
}
void ResourceGroupwise::slotUpdateJobData( KIO::Job *job, const TQByteArray &data )
@@ -558,7 +558,7 @@ void ResourceGroupwise::slotUpdateJobData( KIO::Job *job, const TQByteArray &dat
if ( !local.isEmpty() )
{
idMapper().removeRemoteId( remote );
- KABC::Addressee addrToDelete = tqfindByUid( local );
+ KABC::Addressee addrToDelete = findByUid( local );
removeAddressee( addrToDelete );
}
}
@@ -567,7 +567,7 @@ void ResourceGroupwise::slotUpdateJobData( KIO::Job *job, const TQByteArray &dat
}
}
}
- mJobData = TQString::null;
+ mJobData = TQString();
}
void ResourceGroupwise::loadCompleted()
@@ -665,13 +665,13 @@ bool ResourceGroupwise::shouldFetchSystemAddressBook()
{
TQStringList ids = mPrefs->readAddressBooks();
- return ( appIsWhiteListedForSAB() && ids.find( mPrefs->systemAddressBook() ) != ids.end() );
+ return ( appIsWhiteListedForSAB() && ids.tqfind( mPrefs->systemAddressBook() ) != ids.end() );
}
bool ResourceGroupwise::shouldFetchUserAddressBooks()
{
TQStringList ids = mPrefs->readAddressBooks();
- return ( ids.count() > 1 || ids.find( mPrefs->systemAddressBook() ) == ids.end() );
+ return ( ids.count() > 1 || ids.tqfind( mPrefs->systemAddressBook() ) == ids.end() );
}
KURL ResourceGroupwise::createAccessUrl( BookType bookType, AccessMode mode, unsigned long lastSequenceNumber, unsigned long lastPORebuildTime )