diff options
Diffstat (limited to 'korganizer/freebusymanager.cpp')
| -rw-r--r-- | korganizer/freebusymanager.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/korganizer/freebusymanager.cpp b/korganizer/freebusymanager.cpp index 187e1082..54695217 100644 --- a/korganizer/freebusymanager.cpp +++ b/korganizer/freebusymanager.cpp @@ -1,7 +1,7 @@ /* This file is part of the Groupware/KOrganizer integration. - Requires the Qt and KDE widget libraries, available at no cost at + Requires the TQt and KDE widget libraries, available at no cost at http://www.trolltech.com and http://www.kde.org respectively Copyright (c) 2002-2004 Klar�vdalens Datakonsult AB @@ -25,11 +25,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -123,8 +123,8 @@ void FreeBusyDownloadJob::slotResult( KIO::Job *job ) //// -FreeBusyManager::FreeBusyManager( TQObject *parent, const char *name ) - : TQObject( parent, name ), +FreeBusyManager::FreeBusyManager( TQObject *tqparent, const char *name ) + : TQObject( tqparent, name ), mCalendar( 0 ), mTimerID( 0 ), mUploadingFreeBusy( false ), mBrokenUrl( false ) { @@ -252,7 +252,7 @@ void FreeBusyManager::publishFreeBusy() // // Substitute %u and %d [FIXME] // TQString defaultEmail = KOCore()::self()->email(); -// int emailpos = defaultEmail.find( '@' ); +// int emailpos = defaultEmail.tqfind( '@' ); // if (emailpos != -1) { // const TQString emailName = defaultEmail.left( emailpos ); // const TQString emailHost = defaultEmail.mid( emailpos + 1 ); @@ -292,7 +292,7 @@ void FreeBusyManager::publishFreeBusy() #if 0 TQString defaultEmail = KOCore()::self()->email(); - TQString emailHost = defaultEmail.mid( defaultEmail.find( '@' ) + 1 ); + TQString emailHost = defaultEmail.mid( defaultEmail.tqfind( '@' ) + 1 ); // Put target string together KURL targetURL; @@ -309,7 +309,7 @@ void FreeBusyManager::publishFreeBusy() targetURL.setHost( server ); TQString fbname = KOPrefs::instance()->mPublishUserName; - int at = fbname.find('@'); + int at = fbname.tqfind('@'); if( at > 1 && fbname.length() > (uint)at ) { fbname = fbname.left(at); } @@ -438,10 +438,10 @@ void FreeBusyManager::cancelRetrieval() mRetrieveQueue.clear(); } -KURL tqreplaceVariablesURL( const KURL &url, const TQString &email ) +KURL replaceVariablesURL( const KURL &url, const TQString &email ) { TQString emailName, emailHost; - int emailpos = email.find( '@' ); + int emailpos = email.tqfind( '@' ); if( emailpos >= 0 ) { emailName = email.left( emailpos ); emailHost = email.mid( emailpos + 1 ); @@ -492,11 +492,11 @@ KURL FreeBusyManager::freeBusyUrl( const TQString &email ) cachedURL.setUser( KOPrefs::instance()->mFreeBusyRetrieveUser ); cachedURL.setPass( KOPrefs::instance()->mFreeBusyRetrievePassword ); } - return tqreplaceVariablesURL( cachedURL, email ); + return replaceVariablesURL( cachedURL, email ); } // Try with the url configurated by preferred email in kaddressbook - KABC::Addressee::List list= KABC::StdAddressBook::self( true )->tqfindByEmail( email ); + KABC::Addressee::List list= KABC::StdAddressBook::self( true )->findByEmail( email ); KABC::Addressee::List::Iterator it; TQString pref; for ( it = list.begin(); it != list.end(); ++it ) { @@ -509,7 +509,7 @@ KURL FreeBusyManager::freeBusyUrl( const TQString &email ) if ( !url.isEmpty() ) { kdDebug(5850) << "FreeBusyManager::freeBusyUrl():" << "Taken url from preferred email:" << url << endl; - return tqreplaceVariablesURL( KURL( url ), email ); + return replaceVariablesURL( KURL( url ), email ); } } } @@ -522,7 +522,7 @@ KURL FreeBusyManager::freeBusyUrl( const TQString &email ) // Sanity check: Don't download if it's not a correct email // address (this also avoids downloading for "(empty email)"). - int emailpos = email.find( '@' ); + int emailpos = email.tqfind( '@' ); if( emailpos == -1 ) { return KURL(); } @@ -549,8 +549,8 @@ KURL FreeBusyManager::freeBusyUrl( const TQString &email ) } if ( sourceURL.url().tqcontains( TQRegExp( "\\.[xiv]fb$" ) ) ) { // user specified a fullpath - // do variable string tqreplacements to the URL (MS Outlook style) - KURL fullpathURL = tqreplaceVariablesURL( sourceURL, email ); + // do variable string replacements to the URL (MS Outlook style) + KURL fullpathURL = replaceVariablesURL( sourceURL, email ); // This should work with anything thrown at it, not just Kolab // Notice that Kolab URLs are just entered as the base address, e.g. http://server.com/mykolab/ @@ -584,7 +584,7 @@ KURL FreeBusyManager::freeBusyUrl( const TQString &email ) for ( ext = extensions.constBegin(); ext != extensions.constEnd(); ++ext ) { // build a url for this extension sourceURL = KOPrefs::instance()->mFreeBusyRetrieveUrl; - KURL dirURL = tqreplaceVariablesURL( sourceURL, email ); + KURL dirURL = replaceVariablesURL( sourceURL, email ); if ( KOPrefs::instance()->mFreeBusyFullDomainRetrieval ) { dirURL.addPath( email + '.' + (*ext) ); } else { |