Rename old tq methods that no longer need a unique name

1 files changed, 7 insertions, 7 deletions

diff --git a/korganizer/freebusymanager.cpp b/korganizer/freebusymanager.cpp
index ec32367b1..62c4e6ef3 100644
--- a/korganizer/freebusymanager.cpp
+++ b/korganizer/freebusymanager.cpp
@@ -80,7 +80,7 @@ FreeBusyDownloadJob::FreeBusyDownloadJob( const TQString &email, const KURL &url
   KIO::TransferJob *job = KIO::get( url, false, false );
   //pass the mainwindow to the job so any prompts are active
   KOrg::MainWindow *korg = ActionManager::findInstance( KURL() );
-  job->setWindow( korg->tqtopLevelWidget() );
+  job->setWindow( korg->topLevelWidget() );
 
   connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
            TQT_SLOT( slotResult( KIO::Job * ) ) );
@@ -140,7 +140,7 @@ void FreeBusyManager::setCalendar( KCal::Calendar *c )
 
 KCal::FreeBusy *FreeBusyManager::ownerFreeBusy()
 {
-  TQDateTime start = TQDateTime::tqcurrentDateTime();
+  TQDateTime start = TQDateTime::currentDateTime();
   TQDateTime end = start.addDays( KOPrefs::instance()->mFreeBusyPublishDays );
 
   FreeBusy *freebusy = new FreeBusy( mCalendar, start, end );
@@ -176,13 +176,13 @@ void FreeBusyManager::slotPerhapsUploadFB()
     // A timer is already running, so we don't need to do anything
     return;
 
-  int now = static_cast<int>( TQDateTime::tqcurrentDateTime().toTime_t() );
+  int now = static_cast<int>( TQDateTime::currentDateTime().toTime_t() );
   int eta = static_cast<int>( mNextUploadTime.toTime_t() ) - now;
 
   if( !mUploadingFreeBusy ) {
     // Not currently uploading
     if( mNextUploadTime.isNull() ||
-        TQDateTime::tqcurrentDateTime() > mNextUploadTime ) {
+        TQDateTime::currentDateTime() > mNextUploadTime ) {
       // No uploading have been done in this session, or delay time is over
       publishFreeBusy();
       return;
@@ -271,7 +271,7 @@ void FreeBusyManager::publishFreeBusy()
   }
 
   // Save the time of the next free/busy uploading
-  mNextUploadTime = TQDateTime::tqcurrentDateTime();
+  mNextUploadTime = TQDateTime::currentDateTime();
   if( KOPrefs::instance()->mFreeBusyPublishDelay > 0 )
     mNextUploadTime = mNextUploadTime.addSecs(
         KOPrefs::instance()->mFreeBusyPublishDelay * 60 );
@@ -337,7 +337,7 @@ void FreeBusyManager::publishFreeBusy()
                                      false /*don't show progress info*/ );
     //pass the mainwindow to the job so any prompts are active
     KOrg::MainWindow *korg = ActionManager::findInstance( KURL() );
-    job->setWindow( korg->tqtopLevelWidget() );
+    job->setWindow( korg->topLevelWidget() );
 
     connect( job, TQT_SIGNAL( result( KIO::Job * ) ),
              TQT_SLOT( slotUploadFreeBusyResult( KIO::Job * ) ) );
@@ -557,7 +557,7 @@ 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().contains("%25u", true)) || (fullpathURL.url().contains("%25d", true))) {
+    if ((fullpathURL.url().endsWith("/", true) == false) || (fullpathURL.url().contains("%25u", true)) || (fullpathURL.url().contains("%25d", true))) {
       // A generic URL, substitute %u and %d
       fullpathURL = fullpathURL.url().replace("%25u", emailName, true);
       fullpathURL = fullpathURL.url().replace("%25d", emailHost, true);