1 files changed, 17 insertions, 17 deletions

diff --git a/korganizer/freebusymanager.cpp b/korganizer/freebusymanager.cpp
index 5309050ec..7093b5f01 100644
--- a/korganizer/freebusymanager.cpp
+++ b/korganizer/freebusymanager.cpp
@@ -252,12 +252,12 @@ void FreeBusyManager::publishFreeBusy()
 
 //   // Substitute %u and %d [FIXME]
 //   TQString defaultEmail = KOCore()::self()->email();
-//   int emailpos = defaultEmail.tqfind( '@' );
+//   int emailpos = defaultEmail.find( '@' );
 //   if (emailpos != -1) {
 //     const TQString emailName = defaultEmail.left( emailpos );
 //     const TQString emailHost = defaultEmail.mid( emailpos + 1 );
-//     targetURL = targetURL.url().tqreplace("%25u", emailName, true);
-//     targetURL = targetURL.url().tqreplace("%25d", emailHost, true);
+//     targetURL = targetURL.url().replace("%25u", emailName, true);
+//     targetURL = targetURL.url().replace("%25d", emailHost, true);
 //   }
   targetURL.setUser( KOPrefs::instance()->mFreeBusyPublishUser );
   targetURL.setPass( KOPrefs::instance()->mFreeBusyPublishPassword );
@@ -280,7 +280,7 @@ void FreeBusyManager::publishFreeBusy()
 
   // We need to massage the list a bit so that Outlook understands
   // it.
-  messageText = messageText.tqreplace( TQRegExp( "ORGANIZER\\s*:MAILTO:" ),
+  messageText = messageText.replace( TQRegExp( "ORGANIZER\\s*:MAILTO:" ),
                                      "ORGANIZER:" );
 
   // Create a local temp file and save the message to it
@@ -292,7 +292,7 @@ void FreeBusyManager::publishFreeBusy()
 
 #if 0
     TQString defaultEmail = KOCore()::self()->email();
-    TQString emailHost = defaultEmail.mid( defaultEmail.tqfind( '@' ) + 1 );
+    TQString emailHost = defaultEmail.mid( defaultEmail.find( '@' ) + 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.tqfind('@');
+      int at = fbname.find('@');
       if( at > 1 && fbname.length() > (uint)at ) {
 	fbname = fbname.left(at);
       }
@@ -318,7 +318,7 @@ void FreeBusyManager::publishFreeBusy()
       targetURL.setPass( KOPrefs::instance()->mPublishPassword );
     } else {
       // we use something else
-      targetURL = KOPrefs::instance()->mPublishAnyURL.tqreplace( "%SERVER%",
+      targetURL = KOPrefs::instance()->mPublishAnyURL.replace( "%SERVER%",
                                                                emailHost );
       targetURL.setUser( KOPrefs::instance()->mPublishUserName );
       targetURL.setPass( KOPrefs::instance()->mPublishPassword );
@@ -441,16 +441,16 @@ void FreeBusyManager::cancelRetrieval()
 KURL replaceVariablesURL( const KURL &url, const TQString &email )
 {
   TQString emailName, emailHost;
-  int emailpos = email.tqfind( '@' );
+  int emailpos = email.find( '@' );
   if( emailpos >= 0 ) {
     emailName = email.left( emailpos );
     emailHost = email.mid( emailpos + 1 );
   }
 
   TQString saveStr = url.path();
-  saveStr.tqreplace( TQRegExp( "%[Ee][Mm][Aa][Ii][Ll]%" ), email );
-  saveStr.tqreplace( TQRegExp( "%[Nn][Aa][Mm][Ee]%" ), emailName );
-  saveStr.tqreplace( TQRegExp( "%[Ss][Ee][Rr][Vv][Ee][Rr]%" ), emailHost );
+  saveStr.replace( TQRegExp( "%[Ee][Mm][Aa][Ii][Ll]%" ), email );
+  saveStr.replace( TQRegExp( "%[Nn][Aa][Mm][Ee]%" ), emailName );
+  saveStr.replace( TQRegExp( "%[Ss][Ee][Rr][Vv][Ee][Rr]%" ), emailHost );
 
   KURL retUrl( url );
   retUrl.setPath( saveStr );
@@ -468,7 +468,7 @@ bool fbExists( const KURL &url )
   TQByteArray data;
   if ( KIO::NetAccess::synchronousRun( job, 0, &data ) ) {
     TQString dataStr ( data );
-    if ( dataStr.tqcontains( "BEGIN:VCALENDAR" ) ) {
+    if ( dataStr.contains( "BEGIN:VCALENDAR" ) ) {
       return true;
     }
   }
@@ -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.tqfind( '@' );
+  int emailpos = email.find( '@' );
   if( emailpos == -1 ) {
     return KURL();
   }
@@ -548,7 +548,7 @@ KURL FreeBusyManager::freeBusyUrl( const TQString &email )
     }
   }
 
-  if ( sourceURL.url().tqcontains( TQRegExp( "\\.[xiv]fb$" ) ) ) { // user specified a fullpath
+  if ( sourceURL.url().contains( TQRegExp( "\\.[xiv]fb$" ) ) ) { // user specified a fullpath
     // do variable string replacements to the URL (MS Outlook style)
     KURL fullpathURL = replaceVariablesURL( sourceURL, email );
 
@@ -557,10 +557,10 @@ KURL FreeBusyManager::freeBusyUrl( const TQString &email )
     // This means that if the trailing slash is not entered, we can treat this as a custom, non-Kolab URL!
     // In that case, just pass it on through with substitution for %u and %d
     // TODO: May want an explicit configuration option in kogroupwareprefspage.ui for this
-    if ((fullpathURL.url().tqendsWith("/", true) == false) || (fullpathURL.url().tqcontains("%25u", true)) || (fullpathURL.url().tqcontains("%25d", true))) {
+    if ((fullpathURL.url().tqendsWith("/", true) == false) || (fullpathURL.url().contains("%25u", true)) || (fullpathURL.url().contains("%25d", true))) {
       // A generic URL, substitute %u and %d
-      fullpathURL = fullpathURL.url().tqreplace("%25u", emailName, true);
-      fullpathURL = fullpathURL.url().tqreplace("%25d", emailHost, true);
+      fullpathURL = fullpathURL.url().replace("%25u", emailName, true);
+      fullpathURL = fullpathURL.url().replace("%25d", emailHost, true);
     }
     else {
       // This is (probably) a Kolab URL!