Rename old tq methods that no longer need a unique name

84 files changed, 269 insertions, 269 deletions

diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp
index 7a27df73..1d61545f 100644
--- a/korganizer/actionmanager.cpp
+++ b/korganizer/actionmanager.cpp
@@ -723,7 +723,7 @@ void ActionManager::file_open( const KURL &url )
   // is that URL already opened somewhere else? Activate that window
   KOrg::MainWindow *korg=ActionManager::findInstance( url );
   if ( ( 0 != korg )&&( korg != mMainWindow ) ) {
-    KWin::activateWindow( korg->tqtopLevelWidget()->winId() );
+    KWin::activateWindow( korg->topLevelWidget()->winId() );
     return;
   }
 
@@ -745,7 +745,7 @@ void ActionManager::file_icalimport()
   TQString progPath;
   KTempFile tmpfn;
 
-  TQString homeDir = TQDir::homeDirPath() + TQString::tqfromLatin1( "/.calendar" );
+  TQString homeDir = TQDir::homeDirPath() + TQString::fromLatin1( "/.calendar" );
 
   if ( !TQFile::exists( homeDir ) ) {
     KMessageBox::error( dialogParent(),
@@ -1043,9 +1043,9 @@ void ActionManager::exportHTML()
   settings.readConfig();
 
   TQDate qd1;
-  qd1 = TQDate::tqcurrentDate();
+  qd1 = TQDate::currentDate();
   TQDate qd2;
-  qd2 = TQDate::tqcurrentDate();
+  qd2 = TQDate::currentDate();
   if ( settings.monthView() )
     qd2.addMonths( 1 );
   else
@@ -2011,7 +2011,7 @@ void ActionManager::importCalendar( const KURL &url )
   }
 
   PreviewDialog *dialog;
-  dialog = new PreviewDialog( url, mMainWindow->tqtopLevelWidget() );
+  dialog = new PreviewDialog( url, mMainWindow->topLevelWidget() );
   connect( dialog, TQT_SIGNAL( dialogFinished( PreviewDialog * ) ),
            TQT_SLOT( slotPreviewDialogFinished( PreviewDialog * ) ) );
   connect( dialog, TQT_SIGNAL( openURL( const KURL &, bool ) ),
@@ -2104,10 +2104,10 @@ bool ActionManager::handleCommandLine()
     ret = false;
   } else if ( args->count() <= 0 ) {
     // No filenames given => all other args are meaningless, show main Window
-    mainWindow->tqtopLevelWidget()->show();
+    mainWindow->topLevelWidget()->show();
   } else if ( !args->isSet( "open" ) ) {
     // Import, merge, or ask => we need the resource calendar window anyway.
-    mainWindow->tqtopLevelWidget()->show();
+    mainWindow->topLevelWidget()->show();
 
     // Check for import, merge or ask
     if ( args->isSet( "import" ) ) {
@@ -2130,7 +2130,7 @@ bool ActionManager::handleCommandLine()
 
 TQWidget *ActionManager::dialogParent()
 {
-  return mCalendarView->tqtopLevelWidget();
+  return mCalendarView->topLevelWidget();
 }
 
 #include "actionmanager.moc"
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 5b6d9492..56f3007e 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -177,7 +177,7 @@ CalendarView::CalendarView( TQWidget *parent, const char *name )
 
   mDateNavigatorContainer = new KDateNavigator( leftFrame, true,
                                        "CalendarView::DateNavigator",
-                                       TQDate::tqcurrentDate() );
+                                       TQDate::currentDate() );
   mTodoList = new KOTodoView( CalendarNull::self(), leftFrame, "todolist" );
 
   mEventViewer = new KOEventViewer ( CalendarNull::self(), leftFrame, "EventViewer" );
@@ -185,7 +185,7 @@ CalendarView::CalendarView( TQWidget *parent, const char *name )
   TQWidget *rightBox = new TQWidget( mainBox );
   TQBoxLayout *rightLayout = new TQVBoxLayout( rightBox );
 
-  mNavigatorBar = new NavigatorBar( TQDate::tqcurrentDate(), rightBox );
+  mNavigatorBar = new NavigatorBar( TQDate::currentDate(), rightBox );
   rightLayout->addWidget( mNavigatorBar );
 
   mRightFrame = new TQWidgetStack( rightBox );
@@ -195,7 +195,7 @@ CalendarView::CalendarView( TQWidget *parent, const char *name )
 
   if ( KOPrefs::instance()->mVerticalScreen ) {
     // mTodoList->setFixedHeight( 60 );
-    mTodoList->setFixedHeight( mDateNavigatorContainer->tqsizeHint().height() );
+    mTodoList->setFixedHeight( mDateNavigatorContainer->sizeHint().height() );
   }
 #endif
 
@@ -387,7 +387,7 @@ TQDate CalendarView::activeDate( bool fallbackToToday )
 
   // When all else fails, use the navigator start date, or today.
   if ( fallbackToToday ) {
-    return TQDate::tqcurrentDate();
+    return TQDate::currentDate();
   } else {
     return mDateNavigator->selectedDates().first();
   }
@@ -547,7 +547,7 @@ void CalendarView::readSettings()
 
   TQValueList<int> sizes = config->readIntListEntry( "Separator1" );
   if ( sizes.count() != 2 ) {
-    sizes << mDateNavigatorContainer->tqminimumSizeHint().width();
+    sizes << mDateNavigatorContainer->minimumSizeHint().width();
     sizes << 300;
   }
   mPanner->setSizes( sizes );
@@ -779,14 +779,14 @@ void CalendarView::incidenceChanged( Incidence *oldIncidence,
         TQString description = i18n( "To-do completed: %1 (%2)" ).tqarg(
           newIncidence->summary() ).tqarg( timeStr );
 
-        Journal::List journals = calendar()->journals( TQDate::tqcurrentDate() );
+        Journal::List journals = calendar()->journals( TQDate::currentDate() );
         Journal *journal;
 
         if ( journals.isEmpty() ) {
           journal = new Journal();
-          journal->setDtStart( TQDateTime::tqcurrentDateTime() );
+          journal->setDtStart( TQDateTime::currentDateTime() );
 
-          TQString dateStr = KGlobal::locale()->formatDate( TQDate::tqcurrentDate() );
+          TQString dateStr = KGlobal::locale()->formatDate( TQDate::currentDate() );
           journal->setSummary( i18n("Journal of %1").tqarg( dateStr ) );
           journal->setDescription( description );
 
@@ -1248,7 +1248,7 @@ void CalendarView::newTodo( ResourceCalendar *res, const TQString &subRes )
   todoEditor->setResource( res, subRes );
   if ( mViewManager->currentView()->isEventView() ) {
     dtDue.setDate( mDateNavigator->selectedDates().first() );
-    TQDateTime dtDummy = TQDateTime::tqcurrentDateTime();
+    TQDateTime dtDummy = TQDateTime::currentDateTime();
     mViewManager->currentView()->eventDurationHint( dtDue, dtDummy, allday );
     todoEditor->setDates( dtDue, allday );
   }
@@ -1669,7 +1669,7 @@ void CalendarView::schedule_forward( Incidence *incidence )
 
 void CalendarView::mailFreeBusy( int daysToPublish )
 {
-  TQDateTime start = TQDateTime::tqcurrentDateTime();
+  TQDateTime start = TQDateTime::currentDateTime();
   TQDateTime end = start.addDays(daysToPublish);
 
   FreeBusy *freebusy = new FreeBusy(mCalendar, start, end);
@@ -1865,7 +1865,7 @@ void CalendarView::eventUpdated(Incidence *)
 void CalendarView::adaptNavigationUnits()
 {
   if (mViewManager->currentView()->isEventView()) {
-    int days = mViewManager->currentView()->tqcurrentDateCount();
+    int days = mViewManager->currentView()->currentDateCount();
     if (days == 1) {
       emit changeNavStringPrev(i18n("&Previous Day"));
       emit changeNavStringNext(i18n("&Next Day"));
diff --git a/korganizer/datechecker.cpp b/korganizer/datechecker.cpp
index c311743e..7d7cdedb 100644
--- a/korganizer/datechecker.cpp
+++ b/korganizer/datechecker.cpp
@@ -59,14 +59,14 @@ void DateChecker::enableRollover( RolloverType r )
                  TQT_SLOT( possiblyPastMidnight() ) );
       }
       mUpdateTimer->start( 0, true );
-      mLastDayChecked = TQDate::tqcurrentDate();
+      mLastDayChecked = TQDate::currentDate();
   }
   mUpdateRollover = r;
 }
 
 void DateChecker::passedMidnight()
 {
-  TQDate today = TQDate::tqcurrentDate();
+  TQDate today = TQDate::currentDate();
 
   if ( today.month() != mLastDayChecked.month() ) {
      if ( mUpdateRollover == FollowMonth ) {
@@ -78,9 +78,9 @@ void DateChecker::passedMidnight()
 
 void DateChecker::possiblyPastMidnight()
 {
-  if ( mLastDayChecked != TQDate::tqcurrentDate() ) {
+  if ( mLastDayChecked != TQDate::currentDate() ) {
     passedMidnight();
-    mLastDayChecked = TQDate::tqcurrentDate();
+    mLastDayChecked = TQDate::currentDate();
   }
   // Set the timer to go off 1 second after midnight
   // or after 8 minutes, whichever comes first.
diff --git a/korganizer/datenavigator.cpp b/korganizer/datenavigator.cpp
index a792b841..bb4206b0 100644
--- a/korganizer/datenavigator.cpp
+++ b/korganizer/datenavigator.cpp
@@ -37,7 +37,7 @@ using namespace KCal;
 DateNavigator::DateNavigator( TQObject *parent, const char *name )
   : TQObject( parent, name )
 {
-  mSelectedDates.append( TQDate::tqcurrentDate() );
+  mSelectedDates.append( TQDate::currentDate() );
 }
 
 DateNavigator::~DateNavigator()
@@ -69,7 +69,7 @@ void DateNavigator::selectDate( const TQDate &date )
 
   if ( !d.isValid() ) {
     kdDebug(5850) << "DateNavigator::selectDates(TQDate): an invalid date was passed as a parameter!" << endl;
-    d = TQDate::tqcurrentDate();
+    d = TQDate::currentDate();
   }
 
   mSelectedDates.clear();
@@ -143,10 +143,10 @@ void DateNavigator::selectWorkWeek( const TQDate &d )
 
   int dayOfWeek = KOGlobals::self()->calendarSystem()->dayOfWeek( d );
 
-  TQDate tqcurrentDate = d.addDays( weekStart - dayOfWeek );
+  TQDate currentDate = d.addDays( weekStart - dayOfWeek );
 
   if ( weekStart != 1 && dayOfWeek < weekStart ) {
-    tqcurrentDate = tqcurrentDate.addDays( -7 );
+    currentDate = currentDate.addDays( -7 );
   }
 
   mSelectedDates.clear();
@@ -154,7 +154,7 @@ void DateNavigator::selectWorkWeek( const TQDate &d )
 
   for ( int i = 0; i < 7; ++i ) {
     if( (1<< ((i + weekStart + 6) % 7)) & (mask) ) {
-	mSelectedDates.append( tqcurrentDate.addDays(i) );
+	mSelectedDates.append( currentDate.addDays(i) );
     }
   }
 
@@ -163,7 +163,7 @@ void DateNavigator::selectWorkWeek( const TQDate &d )
 
 void DateNavigator::selectToday()
 {
-  TQDate d = TQDate::tqcurrentDate();
+  TQDate d = TQDate::currentDate();
 
   int dateCount = mSelectedDates.count();
 
diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp
index 5504e8f6..dd3f8a1a 100644
--- a/korganizer/datenavigatorcontainer.cpp
+++ b/korganizer/datenavigatorcontainer.cpp
@@ -207,18 +207,18 @@ void DateNavigatorContainer::resizeEvent( TQResizeEvent * )
 #if 0
   kdDebug(5850) << "DateNavigatorContainer::resizeEvent()" << endl;
   kdDebug(5850) << "  CURRENT SIZE: " << size() << endl;
-  kdDebug(5850) << "  MINIMUM SIZEHINT: " << tqminimumSizeHint() << endl;
-  kdDebug(5850) << "  SIZEHINT: " << tqsizeHint() << endl;
-  kdDebug(5850) << "  MINIMUM SIZE: " << tqminimumSize() << endl;
+  kdDebug(5850) << "  MINIMUM SIZEHINT: " << minimumSizeHint() << endl;
+  kdDebug(5850) << "  SIZEHINT: " << sizeHint() << endl;
+  kdDebug(5850) << "  MINIMUM SIZE: " << minimumSize() << endl;
 #endif
   TQTimer::singleShot( 0, this, TQT_SLOT( resizeAllContents() ) );
 }
 
 void DateNavigatorContainer::resizeAllContents()
 {
-  TQSize minSize = mNavigatorView->tqminimumSizeHint();
+  TQSize minSize = mNavigatorView->minimumSizeHint();
 
-//  kdDebug(5850) << "  NAVIGATORVIEW tqminimumSizeHint: " << minSize << endl;
+//  kdDebug(5850) << "  NAVIGATORVIEW minimumSizeHint: " << minSize << endl;
 
   int margin = KDialog::spacingHint();
   int verticalCount = ( size().height() - margin*2 ) / minSize.height();
@@ -286,16 +286,16 @@ void DateNavigatorContainer::resizeAllContents()
   }
 }
 
-TQSize DateNavigatorContainer::tqminimumSizeHint() const
+TQSize DateNavigatorContainer::minimumSizeHint() const
 {
   int margin = KDialog::spacingHint() * 2;
-  return mNavigatorView->tqminimumSizeHint() + TQSize( margin, margin );
+  return mNavigatorView->minimumSizeHint() + TQSize( margin, margin );
 }
 
-TQSize DateNavigatorContainer::tqsizeHint() const
+TQSize DateNavigatorContainer::sizeHint() const
 {
   int margin = KDialog::spacingHint() * 2;
-  return mNavigatorView->tqsizeHint() + TQSize( margin, margin );
+  return mNavigatorView->sizeHint() + TQSize( margin, margin );
 }
 
 void DateNavigatorContainer::goNextMonth()
diff --git a/korganizer/datenavigatorcontainer.h b/korganizer/datenavigatorcontainer.h
index ae8f22a2..cd0b98e9 100644
--- a/korganizer/datenavigatorcontainer.h
+++ b/korganizer/datenavigatorcontainer.h
@@ -42,8 +42,8 @@ class DateNavigatorContainer: public TQFrame
     */
     void setCalendar( Calendar * );
 
-    TQSize tqminimumSizeHint() const;
-    TQSize tqsizeHint() const;
+    TQSize minimumSizeHint() const;
+    TQSize sizeHint() const;
     void setUpdateNeeded();
   public slots:
     /**
diff --git a/korganizer/eventarchiver.cpp b/korganizer/eventarchiver.cpp
index ac0cef04..51e25517 100644
--- a/korganizer/eventarchiver.cpp
+++ b/korganizer/eventarchiver.cpp
@@ -52,7 +52,7 @@ void EventArchiver::runOnce( Calendar* calendar, const TQDate& limitDate, TQWidg
 
 void EventArchiver::runAuto( Calendar* calendar, TQWidget* widget, bool withGUI )
 {
-  TQDate limitDate( TQDate::tqcurrentDate() );
+  TQDate limitDate( TQDate::currentDate() );
   int expiryTime = KOPrefs::instance()->mExpiryTime;
   switch (KOPrefs::instance()->mExpiryUnit) {
   case KOPrefs::UnitDays: // Days
diff --git a/korganizer/filteredit_base.ui b/korganizer/filteredit_base.ui
index f1bdc790..bfab5207 100644
--- a/korganizer/filteredit_base.ui
+++ b/korganizer/filteredit_base.ui
@@ -111,7 +111,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>15</width>
                                     <height>20</height>
@@ -165,7 +165,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>21</height>
@@ -220,7 +220,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>110</height>
diff --git a/korganizer/freebusymanager.cpp b/korganizer/freebusymanager.cpp
index ec32367b..62c4e6ef 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);
diff --git a/korganizer/incidencechanger.cpp b/korganizer/incidencechanger.cpp
index 0cf69fc2..c3517e75 100644
--- a/korganizer/incidencechanger.cpp
+++ b/korganizer/incidencechanger.cpp
@@ -132,7 +132,7 @@ kdDebug(5850)<<"IncidenceChanger::deleteIncidence for incidence \""<<incidence->
           if ( me->status() == KCal::Attendee::Accepted || me->status() == KCal::Attendee::Delegated )
             notifyOrganizer = true;
           Attendee *newMe = new Attendee( *me );
-          newMe->setqStatus( KCal::Attendee::Declined );
+          newMe->seStatus( KCal::Attendee::Declined );
           tmp->clearAttendees();
           tmp->addAttendee( newMe );
           break;
diff --git a/korganizer/interfaces/korganizer/baseview.h b/korganizer/interfaces/korganizer/baseview.h
index b1f6afa1..2a7fc375 100644
--- a/korganizer/interfaces/korganizer/baseview.h
+++ b/korganizer/interfaces/korganizer/baseview.h
@@ -138,7 +138,7 @@ class KDE_EXPORT BaseView : public TQWidget
     /**
       Return number of currently shown dates. A return value of 0 means no idea.
     */
-    virtual int tqcurrentDateCount() = 0;
+    virtual int currentDateCount() = 0;
 
     /** Return if this view is a view for displaying events. */
     virtual bool isEventView() { return false; }
diff --git a/korganizer/interfaces/korganizer/mainwindow.h b/korganizer/interfaces/korganizer/mainwindow.h
index 8c98dcd0..dcda1bee 100644
--- a/korganizer/interfaces/korganizer/mainwindow.h
+++ b/korganizer/interfaces/korganizer/mainwindow.h
@@ -68,7 +68,7 @@ class MainWindow
     /**
       Return widget whcih represents this main window.
     */
-    virtual TQWidget *tqtopLevelWidget() = 0;
+    virtual TQWidget *topLevelWidget() = 0;
     /**
       Return ActionManager of this main window.
     */
diff --git a/korganizer/interfaces/korganizer/part.h b/korganizer/interfaces/korganizer/part.h
index 50c765d6..35e426d8 100644
--- a/korganizer/interfaces/korganizer/part.h
+++ b/korganizer/interfaces/korganizer/part.h
@@ -39,7 +39,7 @@ class Part : public KParts::Part
     typedef TQPtrList<Part> List;
 
     Part( MainWindow *parent, const char *name )
-      : KParts::Part( parent?(TQT_TQOBJECT(parent->tqtopLevelWidget())):0, name ), mMainWindow( parent ) {}
+      : KParts::Part( parent?(TQT_TQOBJECT(parent->topLevelWidget())):0, name ), mMainWindow( parent ) {}
 
     virtual ~Part() {}
 
diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp
index cf93a58f..a9660cea 100644
--- a/korganizer/journalentry.cpp
+++ b/korganizer/journalentry.cpp
@@ -74,7 +74,7 @@ JournalDateEntry::JournalDateEntry( Calendar *calendar, TQWidget *parent ) :
 
   mTitle = new JournalTitleLable( this );
   mTitle->setMargin(2);
-  mTitle->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
+  mTitle->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
   connect( mTitle, TQT_SIGNAL( linkClicked( const TQString & ) ),
            this, TQT_SLOT( emitNewJournal() ) );
 }
@@ -213,7 +213,7 @@ JournalEntry::JournalEntry( Journal* j, TQWidget *parent ) :
   mDeleteButton = new TQToolButton( this, "deleteButton" );
   TQPixmap pix = KOGlobals::self()->smallIcon( "editdelete" );
   mDeleteButton->setPixmap( pix );
-  mDeleteButton->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+  mDeleteButton->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
   TQToolTip::add( mDeleteButton, i18n("Delete this journal entry") );
   TQWhatsThis::add( mDeleteButton, i18n("Delete this journal entry") );
   mLayout->addWidget( mDeleteButton, 0, 4 );
@@ -221,7 +221,7 @@ JournalEntry::JournalEntry( Journal* j, TQWidget *parent ) :
 
   mEditButton = new TQToolButton( this, "editButton" );
   mEditButton->setPixmap( KOGlobals::self()->smallIcon( "edit" ) );
-  mEditButton->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+  mEditButton->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
   TQToolTip::add( mEditButton, i18n("Edit this journal entry") );
   TQWhatsThis::add( mEditButton, i18n("Opens an editor dialog for this journal entry") );
   mLayout->addWidget( mEditButton, 0, 5 );
@@ -230,7 +230,7 @@ JournalEntry::JournalEntry( Journal* j, TQWidget *parent ) :
 #ifndef KORG_NOPRINTER
   mPrintButton = new TQToolButton( this, "printButton" );
   mPrintButton->setPixmap( KOGlobals::self()->smallIcon( "printer1" ) );
-  mPrintButton->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+  mPrintButton->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
   TQToolTip::add( mPrintButton, i18n("Print this journal entry") );
   TQWhatsThis::add( mPrintButton, i18n("Opens the print dialog for this journal entry") );
   mLayout->addWidget( mPrintButton, 0, 6 );
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp
index d47b7974..c97ec9f7 100644
--- a/korganizer/kdatenavigator.cpp
+++ b/korganizer/kdatenavigator.cpp
@@ -67,7 +67,7 @@ KDateNavigator::KDateNavigator( TQWidget *parent, const char *name )
   for( i = 0; i < 7; i++ ) {
     mHeadings[i] = new TQLabel( this );
     mHeadings[i]->setFont( TQFont( generalFont, 10, TQFont::Bold ) );
-    mHeadings[i]->tqsetAlignment( AlignCenter );
+    mHeadings[i]->setAlignment( AlignCenter );
 
     topLayout->addWidget( mHeadings[i], 1, i + 1 );
   }
@@ -75,7 +75,7 @@ KDateNavigator::KDateNavigator( TQWidget *parent, const char *name )
   // Create the weeknumber labels
   for( i = 0; i < 6; i++ ) {
     mWeeknos[i] = new TQLabel( this );
-    mWeeknos[i]->tqsetAlignment( AlignCenter );
+    mWeeknos[i]->setAlignment( AlignCenter );
     mWeeknos[i]->setFont( TQFont( generalFont, 10 ) );
     mWeeknos[i]->installEventFilter( this );
 
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index 5600682f..a05a82d2 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -73,7 +73,7 @@ MarcusBains::MarcusBains(KOAgenda *_agenda,const char *name )
   minutes->start(0, true);
 
   mTimeBox = new TQLabel(this);
-  mTimeBox->tqsetAlignment(TQt::AlignRight | TQt::AlignBottom);
+  mTimeBox->setAlignment(TQt::AlignRight | TQt::AlignBottom);
   TQPalette pal = mTimeBox->palette();
   pal.setColor(TQColorGroup::Foreground, TQt::red);
   mTimeBox->setPalette(pal);
@@ -92,13 +92,13 @@ MarcusBains::~MarcusBains()
 
 int MarcusBains::todayColumn()
 {
-  TQDate tqcurrentDate = TQDate::tqcurrentDate();
+  TQDate currentDate = TQDate::currentDate();
 
   DateList dateList = agenda->dateList();
   DateList::ConstIterator it;
   int col = 0;
   for(it = dateList.begin(); it != dateList.end(); ++it) {
-    if((*it) == tqcurrentDate)
+    if((*it) == currentDate)
       return KOGlobals::self()->reverseLayout() ?
              agenda->columns() - 1 - col : col;
     ++col;
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index 124102b0..b8cd33fd 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -769,7 +769,7 @@ void KOAgendaItem::paintEvent( TQPaintEvent *ev )
     if ( static_cast<Todo*>(mIncidence)->isOverdue() )
       bgColor = KOPrefs::instance()->todoOverdueColor();
     else if ( static_cast<Todo*>(mIncidence)->dtDue().date() ==
-              TQDateTime::tqcurrentDateTime().date() )
+              TQDateTime::currentDateTime().date() )
       bgColor = KOPrefs::instance()->todoDueTodayColor();
   }
 
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index ba565a8d..7b48d9cc 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -137,7 +137,7 @@ KOAlternateLabel::KOAlternateLabel(const TQString &shortlabel, const TQString &l
   : TQLabel(parent, name), mTextTypeFixed(false), mShortText(shortlabel),
     mLongText(longlabel), mExtensiveText(extensivelabel)
 {
-  tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+  setSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
   if (mExtensiveText.isEmpty()) mExtensiveText = mLongText;
   squeezeTextToLabel();
 }
@@ -235,9 +235,9 @@ void KOAlternateLabel::resizeEvent( TQResizeEvent * )
   squeezeTextToLabel();
 }
 
-TQSize KOAlternateLabel::tqminimumSizeHint() const
+TQSize KOAlternateLabel::minimumSizeHint() const
 {
-  TQSize sh = TQLabel::tqminimumSizeHint();
+  TQSize sh = TQLabel::minimumSizeHint();
   sh.setWidth(-1);
   return sh;
 }
@@ -258,7 +258,7 @@ KOAgendaView::KOAgendaView( Calendar *cal,
   mPendingChanges( true ),
   mAreDatesInitialized( false )
 {
-  mSelectedDates.append(TQDate::tqcurrentDate());
+  mSelectedDates.append(TQDate::currentDate());
 
   mLayoutDayLabels = 0;
   mDayLabelsFrame = 0;
@@ -313,12 +313,12 @@ KOAgendaView::KOAgendaView( Calendar *cal,
   if ( KOPrefs::instance()->compactDialogs() ) {
     mExpandButton = new TQPushButton(mDummyAllDayLeft);
     mExpandButton->setPixmap( mNotExpandedPixmap );
-    mExpandButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed,
+    mExpandButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed,
                                   TQSizePolicy::Fixed ) );
     connect( mExpandButton, TQT_SIGNAL( clicked() ), TQT_SIGNAL( toggleExpand() ) );
   } else {
     TQLabel *label = new TQLabel( i18n("All Day"), mDummyAllDayLeft );
-    label->tqsetAlignment( TQt::AlignRight | TQt::AlignVCenter | TQt::WordBreak );
+    label->setAlignment( TQt::AlignRight | TQt::AlignVCenter | TQt::WordBreak );
   }
 
   mAllDayAgenda = new KOAgenda( 1, calendarView, mAllDayFrame );
@@ -635,8 +635,8 @@ void KOAgendaView::createDayLabels( bool force )
                                                       longstr, veryLongStr, mDayLabels);
     dayLabel->useShortText(); // will be recalculated in updateDayLabelSizes() anyway
     dayLabel->setMinimumWidth(1);
-    dayLabel->tqsetAlignment(TQLabel::AlignHCenter);
-    if (date == TQDate::tqcurrentDate()) {
+    dayLabel->setAlignment(TQLabel::AlignHCenter);
+    if (date == TQDate::currentDate()) {
       TQFont font = dayLabel->font();
       font.setBold(true);
       dayLabel->setFont(font);
@@ -651,7 +651,7 @@ void KOAgendaView::createDayLabels( bool force )
       // use a KOAlternateLabel so when the text doesn't fit any more a tooltip is used
       KOAlternateLabel*label = new KOAlternateLabel( (*textit), (*textit), TQString(), mDayLabels );
       label->setMinimumWidth(1);
-      label->tqsetAlignment(AlignCenter);
+      label->setAlignment(AlignCenter);
       dayLayout->addWidget(label);
     }
 
@@ -664,7 +664,7 @@ void KOAgendaView::createDayLabels( bool force )
         // use a KOAlternateLabel so when the text doesn't fit any more a tooltip is used
         KOAlternateLabel*label = new KOAlternateLabel( text, text, TQString(), mDayLabels );
         label->setMinimumWidth(1);
-        label->tqsetAlignment(AlignCenter);
+        label->setAlignment(AlignCenter);
         dayLayout->addWidget(label);
       }
     }
@@ -696,7 +696,7 @@ int KOAgendaView::maxDatesHint()
   return 0;
 }
 
-int KOAgendaView::tqcurrentDateCount()
+int KOAgendaView::currentDateCount()
 {
   return mSelectedDates.count();
 }
@@ -1420,7 +1420,7 @@ void KOAgendaView::fillAgenda()
 
 void KOAgendaView::displayIncidence( Incidence *incidence )
 {
-  TQDate today = TQDate::tqcurrentDate();
+  TQDate today = TQDate::currentDate();
   DateTimeList::iterator t;
 
   // FIXME: use a visitor here
@@ -1523,7 +1523,7 @@ void KOAgendaView::clearView()
 
 CalPrinterBase::PrintType KOAgendaView::printType()
 {
-  if ( tqcurrentDateCount() == 1 ) return CalPrinterBase::Day;
+  if ( currentDateCount() == 1 ) return CalPrinterBase::Day;
   else return CalPrinterBase::Week;
 }
 
diff --git a/korganizer/koagendaview.h b/korganizer/koagendaview.h
index 647dcafc..1a90bad0 100644
--- a/korganizer/koagendaview.h
+++ b/korganizer/koagendaview.h
@@ -82,7 +82,7 @@ class KOAlternateLabel : public TQLabel
                       TQWidget *parent = 0, const char *name = 0 );
     ~KOAlternateLabel();
 
-    virtual TQSize tqminimumSizeHint() const;
+    virtual TQSize minimumSizeHint() const;
 
     enum TextType { Short = 0, Long = 1, Extensive = 2 };
     TextType largestFittingTextType() const;
@@ -121,7 +121,7 @@ class KOAgendaView : public KOrg::AgendaView, public KCal::Calendar::Observer
     virtual int maxDatesHint();
 
     /** Returns number of currently shown dates. */
-    virtual int tqcurrentDateCount();
+    virtual int currentDateCount();
 
     /** returns the currently selected events */
     virtual Incidence::List selectedIncidences();
diff --git a/korganizer/koapp.cpp b/korganizer/koapp.cpp
index aecf8ba9..dcebd48b 100644
--- a/korganizer/koapp.cpp
+++ b/korganizer/koapp.cpp
@@ -132,7 +132,7 @@ void KOrganizerApp::processCalendar( const KURL &url )
     bool hasDocument = !url.isEmpty();
     korg = new KOrganizer( "KOrganizer MainWindow" );
     korg->init( hasDocument );
-    korg->tqtopLevelWidget()->show();
+    korg->topLevelWidget()->show();
 
     kdDebug(5850) << "KOrganizerApp::processCalendar(): '" << url.url()
                   << "'" << endl;
@@ -145,12 +145,12 @@ void KOrganizerApp::processCalendar( const KURL &url )
       korg->view()->updateView();
     }
   } else {
-    korg->tqtopLevelWidget()->show();
+    korg->topLevelWidget()->show();
   }
 
   // Handle window activation
 #if defined TQ_WS_X11 && ! defined K_WS_TQTONLY
-  KStartupInfo::setNewStartupId( korg->tqtopLevelWidget(), startupId() );
+  KStartupInfo::setNewStartupId( korg->topLevelWidget(), startupId() );
 #endif
 }
 
diff --git a/korganizer/koattendeeeditor.cpp b/korganizer/koattendeeeditor.cpp
index 497f1098..6e3b7815 100644
--- a/korganizer/koattendeeeditor.cpp
+++ b/korganizer/koattendeeeditor.cpp
@@ -430,7 +430,7 @@ void KOAttendeeEditor::updateAttendee()
   a->setUid( mUid );
   a->setEmail( email );
   a->setRole( Attendee::Role( mRoleCombo->currentItem() ) );
-  a->setqStatus( Attendee::PartStat( mStatusCombo->currentItem() ) );
+  a->seStatus( Attendee::PartStat( mStatusCombo->currentItem() ) );
   a->setRSVP( mRsvpButton->isChecked() );
 
   updateCurrentItem();
diff --git a/korganizer/kocore.cpp b/korganizer/kocore.cpp
index b3781e2d..957e6c08 100644
--- a/korganizer/kocore.cpp
+++ b/korganizer/kocore.cpp
@@ -236,7 +236,7 @@ void KOCore::removeXMLGUIClient( TQWidget *wdg )
 
 KXMLGUIClient* KOCore::xmlguiClient( TQWidget *wdg ) const
 {
-  TQWidget *topLevel = wdg->tqtopLevelWidget();
+  TQWidget *topLevel = wdg->topLevelWidget();
   TQMap<TQWidget*, KXMLGUIClient*>::ConstIterator it = mXMLGUIClients.find( topLevel );
   if ( it != mXMLGUIClients.end() )
     return it.data();
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 0e921e44..718cc5c0 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -57,7 +57,7 @@
 #undef FocusIn
 #undef KeyPress
 #undef None
-#undef tqStatus
+#undef Status
 #endif
 
 // ============================================================================
@@ -214,9 +214,9 @@ void KODayMatrix::recalculateToday()
     mDayLabels[ i ] = TQString::number( KOGlobals::self()->calendarSystem()->day( mDays[i] ));
 
     // if today is in the currently displayed month, hilight today
-    if ( mDays[ i ].year() == TQDate::tqcurrentDate().year() &&
-         mDays[ i ].month() == TQDate::tqcurrentDate().month() &&
-         mDays[ i ].day() == TQDate::tqcurrentDate().day() ) {
+    if ( mDays[ i ].year() == TQDate::currentDate().year() &&
+         mDays[ i ].month() == TQDate::currentDate().month() &&
+         mDays[ i ].day() == TQDate::currentDate().day() ) {
       mToday = i;
     }
   }
diff --git a/korganizer/koeditoralarms_base.ui b/korganizer/koeditoralarms_base.ui
index 9f599b6f..cc062528 100644
--- a/korganizer/koeditoralarms_base.ui
+++ b/korganizer/koeditoralarms_base.ui
@@ -298,7 +298,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>21</width>
                                     <height>41</height>
@@ -400,7 +400,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>61</height>
@@ -468,7 +468,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>16</height>
@@ -570,7 +570,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>60</height>
diff --git a/korganizer/koeditorattachments.cpp b/korganizer/koeditorattachments.cpp
index b39d5fe5..fe67a54e 100644
--- a/korganizer/koeditorattachments.cpp
+++ b/korganizer/koeditorattachments.cpp
@@ -232,7 +232,7 @@ AttachmentEditDialog::AttachmentEditDialog( AttachmentListItem *item,
   } else {
     uint size = item->attachment()->size();
     grid->addWidget( new TQLabel( i18n( "Size:" ), topFrame ), 4, 0 );
-    grid->addWidget( new TQLabel( TQString::tqfromLatin1( "%1 (%2)" ).
+    grid->addWidget( new TQLabel( TQString::fromLatin1( "%1 (%2)" ).
                                  arg( KIO::convertSize( size ) ).
                                  arg( KGlobal::locale()->formatNumber(
                                         size, 0 ) ), topFrame ), 4, 2 );
@@ -625,7 +625,7 @@ void KOEditorAttachments::handlePasteOrDrop( TQMimeSource* source )
         addUriAttachment( (*it).url(), TQString(), label, true );
       }
     } else { // we take anything
-      addDataAttachment( source->tqencodedData( source->format() ),
+      addDataAttachment( source->encodedData( source->format() ),
                          source->format(),
                          KMimeType::mimeType( source->format() )->name() );
     }
diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp
index a47dc737..be9a7fba 100644
--- a/korganizer/koeditordetails.cpp
+++ b/korganizer/koeditordetails.cpp
@@ -407,7 +407,7 @@ void KOEditorDetails::changeStatusForMe(Attendee::PartStat status)
     AttendeeListItem *item = static_cast<AttendeeListItem*>( it.current() );
     for ( TQStringList::ConstIterator it2( myEmails.begin() ), end( myEmails.end() ); it2 != end; ++it2 ) {
       if ( item->data()->email() == *it2 ) {
-        item->data()->setqStatus( status );
+        item->data()->seStatus( status );
         item->updateItem();
       }
     }
diff --git a/korganizer/koeditorfreebusy.cpp b/korganizer/koeditorfreebusy.cpp
index 2fc7b30f..e3f88f14 100644
--- a/korganizer/koeditorfreebusy.cpp
+++ b/korganizer/koeditorfreebusy.cpp
@@ -202,7 +202,7 @@ void FreeBusyItem::setFreeBusyPeriods( FreeBusy* fb )
       // No free/busy information
       //debug only start
       //   int ii ;
-      //       TQDateTime cur = TQDateTime::tqcurrentDateTime();
+      //       TQDateTime cur = TQDateTime::currentDateTime();
       //       for( ii = 0; ii < 10 ;++ii ) {
       //           KDGanttViewTaskItem* newSubItem = new KDGanttViewTaskItem( this );
       //           cur = cur.addSecs( 7200 );
@@ -310,16 +310,16 @@ KOEditorFreeBusy::KOEditorFreeBusy( int spacing, TQWidget *parent,
   mGanttView->setShowHeaderPopupMenu( false, false, false, false, false, false );
   // Initially, show 15 days back and forth
   // set start to even hours, i.e. to 12:AM 0 Min 0 Sec
-  TQDateTime horizonStart = TQDateTime( TQDateTime::tqcurrentDateTime()
+  TQDateTime horizonStart = TQDateTime( TQDateTime::currentDateTime()
                            .addDays( -15 ).date() );
-  TQDateTime horizonEnd = TQDateTime::tqcurrentDateTime().addDays( 15 );
+  TQDateTime horizonEnd = TQDateTime::currentDateTime().addDays( 15 );
   mGanttView->setHorizonStart( horizonStart );
   mGanttView->setHorizonEnd( horizonEnd );
   mGanttView->setCalendarMode( true );
   //mGanttView->setDisplaySubitemsAsGroup( true );
   mGanttView->setShowLegendButton( false );
   // Initially, center to current date
-  mGanttView->centerTimelineAfterShow( TQDateTime::tqcurrentDateTime() );
+  mGanttView->centerTimelineAfterShow( TQDateTime::currentDateTime() );
   if ( KGlobal::locale()->use12Clock() )
     mGanttView->setHourFormat( KDGanttView::Hour_12 );
   else
@@ -580,10 +580,10 @@ bool KOEditorFreeBusy::findFreeSlot( TQDateTime &dtFrom, TQDateTime &dtTo )
 
   // Make sure that we never suggest a date in the past, even if the
   // user originally scheduled the meeting to be in the past.
-  if( tryFrom < TQDateTime::tqcurrentDateTime() ) {
+  if( tryFrom < TQDateTime::currentDateTime() ) {
     // The slot to look for is at least partially in the past.
     int secs = tryFrom.secsTo( tryTo );
-    tryFrom = TQDateTime::tqcurrentDateTime();
+    tryFrom = TQDateTime::currentDateTime();
     tryTo = tryFrom.addSecs( secs );
   }
 
@@ -890,7 +890,7 @@ void KOEditorFreeBusy::changeStatusForMe(KCal::Attendee::PartStat status)
   {
     for ( TQStringList::ConstIterator it2( myEmails.begin() ), end( myEmails.end() ); it2 != end; ++it2 ) {
       if ( item->attendee()->email() == *it2 ) {
-        item->attendee()->setqStatus( status );
+        item->attendee()->seStatus( status );
         item->updateItem();
       }
     }
@@ -912,7 +912,7 @@ void KOEditorFreeBusy::showAttendeeStatusMenu()
   popup.setItemChecked( currentAttendee()->status(), true );
   int status = popup.exec( TQCursor::pos() );
   if ( status >= 0 ) {
-    currentAttendee()->setqStatus( (Attendee::PartStat)status );
+    currentAttendee()->seStatus( (Attendee::PartStat)status );
     updateCurrentItem();
     updateAttendeeInput();
   }
diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp
index e069d65d..793b90d7 100644
--- a/korganizer/koeditorgeneralevent.cpp
+++ b/korganizer/koeditorgeneralevent.cpp
@@ -508,14 +508,14 @@ bool KOEditorGeneralEvent::validateInput()
   if (!mStartDateEdit->date().isValid()) {
     KMessageBox::sorry( 0,
         i18n("Please specify a valid start date, for example '%1'.")
-        .tqarg( KGlobal::locale()->formatDate( TQDate::tqcurrentDate() ) ) );
+        .tqarg( KGlobal::locale()->formatDate( TQDate::currentDate() ) ) );
     return false;
   }
 
   if (!mEndDateEdit->date().isValid()) {
     KMessageBox::sorry( 0,
         i18n("Please specify a valid end date, for example '%1'.")
-        .tqarg( KGlobal::locale()->formatDate( TQDate::tqcurrentDate() ) ) );
+        .tqarg( KGlobal::locale()->formatDate( TQDate::currentDate() ) ) );
     return false;
   }
 
diff --git a/korganizer/koeditorgeneraljournal.cpp b/korganizer/koeditorgeneraljournal.cpp
index 25372ba4..b14aa7e5 100644
--- a/korganizer/koeditorgeneraljournal.cpp
+++ b/korganizer/koeditorgeneraljournal.cpp
@@ -196,7 +196,7 @@ bool KOEditorGeneralJournal::validateInput()
   if (!mDateEdit->date().isValid()) {
     KMessageBox::sorry( 0,
         i18n("Please specify a valid date, for example '%1'.")
-        .tqarg( KGlobal::locale()->formatDate( TQDate::tqcurrentDate() ) ) );
+        .tqarg( KGlobal::locale()->formatDate( TQDate::currentDate() ) ) );
     return false;
   }
 
diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp
index fe2fbe2b..7f4684e1 100644
--- a/korganizer/koeditorgeneraltodo.cpp
+++ b/korganizer/koeditorgeneraltodo.cpp
@@ -252,7 +252,7 @@ void KOEditorGeneralTodo::initPriority(TQWidget *parent, TQBoxLayout *topLayout)
   priorityLabel->setBuddy( mPriorityCombo );
 }
 
-void KOEditorGeneralTodo::initqStatus(TQWidget *parent,TQBoxLayout *topLayout)
+void KOEditorGeneralTodo::iniStatus(TQWidget *parent,TQBoxLayout *topLayout)
 {
   TQBoxLayout *statusLayout = new TQHBoxLayout(topLayout);
 
@@ -284,12 +284,12 @@ void KOEditorGeneralTodo::setDefaults( const TQDateTime &due, bool allDay )
     mDueTimeEdit->setTime( due.time() );
   } else {
     // Make it due tomorrow.
-    mDueDateEdit->setDate( TQDate::tqcurrentDate().addDays(1) );
+    mDueDateEdit->setDate( TQDate::currentDate().addDays(1) );
     mDueTimeEdit->setTime( TQTime::currentTime() );
   }
 
-  if ( !due.isValid() || (TQDateTime::tqcurrentDateTime() < due) ) {
-    mStartDateEdit->setDate( TQDate::tqcurrentDate() );
+  if ( !due.isValid() || (TQDateTime::currentDateTime() < due) ) {
+    mStartDateEdit->setDate( TQDate::currentDate() );
     mStartTimeEdit->setTime( TQTime::currentTime() );
   } else {
     mStartDateEdit->setDate( due.date().addDays( -1 ) );
@@ -322,7 +322,7 @@ void KOEditorGeneralTodo::readTodo(Todo *todo, Calendar *calendar, const TQDate
   } else {
     mDueDateEdit->setEnabled(false);
     mDueTimeEdit->setEnabled(false);
-    mDueDateEdit->setDate(TQDate::tqcurrentDate());
+    mDueDateEdit->setDate(TQDate::currentDate());
     mDueTimeEdit->setTime(TQTime::currentTime());
     mDueCheck->setChecked(false);
   }
@@ -339,7 +339,7 @@ void KOEditorGeneralTodo::readTodo(Todo *todo, Calendar *calendar, const TQDate
   } else {
     mStartDateEdit->setEnabled(false);
     mStartTimeEdit->setEnabled(false);
-    mStartDateEdit->setDate(TQDate::tqcurrentDate());
+    mStartDateEdit->setDate(TQDate::currentDate());
     mStartTimeEdit->setTime(TQTime::currentTime());
     mStartCheck->setChecked(false);
   }
@@ -545,7 +545,7 @@ void KOEditorGeneralTodo::completedChanged( int index )
 {
   if ( index == 10 ) {
     mCompletedToggle->setChecked( true );
-    mCompletedDateTime = TQDateTime::tqcurrentDateTime();
+    mCompletedDateTime = TQDateTime::currentDateTime();
   } else {
     mCompletedToggle->setChecked( false );
   }
@@ -556,7 +556,7 @@ void KOEditorGeneralTodo::completedChanged()
 {
   if ( mCompletedToggle->isChecked() ) {
     mCompletedCombo->setCurrentItem( 10 );
-    mCompletedDateTime = TQDateTime::tqcurrentDateTime();
+    mCompletedDateTime = TQDateTime::currentDateTime();
   } else {
     mCompletedCombo->setCurrentItem( 0 );
   }
diff --git a/korganizer/koeditorgeneraltodo.h b/korganizer/koeditorgeneraltodo.h
index 27ffdc27..bf7fb979 100644
--- a/korganizer/koeditorgeneraltodo.h
+++ b/korganizer/koeditorgeneraltodo.h
@@ -48,7 +48,7 @@ class KOEditorGeneralTodo : public KOEditorGeneral
     virtual ~KOEditorGeneralTodo();
 
     void initTime(TQWidget *, TQBoxLayout *);
-    void initqStatus(TQWidget *, TQBoxLayout *);
+    void iniStatus(TQWidget *, TQBoxLayout *);
     void initCompletion(TQWidget *, TQBoxLayout *);
     void initPriority(TQWidget *, TQBoxLayout *);
 
diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp
index b1174bbb..b93f6d19 100644
--- a/korganizer/koeditorrecurrence.cpp
+++ b/korganizer/koeditorrecurrence.cpp
@@ -590,7 +590,7 @@ ExceptionsWidget::ExceptionsWidget( TQWidget *parent, const char *name ) :
   TQWhatsThis::add( mExceptionDateEdit,
        i18n("A date that should be considered an exception "
       "to the recurrence rules for this event or to-do.") );
-  mExceptionDateEdit->setDate( TQDate::tqcurrentDate() );
+  mExceptionDateEdit->setDate( TQDate::currentDate() );
   boxLayout->addWidget( mExceptionDateEdit, 0, 0 );
 
   TQPushButton *addExceptionButton = new TQPushButton(
diff --git a/korganizer/koeventeditor.cpp b/korganizer/koeventeditor.cpp
index c73a67ac..27bcb827 100644
--- a/korganizer/koeventeditor.cpp
+++ b/korganizer/koeventeditor.cpp
@@ -242,7 +242,7 @@ void KOEventEditor::setTexts( const TQString &summary, const TQString &descripti
 
 void KOEventEditor::loadDefaults()
 {
-  TQDateTime from( TQDate::tqcurrentDate(), KOPrefs::instance()->mStartTime.time() );
+  TQDateTime from( TQDate::currentDate(), KOPrefs::instance()->mStartTime.time() );
   int addSecs = ( KOPrefs::instance()->mDefaultDuration.time().hour()*3600 ) +
                 ( KOPrefs::instance()->mDefaultDuration.time().minute()*60 );
   TQDateTime to( from.addSecs( addSecs ) );
diff --git a/korganizer/kogroupware.cpp b/korganizer/kogroupware.cpp
index 5104383c..28f62dd4 100644
--- a/korganizer/kogroupware.cpp
+++ b/korganizer/kogroupware.cpp
@@ -174,7 +174,7 @@ void KOGroupware::incomingDirChanged( const TQString& path )
 
   KCal::Scheduler::Method method =
     static_cast<KCal::Scheduler::Method>( message->method() );
-  KCal::ScheduleMessage::tqStatus status = message->status();
+  KCal::ScheduleMessage::Status status = message->status();
   KCal::Incidence* incidence =
     dynamic_cast<KCal::Incidence*>( message->event() );
   if(!incidence) {
@@ -191,13 +191,13 @@ void KOGroupware::incomingDirChanged( const TQString& path )
     for ( it = attendees.begin(); it != attendees.end(); ++it ) {
       if( (*it)->email() == receiver ) {
         if ( action.startsWith( "accepted" ) )
-          (*it)->setqStatus( KCal::Attendee::Accepted );
+          (*it)->seStatus( KCal::Attendee::Accepted );
         else if ( action.startsWith( "tentative" ) )
-          (*it)->setqStatus( KCal::Attendee::Tentative );
+          (*it)->seStatus( KCal::Attendee::Tentative );
         else if ( KOPrefs::instance()->outlookCompatCounterProposals() && action.startsWith( "counter" ) )
-          (*it)->setqStatus( KCal::Attendee::Tentative );
+          (*it)->seStatus( KCal::Attendee::Tentative );
         else if ( action.startsWith( "delegated" ) )
-          (*it)->setqStatus( KCal::Attendee::Delegated );
+          (*it)->seStatus( KCal::Attendee::Delegated );
         break;
       }
     }
diff --git a/korganizer/kogroupwareprefspage.ui b/korganizer/kogroupwareprefspage.ui
index feec8d71..1eb5fc66 100644
--- a/korganizer/kogroupwareprefspage.ui
+++ b/korganizer/kogroupwareprefspage.ui
@@ -153,7 +153,7 @@ Note: If KOrganizer is acting as a KDE Kolab client, this is not required, as th
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -226,7 +226,7 @@ For security reasons, it is not recommended to store your password in the config
                                 <property name="name">
                                     <cstring>publishUser</cstring>
                                 </property>
-                                <property name="tqminimumSize">
+                                <property name="minimumSize">
                                     <size>
                                         <width>120</width>
                                         <height>0</height>
@@ -292,7 +292,7 @@ Ask the server administrator for this information.</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>21</width>
                                 <height>50</height>
@@ -508,7 +508,7 @@ For security reasons, it is not recommended to store your password in the config
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>160</height>
diff --git a/korganizer/kojournaleditor.cpp b/korganizer/kojournaleditor.cpp
index 30e6c7d7..867d447f 100644
--- a/korganizer/kojournaleditor.cpp
+++ b/korganizer/kojournaleditor.cpp
@@ -132,7 +132,7 @@ void KOJournalEditor::setTexts( const TQString &summary, const TQString &descrip
 
 void KOJournalEditor::loadDefaults()
 {
-  setDate( TQDate::tqcurrentDate() );
+  setDate( TQDate::currentDate() );
 }
 
 bool KOJournalEditor::processInput()
diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp
index 1219fd57..f5d64ca6 100644
--- a/korganizer/kojournalview.cpp
+++ b/korganizer/kojournalview.cpp
@@ -97,7 +97,7 @@ void KOJournalView::appendJournal( Journal*journal, const TQDate &dt)
   }
 }
 
-int KOJournalView::tqcurrentDateCount()
+int KOJournalView::currentDateCount()
 {
   return mEntries.size();
 }
@@ -211,7 +211,7 @@ void KOJournalView::setIncidenceChanger( IncidenceChangerBase *changer )
 void KOJournalView::newJournal()
 {
   emit newJournalSignal( 0/*ResourceCalendar*/, TQString()/*subResource*/,
-                         TQDate::tqcurrentDate() );
+                         TQDate::currentDate() );
 }
 
 #include "kojournalview.moc"
diff --git a/korganizer/kojournalview.h b/korganizer/kojournalview.h
index 056b456e..347453cc 100644
--- a/korganizer/kojournalview.h
+++ b/korganizer/kojournalview.h
@@ -47,7 +47,7 @@ class KOJournalView : public KOrg::BaseView
                    const char *name = 0);
     ~KOJournalView();
 
-    virtual int tqcurrentDateCount();
+    virtual int currentDateCount();
     virtual Incidence::List selectedIncidences();
     DateList selectedIncidenceDates() { return DateList(); }
     void appendJournal( Journal*journal, const TQDate &dt);
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 32ddc327..24ffb202 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -72,7 +72,7 @@ void KOListViewToolTip::maybeTip( const TQPoint &pos )
 
   if ( i && KOPrefs::instance()->mEnableToolTips ) {
     /* Calculate the rectangle. */
-    r = eventlist->tqitemRect( it );
+    r = eventlist->itemRect( it );
     /* Show the tip */
     TQString tipText( IncidenceFormatter::toolTipStr( mCalendar, i->data() ) );
     if ( !tipText.isEmpty() ) {
@@ -248,7 +248,7 @@ KOListView::KOListView( Calendar *calendar,
 
   new KOListViewToolTip( mListView->viewport(), calendar, mListView );
 
-  mSelectedDates.append( TQDate::tqcurrentDate() );
+  mSelectedDates.append( TQDate::currentDate() );
 }
 
 KOListView::~KOListView()
@@ -261,7 +261,7 @@ int KOListView::maxDatesHint()
   return 0;
 }
 
-int KOListView::tqcurrentDateCount()
+int KOListView::currentDateCount()
 {
   return mSelectedDates.count();
 }
@@ -499,9 +499,9 @@ void KOListView::clear()
   mDateList.clear();
 }
 
-TQSize KOListView::tqsizeHint() const
+TQSize KOListView::sizeHint() const
 {
-  const TQSize s = KOEventView::tqsizeHint();
-  return TQSize( s.width() + tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent ) + 1,
+  const TQSize s = KOEventView::sizeHint();
+  return TQSize( s.width() + tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent ) + 1,
                 s.height() );
 }
diff --git a/korganizer/kolistview.h b/korganizer/kolistview.h
index 2480d6be..a4533ea8 100644
--- a/korganizer/kolistview.h
+++ b/korganizer/kolistview.h
@@ -77,7 +77,7 @@ class KOListView : public KOEventView
     ~KOListView();
 
     virtual int maxDatesHint();
-    virtual int tqcurrentDateCount();
+    virtual int currentDateCount();
     virtual Incidence::List selectedIncidences();
     virtual DateList selectedIncidenceDates();
 
@@ -90,7 +90,7 @@ class KOListView : public KOEventView
     void writeSettings(KConfig *config);
 
     void clear();
-    TQSize tqsizeHint() const;
+    TQSize sizeHint() const;
 
   public slots:
     virtual void updateView();
diff --git a/korganizer/komailclient.cpp b/korganizer/komailclient.cpp
index b664e68f..1081f62a 100644
--- a/korganizer/komailclient.cpp
+++ b/korganizer/komailclient.cpp
@@ -188,18 +188,18 @@ bool KOMailClient::send(const TQString &from,const TQString &_to,const TQString
   if (KOPrefs::instance()->mMailClient == KOPrefs::MailClientSendmail) {
     bool needHeaders = true;
 
-    TQString command = KStandardDirs::findExe(TQString::tqfromLatin1("sendmail"),
-        TQString::tqfromLatin1("/sbin:/usr/sbin:/usr/lib"));
-    if (!command.isNull()) command += TQString::tqfromLatin1(" -oi -t");
+    TQString command = KStandardDirs::findExe(TQString::fromLatin1("sendmail"),
+        TQString::fromLatin1("/sbin:/usr/sbin:/usr/lib"));
+    if (!command.isNull()) command += TQString::fromLatin1(" -oi -t");
     else {
-      command = KStandardDirs::findExe(TQString::tqfromLatin1("mail"));
+      command = KStandardDirs::findExe(TQString::fromLatin1("mail"));
       if (command.isNull()) return false; // give up
 
-      command.append(TQString::tqfromLatin1(" -s "));
+      command.append(TQString::fromLatin1(" -s "));
       command.append(KProcess::quote(subject));
 
       if (bcc) {
-        command.append(TQString::tqfromLatin1(" -b "));
+        command.append(TQString::fromLatin1(" -b "));
         command.append(KProcess::quote(from));
       }
 
@@ -224,14 +224,14 @@ bool KOMailClient::send(const TQString &from,const TQString &_to,const TQString
     TQString textComplete;
     if (needHeaders)
     {
-      textComplete += TQString::tqfromLatin1("From: ") + from + '\n';
-      textComplete += TQString::tqfromLatin1("To: ") + to + '\n';
+      textComplete += TQString::fromLatin1("From: ") + from + '\n';
+      textComplete += TQString::fromLatin1("To: ") + to + '\n';
       if ( !cc.isEmpty() ) {
-        textComplete += TQString::tqfromLatin1("Cc: " ) + cc + '\n';
+        textComplete += TQString::fromLatin1("Cc: " ) + cc + '\n';
       }
-      if (bcc) textComplete += TQString::tqfromLatin1("Bcc: ") + from + '\n';
-      textComplete += TQString::tqfromLatin1("Subject: ") + subject + '\n';
-      textComplete += TQString::tqfromLatin1("X-Mailer: KOrganizer") + korgVersion + '\n';
+      if (bcc) textComplete += TQString::fromLatin1("Bcc: ") + from + '\n';
+      textComplete += TQString::fromLatin1("Subject: ") + subject + '\n';
+      textComplete += TQString::fromLatin1("X-Mailer: KOrganizer") + korgVersion + '\n';
     }
     textComplete += '\n'; // end of headers
     textComplete += body;
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index eead7252..669049d7 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -78,7 +78,7 @@ void KOMonthCellToolTip::maybeTip( const TQPoint &pos )
 
   if( i && KOPrefs::instance()->mEnableToolTips ) {
     /* Calculate the rectangle. */
-    r=eventlist->tqitemRect( it );
+    r=eventlist->itemRect( it );
     /* Show the tip */
     TQString tipText( IncidenceFormatter::toolTipStr( mCalendar, i->incidence(), mDate ) );
     if ( !tipText.isEmpty() ) {
@@ -245,7 +245,7 @@ void MonthViewItem::paint( TQPainter *p )
   if ( mIncidence && mTodo ) {
     if ( static_cast<Todo*>( mIncidence )->isOverdue() ) {
       bgColor = KOPrefs::instance()->todoOverdueColor();
-    } else if ( static_cast<Todo*>( mIncidence )->dtDue().date() == TQDate::tqcurrentDate() ) {
+    } else if ( static_cast<Todo*>( mIncidence )->dtDue().date() == TQDate::currentDate() ) {
       bgColor = KOPrefs::instance()->todoDueTodayColor();
     }
   }
@@ -388,7 +388,7 @@ MonthViewCell::MonthViewCell( KOMonthView *parent)
   mLabel = new TQLabel( this );
   mLabel->setFrameStyle( TQFrame::Panel | TQFrame::Plain );
   mLabel->setLineWidth( 1 );
-  mLabel->tqsetAlignment( AlignCenter );
+  mLabel->setAlignment( AlignCenter );
 
   mItemList = new KNoScrollListBox( this );
   mItemList->setMinimumSize( 10, 10 );
@@ -451,7 +451,7 @@ TQDate MonthViewCell::date() const
 void MonthViewCell::setFrameWidth()
 {
   // show current day with a thicker frame
-  if ( mDate == TQDate::tqcurrentDate() ) {
+  if ( mDate == TQDate::currentDate() ) {
     mItemList->setLineWidth( 3 );
   } else if ( !isSelected ) {
     mItemList->setLineWidth( 1 );
@@ -496,7 +496,7 @@ void MonthViewCell::updateCell()
 {
   setFrameWidth();
 
-  if ( mDate == TQDate::tqcurrentDate() ) {
+  if ( mDate == TQDate::currentDate() ) {
     setPalette( mTodayPalette );
 
     TQPalette pal = mItemList->palette();
@@ -759,7 +759,7 @@ void MonthViewCell::select()
     enableScrollBars( true );
 
   // don't mess up the cell when it represents today
-  if( mDate != TQDate::tqcurrentDate() ) {
+  if( mDate != TQDate::currentDate() ) {
     mItemList->setFrameStyle( TQFrame::Sunken | TQFrame::Panel );
     mItemList->setLineWidth( 3 );
   }
@@ -828,7 +828,7 @@ KOMonthView::KOMonthView( Calendar *calendar, TQWidget *parent, const char *name
   // month name on top
   mLabel = new TQLabel( this );
   mLabel->setFont( mfont );
-  mLabel->tqsetAlignment( AlignCenter );
+  mLabel->setAlignment( AlignCenter );
   mLabel->setLineWidth( 0 );
   mLabel->setFrameStyle( TQFrame::Plain );
 
@@ -843,7 +843,7 @@ KOMonthView::KOMonthView( Calendar *calendar, TQWidget *parent, const char *name
     label->setFont( bfont );
     label->setFrameStyle( TQFrame::Panel | TQFrame::Raised );
     label->setLineWidth( 1 );
-    label->tqsetAlignment( AlignCenter );
+    label->setAlignment( AlignCenter );
 
     mDayLabels.insert( i, label );
 
@@ -886,7 +886,7 @@ int KOMonthView::maxDatesHint()
   return mNumCells;
 }
 
-int KOMonthView::tqcurrentDateCount()
+int KOMonthView::currentDateCount()
 {
   return mNumCells;
 }
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index 732a63a1..24f05f30 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -254,7 +254,7 @@ class KOMonthView: public KOEventView
     virtual int maxDatesHint();
 
     /** Returns number of currently shown dates. */
-    virtual int tqcurrentDateCount();
+    virtual int currentDateCount();
 
     /** Returns the currently selected events */
     virtual Incidence::List selectedIncidences();
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 1f3ede91..50f83247 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -1108,11 +1108,11 @@ KOPrefsDialogPlugins::KOPrefsDialogPlugins( TQWidget *parent, const char* name )
   topLayout->addWidget( mListView );
 
   mDescription = new TQLabel( topFrame );
-  mDescription->tqsetAlignment( TQLabel::NoAccel | TQLabel::WordBreak | TQLabel::AlignVCenter );
+  mDescription->setAlignment( TQLabel::NoAccel | TQLabel::WordBreak | TQLabel::AlignVCenter );
   mDescription->setFrameShape( TQLabel::Panel );
   mDescription->setFrameShadow( TQLabel::Sunken );
   mDescription->setMinimumSize( TQSize( 0, 55 ) );
-  mDescription->tqsetSizePolicy(
+  mDescription->setSizePolicy(
          TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0,
                       0, 0, mDescription->sizePolicy().hasHeightForWidth() ) );
   topLayout->addWidget( mDescription );
diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp
index a1b43685..cd46bbe4 100644
--- a/korganizer/korgac/alarmdialog.cpp
+++ b/korganizer/korgac/alarmdialog.cpp
@@ -402,7 +402,7 @@ void AlarmDialog::suspend()
     if ( item->isSelected() && item->isVisible() ) {
       item->setVisible( false );
       item->setSelected( false );
-      item->mRemindAt = TQDateTime::tqcurrentDateTime().addSecs( unit * mSuspendSpin->value() );
+      item->mRemindAt = TQDateTime::currentDateTime().addSecs( unit * mSuspendSpin->value() );
       item->mNotified = false;
       selitem = item;
     }
@@ -435,8 +435,8 @@ void AlarmDialog::setTimer()
   int nextReminderAt = -1;
   for ( TQListViewItemIterator it( mIncidenceListView ) ; it.current() ; ++it ) {
     AlarmListItem * item = static_cast<AlarmListItem*>( it.current() );
-    if ( item->mRemindAt > TQDateTime::tqcurrentDateTime() ) {
-      int secs = TQDateTime::tqcurrentDateTime().secsTo( item->mRemindAt );
+    if ( item->mRemindAt > TQDateTime::currentDateTime() ) {
+      int secs = TQDateTime::currentDateTime().secsTo( item->mRemindAt );
       nextReminderAt = nextReminderAt <= 0 ? secs : TQMIN( nextReminderAt, secs );
     }
   }
@@ -532,7 +532,7 @@ void AlarmDialog::wakeUp()
       continue;
     }
 
-    if ( item->mRemindAt <= TQDateTime::tqcurrentDateTime() ) {
+    if ( item->mRemindAt <= TQDateTime::currentDateTime() ) {
       if ( !item->isVisible() ) {
         item->setVisible( true );
         item->setSelected( false );
diff --git a/korganizer/korgac/alarmdockwindow.cpp b/korganizer/korgac/alarmdockwindow.cpp
index 9e4e9c23..aaeedd7f 100644
--- a/korganizer/korgac/alarmdockwindow.cpp
+++ b/korganizer/korgac/alarmdockwindow.cpp
@@ -192,7 +192,7 @@ void AlarmDockWindow::slotQuit()
            "(note that you will not get reminders whilst the daemon is not running)?"),
       i18n("Close KOrganizer Reminder Daemon"),
       i18n("Start"), i18n("Do Not Start"),
-      TQString::tqfromLatin1("AskForStartAtLogin")
+      TQString::fromLatin1("AskForStartAtLogin")
       );
 
   bool autostart = true;
diff --git a/korganizer/korgac/koalarmclient.cpp b/korganizer/korgac/koalarmclient.cpp
index 045dd992..93c0602a 100644
--- a/korganizer/korgac/koalarmclient.cpp
+++ b/korganizer/korgac/koalarmclient.cpp
@@ -108,7 +108,7 @@ void KOAlarmClient::checkAlarms()
   if ( !cfg->readBoolEntry( "Enabled", true ) ) return;
 
   TQDateTime from = mLastChecked.addSecs( 1 );
-  mLastChecked = TQDateTime::tqcurrentDateTime();
+  mLastChecked = TQDateTime::currentDateTime();
 
   kdDebug(5891) << "Check: " << from.toString() << " - " << mLastChecked.toString() << endl;
 
@@ -188,7 +188,7 @@ void KOAlarmClient::dumpDebug()
 
 TQStringList KOAlarmClient::dumpAlarms()
 {
-  TQDateTime start = TQDateTime( TQDateTime::tqcurrentDateTime().date(),
+  TQDateTime start = TQDateTime( TQDateTime::currentDateTime().date(),
                                TQTime( 0, 0 ) );
   TQDateTime end = start.addDays( 1 ).addSecs( -1 );
 
diff --git a/korganizer/korgac/testalarmdlg.cpp b/korganizer/korgac/testalarmdlg.cpp
index 1d9159ae..cd3f434f 100644
--- a/korganizer/korgac/testalarmdlg.cpp
+++ b/korganizer/korgac/testalarmdlg.cpp
@@ -48,7 +48,7 @@ int main(int argc,char **argv)
 
   Event *e1 = new Event;
   e1->setSummary( "This is a summary." );
-  TQDateTime now = TQDateTime::tqcurrentDateTime();
+  TQDateTime now = TQDateTime::currentDateTime();
   e1->setDtStart( now );
   e1->setDtEnd( now.addDays( 1 ) );
   Alarm *a = e1->newAlarm();
@@ -97,19 +97,19 @@ int main(int argc,char **argv)
 
   AlarmDialog dlg( mCalendar, 0 );
   app.setMainWidget( &dlg );
-  dlg.addIncidence( e2, TQDateTime::tqcurrentDateTime().addSecs( 60 ),
+  dlg.addIncidence( e2, TQDateTime::currentDateTime().addSecs( 60 ),
                     TQString() );
-  dlg.addIncidence( t1, TQDateTime::tqcurrentDateTime().addSecs( 300 ),
+  dlg.addIncidence( t1, TQDateTime::currentDateTime().addSecs( 300 ),
                     TQString( "THIS IS DISPLAY TEXT" ) );
-  dlg.addIncidence( e4, TQDateTime::tqcurrentDateTime().addSecs( 120 ),
+  dlg.addIncidence( e4, TQDateTime::currentDateTime().addSecs( 120 ),
                     TQString( "Fred and Barney get cloned" ) );
-  dlg.addIncidence( e3, TQDateTime::tqcurrentDateTime().addSecs( 240 ),
+  dlg.addIncidence( e3, TQDateTime::currentDateTime().addSecs( 240 ),
                     TQString() );
-  dlg.addIncidence( e1, TQDateTime::tqcurrentDateTime().addSecs( 180 ),
+  dlg.addIncidence( e1, TQDateTime::currentDateTime().addSecs( 180 ),
                     TQString() );
-  dlg.addIncidence( t2, TQDateTime::tqcurrentDateTime().addSecs( 600 ),
+  dlg.addIncidence( t2, TQDateTime::currentDateTime().addSecs( 600 ),
                     TQString( "THIS IS DISPLAY TEXT" ) );
-  dlg.addIncidence( t3, TQDateTime::tqcurrentDateTime().addSecs( 360 ),
+  dlg.addIncidence( t3, TQDateTime::currentDateTime().addSecs( 360 ),
                     TQString() );
   dlg.show();
   dlg.eventNotification();
diff --git a/korganizer/korganizer.h b/korganizer/korganizer.h
index facf9f59..9148a07f 100644
--- a/korganizer/korganizer.h
+++ b/korganizer/korganizer.h
@@ -94,7 +94,7 @@ class KOrganizer : public KPartsMainWindow, public KOrgMainWindow
 
     virtual KXMLGUIFactory *mainGuiFactory() { return factory(); }
     virtual KXMLGUIClient *mainGuiClient() { return this; }
-    virtual TQWidget *tqtopLevelWidget() { return this; }
+    virtual TQWidget *topLevelWidget() { return this; }
 
     virtual bool isCurrentlyActivePart();
 
diff --git a/korganizer/korganizer_part.cpp b/korganizer/korganizer_part.cpp
index c79a784d..9bcdc8ed 100644
--- a/korganizer/korganizer_part.cpp
+++ b/korganizer/korganizer_part.cpp
@@ -69,7 +69,7 @@ K_EXPORT_COMPONENT_FACTORY( libkorganizerpart, KOrganizerFactory )
 KOrganizerPart::KOrganizerPart( TQWidget *parentWidget, const char *widgetName,
                                 TQObject *parent, const char *name,
                                 const TQStringList & ) :
-  KParts::ReadOnlyPart(parent, name), mTopLevelWidget( parentWidget->tqtopLevelWidget() )
+  KParts::ReadOnlyPart(parent, name), mTopLevelWidget( parentWidget->topLevelWidget() )
 {
   KGlobal::locale()->insertCatalogue( "libkcal" );
   KGlobal::locale()->insertCatalogue( "libtdepim" );
@@ -155,9 +155,9 @@ void KOrganizerPart::slotChangeInfo( Incidence *incidence, const TQDate & )
   }
 }
 
-TQWidget *KOrganizerPart::tqtopLevelWidget()
+TQWidget *KOrganizerPart::topLevelWidget()
 {
-  return mView->tqtopLevelWidget();
+  return mView->topLevelWidget();
 }
 
 ActionManager *KOrganizerPart::actionManager()
diff --git a/korganizer/korganizer_part.h b/korganizer/korganizer_part.h
index 923a153d..c7f1964a 100644
--- a/korganizer/korganizer_part.h
+++ b/korganizer/korganizer_part.h
@@ -79,7 +79,7 @@ class KOrganizerPart: public KParts::ReadOnlyPart,
 
     virtual KXMLGUIFactory *mainGuiFactory() { return factory(); }
     virtual KXMLGUIClient *mainGuiClient() { return this; }
-    virtual TQWidget *tqtopLevelWidget();
+    virtual TQWidget *topLevelWidget();
     virtual ActionManager *actionManager();
     virtual KActionCollection *getActionCollection() const { return actionCollection(); }
     virtual void showStatusMessage( const TQString &message );
diff --git a/korganizer/kotimelineview.cpp b/korganizer/kotimelineview.cpp
index 84c9d746..d47e360e 100644
--- a/korganizer/kotimelineview.cpp
+++ b/korganizer/kotimelineview.cpp
@@ -94,7 +94,7 @@ KCal::DateList KOTimelineView::selectedIncidenceDates()
 }
 
 /*virtual*/
-int KOTimelineView::tqcurrentDateCount()
+int KOTimelineView::currentDateCount()
 {
     return 0;
 }
diff --git a/korganizer/kotimelineview.h b/korganizer/kotimelineview.h
index 9442a32d..683d0c4d 100644
--- a/korganizer/kotimelineview.h
+++ b/korganizer/kotimelineview.h
@@ -52,7 +52,7 @@ class KOTimelineView : public KOEventView
 
     virtual KCal::ListBase<KCal::Incidence> selectedIncidences();
     virtual KCal::DateList selectedIncidenceDates();
-    virtual int tqcurrentDateCount();
+    virtual int currentDateCount();
     virtual void showDates(const TQDate&, const TQDate&);
     virtual void showIncidences(const KCal::ListBase<KCal::Incidence>&, const TQDate &date);
     virtual void updateView();
diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp
index c3eee2ee..6b59571d 100644
--- a/korganizer/kotodoeditor.cpp
+++ b/korganizer/kotodoeditor.cpp
@@ -128,7 +128,7 @@ void KOTodoEditor::setupGeneral()
 
     mGeneral->initHeader( topFrame, topLayout );
     mGeneral->initTime(topFrame,topLayout);
-    mGeneral->initqStatus(topFrame,topLayout);
+    mGeneral->iniStatus(topFrame,topLayout);
     mGeneral->initDescription(topFrame,topLayout);
     mGeneral->initAttachments(topFrame,topLayout);
     connect( mGeneral, TQT_SIGNAL( openURL( const KURL& ) ),
@@ -185,7 +185,7 @@ void KOTodoEditor::setTexts( const TQString &summary, const TQString &descriptio
 void KOTodoEditor::loadDefaults()
 {
   kdDebug(5850) << k_funcinfo << endl;
-  setDates( TQDateTime::tqcurrentDateTime().addDays( 7 ), true, 0 );
+  setDates( TQDateTime::currentDateTime().addDays( 7 ), true, 0 );
   mGeneral->toggleAlarm( KOPrefs::instance()->defaultTodoReminders() );
 }
 
@@ -271,7 +271,7 @@ void KOTodoEditor::setDates( const TQDateTime &due, bool allDay, Todo *relatedEv
   if ( mTodo ) {
     mRecurrence->setDefaults( mTodo->dtStart(), due, false );
   } else {
-    mRecurrence->setDefaults( TQDateTime::tqcurrentDateTime(), due, false );
+    mRecurrence->setDefaults( TQDateTime::currentDateTime(), due, false );
   }
 }
 
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 89523821..b6fb3a44 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -84,7 +84,7 @@ void KOTodoListViewToolTip::maybeTip( const TQPoint & pos)
   {
 
     /* Calculate the rectangle. */
-    r=todolist->tqitemRect(i);
+    r=todolist->itemRect(i);
     headerPos = todolist->header()->sectionPos(col)-todolist->contentsX();
     r.setLeft( (headerPos < 0 ? 0 : headerPos) );
     r.setRight(headerPos + todolist->header()->sectionSize(col));
@@ -797,7 +797,7 @@ void KOTodoView::popupMenu( TQListViewItem *item, const TQPoint &, int column )
       if ( mActiveItem->todo()->hasDueDate () ) {
         mMovePopupMenu->datePicker()->setDate( date );
       } else {
-        mMovePopupMenu->datePicker()->setDate( TQDate::tqcurrentDate() );
+        mMovePopupMenu->datePicker()->setDate( TQDate::currentDate() );
       }
       switch ( column ) {
         case ePriorityColumn:
@@ -815,7 +815,7 @@ void KOTodoView::popupMenu( TQListViewItem *item, const TQPoint &, int column )
           break;
         default:
           mCopyPopupMenu->datePicker()->setDate( date );
-          mCopyPopupMenu->datePicker()->setDate( TQDate::tqcurrentDate() );
+          mCopyPopupMenu->datePicker()->setDate( TQDate::currentDate() );
           mItemPopupMenu->setItemEnabled( ePopupUnSubTodo,
                                           mActiveItem->todo()->relatedTo() );
           mItemPopupMenu->setItemEnabled( ePopupUnAllSubTodo,
@@ -832,7 +832,7 @@ void KOTodoView::newTodo()
 {
   kdDebug() << k_funcinfo << endl;
   emit newTodoSignal( 0/*ResourceCalendar*/, TQString()/*subResource*/,
-                      TQDate::tqcurrentDate().addDays(7) );
+                      TQDate::currentDate().addDays(7) );
 }
 
 void KOTodoView::newSubTodo()
@@ -917,7 +917,7 @@ void KOTodoView::setNewPercentage( KOTodoViewItem *item, int percentage )
       myChild = myChild->nextSibling();
     }*/
     if ( percentage == 100 ) {
-      todo->setCompleted( TQDateTime::tqcurrentDateTime() );
+      todo->setCompleted( TQDateTime::currentDateTime() );
       // If the todo does recur, it doesn't get set as completed. However, the
       // item is still checked. Uncheck it again.
       if ( !todo->isCompleted() ) {
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h
index 6175a053..f9ce4070 100644
--- a/korganizer/kotodoview.h
+++ b/korganizer/kotodoview.h
@@ -126,7 +126,7 @@ class KOTodoView : public KOrg::BaseView
     DateList selectedIncidenceDates() { return DateList(); }
 
     /** Return number of shown dates. TodoView does not show dates, */
-    int tqcurrentDateCount() { return 0; }
+    int currentDateCount() { return 0; }
 
     CalPrinterBase::PrintType printType();
 
diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp
index 3fe929b6..06b98b0b 100644
--- a/korganizer/kotodoviewitem.cpp
+++ b/korganizer/kotodoviewitem.cpp
@@ -249,12 +249,12 @@ void KOTodoViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column,
   if (isAlternate())
         _cg.setColor(TQColorGroup::Base, static_cast< KOTodoListView* >(listView())->alternateBackground());
   if (mTodo->hasDueDate()) {
-    if (mTodo->dtDue().date()==TQDate::tqcurrentDate() &&
+    if (mTodo->dtDue().date()==TQDate::currentDate() &&
         !mTodo->isCompleted()) {
       _cg.setColor(TQColorGroup::Base, KOPrefs::instance()->mTodoDueTodayColor);
       _cg.setColor(TQColorGroup::Text, getTextColor(KOPrefs::instance()->mTodoDueTodayColor));
     }
-    if (mTodo->dtDue().date() < TQDate::tqcurrentDate() &&
+    if (mTodo->dtDue().date() < TQDate::currentDate() &&
         !mTodo->isCompleted()) {
       _cg.setColor(TQColorGroup::Base, KOPrefs::instance()->mTodoOverdueColor);
       _cg.setColor(TQColorGroup::Text, getTextColor(KOPrefs::instance()->mTodoOverdueColor));
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 38ab086a..69bf88b6 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -447,7 +447,7 @@ void KOViewManager::showNextXView()
 {
   mAgendaMode = AGENDA_NEXTX;
   showAgendaView();
-  mMainView->dateNavigator()->selectDates( TQDate::tqcurrentDate(),
+  mMainView->dateNavigator()->selectDates( TQDate::currentDate(),
                                            KOPrefs::instance()->mNextXDays );
 }
 
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index c98c6c31..fd8e5742 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -65,9 +65,9 @@ KOWhatsNextView::KOWhatsNextView(Calendar *calendar, TQWidget *parent,
   : KOrg::BaseView(calendar, parent, name)
 {
 //  TQLabel *dateLabel =
-//      new TQLabel(KGlobal::locale()->formatDate(TQDate::tqcurrentDate()),this);
+//      new TQLabel(KGlobal::locale()->formatDate(TQDate::currentDate()),this);
 //  dateLabel->setMargin(2);
-//  dateLabel->tqsetAlignment(AlignCenter);
+//  dateLabel->setAlignment(AlignCenter);
 
   mView = new WhatsNextTextBrowser(this);
   connect(mView,TQT_SIGNAL(showIncidence(const TQString &)),TQT_SLOT(showIncidence(const TQString &)));
@@ -81,7 +81,7 @@ KOWhatsNextView::~KOWhatsNextView()
 {
 }
 
-int KOWhatsNextView::tqcurrentDateCount()
+int KOWhatsNextView::currentDateCount()
 {
   return mStartDate.daysTo( mEndDate );
 }
@@ -183,7 +183,7 @@ void KOWhatsNextView::updateView()
 
   TQStringList myEmails( KOPrefs::instance()->allEmails() );
   int replies = 0;
-  events = calendar()->events( TQDate::tqcurrentDate(), TQDate(2975,12,6) );
+  events = calendar()->events( TQDate::currentDate(), TQDate(2975,12,6) );
   Event::List::ConstIterator it2;
   for( it2 = events.begin(); it2 != events.end(); ++it2 ) {
     Event *ev = *it2;
diff --git a/korganizer/kowhatsnextview.h b/korganizer/kowhatsnextview.h
index e899ae15..c65a85df 100644
--- a/korganizer/kowhatsnextview.h
+++ b/korganizer/kowhatsnextview.h
@@ -57,7 +57,7 @@ class KOWhatsNextView : public KOrg::BaseView
                     const char *name = 0);
     ~KOWhatsNextView();
 
-    virtual int tqcurrentDateCount();
+    virtual int currentDateCount();
     virtual Incidence::List selectedIncidences() { return Incidence::List(); }
     DateList selectedIncidenceDates() { return DateList(); }
 
diff --git a/korganizer/multiagendaview.cpp b/korganizer/multiagendaview.cpp
index 8558d846..99893622 100644
--- a/korganizer/multiagendaview.cpp
+++ b/korganizer/multiagendaview.cpp
@@ -60,7 +60,7 @@ MultiAgendaView::MultiAgendaView( Calendar * cal, CalendarView *calendarView,
   mLeftSplitter = new TQSplitter( Qt::Vertical, topSideBox );
   mLeftSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() );
   TQLabel *label = new TQLabel( i18n("All Day"), mLeftSplitter );
-  label->tqsetAlignment( TQt::AlignRight | TQt::AlignVCenter | TQt::WordBreak );
+  label->setAlignment( TQt::AlignRight | TQt::AlignVCenter | TQt::WordBreak );
   TQVBox *sideBox = new TQVBox( mLeftSplitter );
   EventIndicator *eiSpacer = new EventIndicator( EventIndicator::Top, sideBox );
   eiSpacer->changeColumns( 0 );
@@ -265,7 +265,7 @@ void MultiAgendaView::setupViews()
 
   int minWidth = 0;
   for ( TQValueList<TQWidget*>::ConstIterator it = mAgendaWidgets.constBegin(); it != mAgendaWidgets.constEnd(); ++it )
-    minWidth = TQMAX( minWidth, (*it)->tqminimumSizeHint().width() );
+    minWidth = TQMAX( minWidth, (*it)->minimumSizeHint().width() );
   for ( TQValueList<TQWidget*>::ConstIterator it = mAgendaWidgets.constBegin(); it != mAgendaWidgets.constEnd(); ++it )
     (*it)->setMinimumWidth( minWidth );
 }
@@ -292,10 +292,10 @@ DateList MultiAgendaView::selectedIncidenceDates()
   return list;
 }
 
-int MultiAgendaView::tqcurrentDateCount()
+int MultiAgendaView::currentDateCount()
 {
   FOREACH_VIEW( agendaView )
-    return agendaView->tqcurrentDateCount();
+    return agendaView->currentDateCount();
   return 0;
 }
 
@@ -427,7 +427,7 @@ void MultiAgendaView::resizeEvent(TQResizeEvent * ev)
 void MultiAgendaView::resizeScrollView(const TQSize & size)
 {
   const int widgetWidth = size.width() - mTimeLabels->width() - mScrollBar->width();
-  int width = TQMAX( mTopBox->tqsizeHint().width(), widgetWidth );
+  int width = TQMAX( mTopBox->sizeHint().width(), widgetWidth );
   int height = size.height();
   if ( width > widgetWidth ) {
     const int sbHeight = mScrollView->horizontalScrollBar()->height();
diff --git a/korganizer/multiagendaview.h b/korganizer/multiagendaview.h
index 06c219dc..a702b9c0 100644
--- a/korganizer/multiagendaview.h
+++ b/korganizer/multiagendaview.h
@@ -51,7 +51,7 @@ class MultiAgendaView : public AgendaView
     void deSelectAgendaView() { mSelectedAgendaView = 0; }
     Incidence::List selectedIncidences();
     DateList selectedIncidenceDates();
-    int tqcurrentDateCount();
+    int currentDateCount();
     int maxDatesHint();
 
     bool eventDurationHint(TQDateTime &startDt, TQDateTime &endDt, bool &allDay);
diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp
index 23a01716..ba884204 100644
--- a/korganizer/navigatorbar.cpp
+++ b/korganizer/navigatorbar.cpp
@@ -71,40 +71,40 @@ NavigatorBar::NavigatorBar( TQWidget *parent, const char *name )
   pix = KOGlobals::self()->smallIcon( isRTL ? "2rightarrow" : "2leftarrow" );
   mPrevYear = new TQPushButton( this );
   mPrevYear->setPixmap( pix );
-  mPrevYear->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+  mPrevYear->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
   TQToolTip::add( mPrevYear, i18n( "Previous year" ) );
 
   pix = KOGlobals::self()->smallIcon( isRTL ? "1rightarrow" : "1leftarrow");
   mPrevMonth = new TQPushButton( this );
   mPrevMonth->setPixmap( pix );
-  mPrevMonth->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+  mPrevMonth->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
   TQToolTip::add( mPrevMonth, i18n( "Previous month" ) );
 
   // Create forward navigation buttons
   pix = KOGlobals::self()->smallIcon( isRTL ? "1leftarrow" : "1rightarrow");
   mNextMonth = new TQPushButton( this );
   mNextMonth->setPixmap( pix );
-  mNextMonth->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+  mNextMonth->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
   TQToolTip::add( mNextMonth, i18n( "Next month" ) );
 
   pix = KOGlobals::self()->smallIcon( isRTL ? "2leftarrow" : "2rightarrow");
   mNextYear = new TQPushButton( this );
   mNextYear->setPixmap( pix );
-  mNextYear->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+  mNextYear->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
   TQToolTip::add( mNextYear, i18n( "Next year" ) );
 
   // Create month name button
   mMonth = new ActiveLabel( this );
   mMonth->setFont( tfont );
-  mMonth->tqsetAlignment( AlignCenter );
-  mMonth->setMinimumHeight( mPrevYear->tqsizeHint().height() );
+  mMonth->setAlignment( AlignCenter );
+  mMonth->setMinimumHeight( mPrevYear->sizeHint().height() );
   TQToolTip::add( mMonth, i18n( "Select a month" ) );
 
   // Create year button
   mYear = new ActiveLabel( this );
   mYear->setFont( tfont );
-  mYear->tqsetAlignment( AlignCenter );
-  mYear->setMinimumHeight( mPrevYear->tqsizeHint().height() );
+  mYear->setAlignment( AlignCenter );
+  mYear->setMinimumHeight( mPrevYear->sizeHint().height() );
   TQToolTip::add( mYear, i18n( "Select a year" ) );
 
   // set up control frame tqlayout
diff --git a/korganizer/plugins/exchange/exchange.cpp b/korganizer/plugins/exchange/exchange.cpp
index 87784c28..a0062387 100644
--- a/korganizer/plugins/exchange/exchange.cpp
+++ b/korganizer/plugins/exchange/exchange.cpp
@@ -65,7 +65,7 @@ Exchange::Exchange(KOrg::MainWindow *parent, const char *name) :
 
   mAccount = new KPIM::ExchangeAccount( "Calendar/Exchange Plugin" );
   mClient = new KPIM::ExchangeClient( mAccount );
-  mClient->setWindow( parent->tqtopLevelWidget() );
+  mClient->setWindow( parent->topLevelWidget() );
 
   setXMLFile("plugins/exchangeui.rc");
 
@@ -219,9 +219,9 @@ void Exchange::showError( int error, const TQString& moreInfo /* = TQString() */
 
   if ( error !=  KPIM::ExchangeClient::ResultOK ) {
     if ( moreInfo.isNull() )
-      KMessageBox::error( mainWindow()->tqtopLevelWidget(), errorText, i18n( "Exchange Plugin" ) );
+      KMessageBox::error( mainWindow()->topLevelWidget(), errorText, i18n( "Exchange Plugin" ) );
     else
-      KMessageBox::detailedError( mainWindow()->tqtopLevelWidget(), errorText, moreInfo, i18n( "Exchange Plugin" ) );
+      KMessageBox::detailedError( mainWindow()->topLevelWidget(), errorText, moreInfo, i18n( "Exchange Plugin" ) );
   }
 }
 
diff --git a/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui b/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui
index 1ef0c311..e5fc832c 100644
--- a/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui
+++ b/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui
@@ -81,7 +81,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>15</width>
                                     <height>20</height>
@@ -136,7 +136,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>324</width>
                                     <height>21</height>
@@ -157,7 +157,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>21</width>
                     <height>201</height>
diff --git a/korganizer/plugins/printing/list/calprintlistconfig_base.ui b/korganizer/plugins/printing/list/calprintlistconfig_base.ui
index b27389b6..ecd2a848 100644
--- a/korganizer/plugins/printing/list/calprintlistconfig_base.ui
+++ b/korganizer/plugins/printing/list/calprintlistconfig_base.ui
@@ -56,7 +56,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>15</width>
                                     <height>20</height>
@@ -111,7 +111,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>324</width>
                                     <height>21</height>
@@ -169,7 +169,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>21</width>
                     <height>40</height>
diff --git a/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui b/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui
index 41d9fef0..b8ad273f 100644
--- a/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui
+++ b/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui
@@ -56,7 +56,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>15</width>
                                     <height>20</height>
@@ -111,7 +111,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>324</width>
                                     <height>21</height>
@@ -132,7 +132,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>21</width>
                     <height>201</height>
diff --git a/korganizer/plugins/printing/year/calprintyearconfig_base.ui b/korganizer/plugins/printing/year/calprintyearconfig_base.ui
index e0f52d6c..d02ca9f0 100644
--- a/korganizer/plugins/printing/year/calprintyearconfig_base.ui
+++ b/korganizer/plugins/printing/year/calprintyearconfig_base.ui
@@ -84,7 +84,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>120</width>
                             <height>21</height>
@@ -106,7 +106,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>131</width>
                             <height>21</height>
@@ -187,7 +187,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>21</width>
                     <height>40</height>
diff --git a/korganizer/plugins/projectview/koprojectview.cpp b/korganizer/plugins/projectview/koprojectview.cpp
index 79b146b3..6c45ff42 100644
--- a/korganizer/plugins/projectview/koprojectview.cpp
+++ b/korganizer/plugins/projectview/koprojectview.cpp
@@ -107,8 +107,8 @@ KOProjectView::KOProjectView(Calendar *calendar,TQWidget* parent,
 void KOProjectView::createMainTask()
 {
   mMainTask = new KGanttItem(0,i18n("main task"),
-                         TQDateTime::tqcurrentDateTime(),
-                         TQDateTime::tqcurrentDateTime());
+                         TQDateTime::currentDateTime(),
+                         TQDateTime::currentDateTime());
   mMainTask->setMode(KGanttItem::Rubberband);
   mMainTask->setStyle(KGanttItem::DrawBorder | KGanttItem::DrawText |
                       KGanttItem::DrawHandle);
@@ -154,8 +154,8 @@ void KOProjectView::updateView()
 
 #if 0
   KGanttItem* t1 = new KGanttItem(mGantt->getMainTask(), "task 1, no subtasks",
-                             TQDateTime::tqcurrentDateTime().addDays(10),
-                             TQDateTime::tqcurrentDateTime().addDays(20) );
+                             TQDateTime::currentDateTime().addDays(10),
+                             TQDateTime::currentDateTime().addDays(20) );
 
   KGanttItem* t2 = new KGanttItem(mGantt->getMainTask(), "task 2, subtasks, no rubberband",
                              TQDateTime(TQDate(2000,10,1)),
@@ -224,14 +224,14 @@ KGanttItem *KOProjectView::createTask(KGanttItem *parent,Todo *todo)
   if (todo->hasStartDate() && !todo->hasDueDate()) {
     // start date but no due date
     startDt = todo->dtStart();
-    endDt = TQDateTime::tqcurrentDateTime();
+    endDt = TQDateTime::currentDateTime();
   } else if (!todo->hasStartDate() && todo->hasDueDate()) {
     // due date but no start date
     startDt = todo->dtDue();
     endDt = todo->dtDue();
   } else if (!todo->hasStartDate() || !todo->hasDueDate()) {
-    startDt = TQDateTime::tqcurrentDateTime();
-    endDt = TQDateTime::tqcurrentDateTime();
+    startDt = TQDateTime::currentDateTime();
+    endDt = TQDateTime::currentDateTime();
   } else {
     startDt = todo->dtStart();
     endDt = todo->dtDue();
diff --git a/korganizer/plugins/projectview/koprojectview.h b/korganizer/plugins/projectview/koprojectview.h
index d0561052..6065f9c3 100644
--- a/korganizer/plugins/projectview/koprojectview.h
+++ b/korganizer/plugins/projectview/koprojectview.h
@@ -75,7 +75,7 @@ class KOProjectView : public KOrg::BaseView
     DateList selectedDates();
 
     /** Return number of shown dates. */
-    int tqcurrentDateCount() { return 0; }
+    int currentDateCount() { return 0; }
 
     void readSettings();
     void writeSettings(KConfig *);
diff --git a/korganizer/plugins/timespanview/kotimespanview.cpp b/korganizer/plugins/timespanview/kotimespanview.cpp
index 08fd51b1..eb924c74 100644
--- a/korganizer/plugins/timespanview/kotimespanview.cpp
+++ b/korganizer/plugins/timespanview/kotimespanview.cpp
@@ -79,7 +79,7 @@ int KOTimeSpanView::maxDatesHint()
   return 0;
 }
 
-int KOTimeSpanView::tqcurrentDateCount()
+int KOTimeSpanView::currentDateCount()
 {
   return 0;
 }
diff --git a/korganizer/plugins/timespanview/kotimespanview.h b/korganizer/plugins/timespanview/kotimespanview.h
index c121d897..7018ce46 100644
--- a/korganizer/plugins/timespanview/kotimespanview.h
+++ b/korganizer/plugins/timespanview/kotimespanview.h
@@ -39,7 +39,7 @@ class KOTimeSpanView : public KOEventView
     ~KOTimeSpanView();
 
     virtual int maxDatesHint();
-    virtual int tqcurrentDateCount();
+    virtual int currentDateCount();
     virtual Incidence::List selectedIncidences();
     DateList selectedDates() { return DateList(); }
 
diff --git a/korganizer/printing/calprintdayconfig_base.ui b/korganizer/printing/calprintdayconfig_base.ui
index bd9227ce..b9c070eb 100644
--- a/korganizer/printing/calprintdayconfig_base.ui
+++ b/korganizer/printing/calprintdayconfig_base.ui
@@ -56,7 +56,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>121</width>
                             <height>21</height>
@@ -73,7 +73,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>121</width>
                             <height>21</height>
@@ -228,7 +228,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>21</width>
                     <height>201</height>
diff --git a/korganizer/printing/calprinter.cpp b/korganizer/printing/calprinter.cpp
index e87f3c5a..65d1bc08 100644
--- a/korganizer/printing/calprinter.cpp
+++ b/korganizer/printing/calprinter.cpp
@@ -178,7 +178,7 @@ CalPrintDialog::CalPrintDialog( KOrg::PrintPlugin::List plugins,
 
   mTypeGroup = new TQVButtonGroup( i18n("Print Style"), splitter, "buttonGroup" );
   // use the minimal width possible = max width of the radio buttons, not extensible
-/*  mTypeGroup->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)4,
+/*  mTypeGroup->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)4,
     (TQSizePolicy::SizeType)5, 0, 0,
       mTypeGroup->sizePolicy().hasHeightForWidth() ) );*/
 
@@ -220,11 +220,11 @@ CalPrintDialog::CalPrintDialog( KOrg::PrintPlugin::List plugins,
     TQRadioButton *radioButton = new TQRadioButton( p->description(), mTypeGroup );
     radioButton->setEnabled( p->enabled() );
     mTypeGroup->insert( radioButton, mapit.key() );
-//     radioButton->setMinimumHeight( radioButton->tqsizeHint().height() - 5 );
+//     radioButton->setMinimumHeight( radioButton->sizeHint().height() - 5 );
   }
 
-  setMinimumSize( tqminimumSizeHint() );
-  resize( tqminimumSizeHint() );
+  setMinimumSize( minimumSizeHint() );
+  resize( minimumSizeHint() );
 }
 
 CalPrintDialog::~CalPrintDialog()
diff --git a/korganizer/printing/calprintincidenceconfig_base.ui b/korganizer/printing/calprintincidenceconfig_base.ui
index 68afdecb..509d4c54 100644
--- a/korganizer/printing/calprintincidenceconfig_base.ui
+++ b/korganizer/printing/calprintincidenceconfig_base.ui
@@ -90,7 +90,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>21</width>
                     <height>201</height>
diff --git a/korganizer/printing/calprintmonthconfig_base.ui b/korganizer/printing/calprintmonthconfig_base.ui
index a6c5ba0e..ceace246 100644
--- a/korganizer/printing/calprintmonthconfig_base.ui
+++ b/korganizer/printing/calprintmonthconfig_base.ui
@@ -31,7 +31,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>21</width>
                     <height>20</height>
@@ -131,7 +131,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>17</width>
                             <height>21</height>
diff --git a/korganizer/printing/calprintpluginbase.cpp b/korganizer/printing/calprintpluginbase.cpp
index 27c3cb33..52be67ec 100644
--- a/korganizer/printing/calprintpluginbase.cpp
+++ b/korganizer/printing/calprintpluginbase.cpp
@@ -182,7 +182,7 @@ void CalPrintPluginBase::doLoadConfig()
   if ( mConfig ) {
     KConfigGroupSaver saver( mConfig, description() );
     mConfig->sync();
-    TQDateTime currDate( TQDate::tqcurrentDate() );
+    TQDateTime currDate( TQDate::currentDate() );
     mFromDate = mConfig->readDateTimeEntry( "FromDate", &currDate ).date();
     mToDate = mConfig->readDateTimeEntry( "ToDate" ).date();
     mUseColors = mConfig->readBoolEntry( "UseColors", true );
@@ -558,7 +558,7 @@ int CalPrintPluginBase::drawFooter( TQPainter &p, TQRect &footbox )
   TQFont oldfont( p.font() );
   p.setFont( TQFont( "sans-serif", 6 ) );
   TQFontMetrics fm( p.font() );
-  TQString dateStr = KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(), false );
+  TQString dateStr = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), false );
   p.drawText( footbox, TQt::AlignCenter | TQt::AlignVCenter | TQt::SingleLine,
               i18n( "print date: formatted-datetime", "printed: %1" ).tqarg( dateStr ) );
   p.setFont( oldfont );
diff --git a/korganizer/printing/calprinttodoconfig_base.ui b/korganizer/printing/calprinttodoconfig_base.ui
index f416c0ea..ed2cf4b9 100644
--- a/korganizer/printing/calprinttodoconfig_base.ui
+++ b/korganizer/printing/calprinttodoconfig_base.ui
@@ -102,7 +102,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>20</height>
@@ -191,7 +191,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>21</height>
@@ -275,7 +275,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -341,7 +341,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>121</width>
                             <height>20</height>
@@ -358,7 +358,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>121</width>
                             <height>20</height>
diff --git a/korganizer/printing/calprintweekconfig_base.ui b/korganizer/printing/calprintweekconfig_base.ui
index f367f3c4..505f4f14 100644
--- a/korganizer/printing/calprintweekconfig_base.ui
+++ b/korganizer/printing/calprintweekconfig_base.ui
@@ -34,7 +34,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>21</width>
                     <height>27</height>
@@ -62,7 +62,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>16</width>
                             <height>21</height>
@@ -118,7 +118,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>110</width>
                             <height>20</height>
diff --git a/korganizer/publishdialog_base.ui b/korganizer/publishdialog_base.ui
index 76efbe64..640b19fb 100644
--- a/korganizer/publishdialog_base.ui
+++ b/korganizer/publishdialog_base.ui
@@ -112,7 +112,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>241</height>
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index 497ad1f6..e278d5fb 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -89,7 +89,7 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent)
 
   mEndDate = new KDateEdit( rangeWidget );
   rangeLayout->addWidget( new TQLabel( mEndDate, i18n("&To:"), rangeWidget ) );
-  mEndDate->setDate( TQDate::tqcurrentDate().addDays( 365 ) );
+  mEndDate->setDate( TQDate::currentDate().addDays( 365 ) );
   rangeLayout->addWidget( mEndDate );
 
   mInclusiveCheck = new TQCheckBox( i18n("E&vents have to be completely included"),
diff --git a/korganizer/statusdialog.cpp b/korganizer/statusdialog.cpp
index 15e15e5a..ba86ce7f 100644
--- a/korganizer/statusdialog.cpp
+++ b/korganizer/statusdialog.cpp
@@ -49,9 +49,9 @@ StatusDialog::StatusDialog(TQWidget* parent, const char* name) :
   TQLabel *text = new TQLabel(i18n("Set your status"),this);
   statusLayout->addWidget( text );
 
-  mtqStatus = new TQComboBox(false,this);
-  mtqStatus->insertStringList(Attendee::statusList());
-  statusLayout->addWidget( mtqStatus );
+  mStatus = new TQComboBox(false,this);
+  mStatus->insertStringList(Attendee::statusList());
+  statusLayout->addWidget( mStatus );
 
   TQBoxLayout *buttonLayout = new TQHBoxLayout( topLayout );
 
@@ -70,5 +70,5 @@ StatusDialog::~StatusDialog()
 
 Attendee::PartStat StatusDialog::status()
 {
-  return Attendee::PartStat( mtqStatus->currentItem() ) ;
+  return Attendee::PartStat( mStatus->currentItem() ) ;
 }
diff --git a/korganizer/statusdialog.h b/korganizer/statusdialog.h
index 9f01bca6..5906b44d 100644
--- a/korganizer/statusdialog.h
+++ b/korganizer/statusdialog.h
@@ -37,7 +37,7 @@ class StatusDialog : public KDialog
     Attendee::PartStat status();
 
   private:
-    TQComboBox *mtqStatus;
+    TQComboBox *mStatus;
 };
 
 #endif
diff --git a/korganizer/template_management_dialog_base.ui b/korganizer/template_management_dialog_base.ui
index db340242..7fd65a10 100644
--- a/korganizer/template_management_dialog_base.ui
+++ b/korganizer/template_management_dialog_base.ui
@@ -75,7 +75,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>51</height>