Rename a number of old tq methods that are no longer tq specific

120 files changed, 599 insertions, 599 deletions

diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp
index 7a27df738..10a791a95 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(),
@@ -872,7 +872,7 @@ bool ActionManager::openURL( const KURL &url,bool merge )
     mFile = url.path();
     if ( !KStandardDirs::exists( mFile ) ) {
       mMainWindow->showStatusMessage( i18n("New calendar '%1'.")
-                                      .tqarg( url.prettyURL() ) );
+                                      .arg( url.prettyURL() ) );
       mCalendarView->setModified();
     } else {
       bool success = mCalendarView->openCalendar( mFile, merge );
@@ -906,7 +906,7 @@ bool ActionManager::openURL( const KURL &url,bool merge )
       return success;
     } else {
       TQString msg;
-      msg = i18n("Cannot download calendar from '%1'.").tqarg( url.prettyURL() );
+      msg = i18n("Cannot download calendar from '%1'.").arg( url.prettyURL() );
       KMessageBox::error( dialogParent(), msg );
       return false;
     }
@@ -945,7 +945,7 @@ bool ActionManager::addResource( const KURL &mUrl )
     resource->setResourceName( name );
     manager->add( resource );
     mMainWindow->showStatusMessage( i18n( "Added calendar resource for URL '%1'." )
-               .tqarg( name ) );
+               .arg( name ) );
     // we have to call resourceAdded manually, because for in-process changes
     // the dcop signals are not connected, so the resource's signals would not
     // be connected otherwise
@@ -953,7 +953,7 @@ bool ActionManager::addResource( const KURL &mUrl )
       mCalendarResources->resourceAdded( resource );
   } else {
     TQString msg = i18n("Unable to create calendar resource '%1'.")
-                      .tqarg( name );
+                      .arg( name );
     KMessageBox::error( dialogParent(), msg );
   }
   return true;
@@ -964,10 +964,10 @@ void ActionManager::showStatusMessageOpen( const KURL &url, bool merge )
 {
   if ( merge ) {
     mMainWindow->showStatusMessage( i18n("Merged calendar '%1'.")
-                                    .tqarg( url.prettyURL() ) );
+                                    .arg( url.prettyURL() ) );
   } else {
     mMainWindow->showStatusMessage( i18n("Opened calendar '%1'.")
-                                    .tqarg( url.prettyURL() ) );
+                                    .arg( url.prettyURL() ) );
   }
 }
 
@@ -1018,7 +1018,7 @@ bool ActionManager::saveURL()
   if ( !mURL.isLocalFile() ) {
     if ( !KIO::NetAccess::upload( mFile, mURL, view() ) ) {
       TQString msg = i18n("Cannot upload calendar to '%1'")
-                    .tqarg( mURL.prettyURL() );
+                    .arg( mURL.prettyURL() );
       KMessageBox::error( dialogParent() ,msg );
       return false;
     }
@@ -1030,7 +1030,7 @@ bool ActionManager::saveURL()
     mAutoSaveTimer->start( 1000*60*KOPrefs::instance()->mAutoSaveInterval );
   }
 
-  mMainWindow->showStatusMessage( i18n("Saved calendar '%1'.").tqarg( mURL.prettyURL() ) );
+  mMainWindow->showStatusMessage( i18n("Saved calendar '%1'.").arg( mURL.prettyURL() ) );
 
   return true;
 }
@@ -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
@@ -1061,7 +1061,7 @@ void ActionManager::exportHTML( HTMLExportSettings *settings )
     return;
   kdDebug()<<" settings->outputFile() :"<<settings->outputFile()<<endl;
   if ( TQFileInfo( settings->outputFile() ).exists() ) {
-    if(KMessageBox::questionYesNo( dialogParent(), i18n("Do you want to overwrite file \"%1\"").tqarg( settings->outputFile()) ) == KMessageBox::No)
+    if(KMessageBox::questionYesNo( dialogParent(), i18n("Do you want to overwrite file \"%1\"").arg( settings->outputFile()) ) == KMessageBox::No)
       return;
   }
   settings->setEMail( KOPrefs::instance()->email() );
@@ -1136,7 +1136,7 @@ bool ActionManager::saveAsURL( const KURL &url )
     setTitle();
     if ( mRecent ) mRecent->addURL( mURL );
   } else {
-    KMessageBox::sorry( dialogParent(), i18n("Unable to save calendar to the file %1.").tqarg( mFile ), i18n("Error") );
+    KMessageBox::sorry( dialogParent(), i18n("Unable to save calendar to the file %1.").arg( mFile ), i18n("Error") );
     kdDebug(5850) << "ActionManager::saveAsURL() failed" << endl;
     mURL = URLOrig;
     mFile = fileOrig;
@@ -1702,7 +1702,7 @@ void ActionManager::openEventEditor( const TQString & summary,
         attData = file;
       } else {
         if ( KMessageBox::warningContinueCancel( 0,
-              i18n("Removing attachments from an email might tqinvalidate its signature."),
+              i18n("Removing attachments from an email might invalidate its signature."),
               i18n("Remove Attachments"), KStdGuiItem::cont(), "BodyOnlyInlineAttachment" )
               != KMessageBox::Continue )
           return;
@@ -1892,7 +1892,7 @@ void ActionManager::updateUndoAction( const TQString &text )
   } else {
     mUndoAction->setEnabled( true );
     if ( text.isEmpty() ) mUndoAction->setText( i18n("Undo") );
-    else mUndoAction->setText( i18n("Undo (%1)").tqarg( text ) );
+    else mUndoAction->setText( i18n("Undo (%1)").arg( text ) );
   }
 }
 
@@ -1904,7 +1904,7 @@ void ActionManager::updateRedoAction( const TQString &text )
   } else {
     mRedoAction->setEnabled( true );
     if ( text.isEmpty() ) mRedoAction->setText( i18n("Redo") );
-    else mRedoAction->setText( i18n( "Redo (%1)" ).tqarg( text ) );
+    else mRedoAction->setText( i18n( "Redo (%1)" ).arg( text ) );
   }
 }
 
@@ -1983,7 +1983,7 @@ bool ActionManager::saveResourceCalendar()
       int result = KMessageBox::warningContinueCancel( view(),
         i18n( "Saving of '%1' failed. Check that the resource is "
              "properly configured.\nIgnore problem and continue without "
-             "saving or cancel save?" ).tqarg( (*it)->resourceName() ),
+             "saving or cancel save?" ).arg( (*it)->resourceName() ),
         i18n("Save Error"), KStdGuiItem::dontSave() );
       if ( result == KMessageBox::Cancel ) return false;
     }
@@ -2006,12 +2006,12 @@ void ActionManager::importCalendar( const KURL &url )
 {
   if ( !url.isValid() ) {
     KMessageBox::error( dialogParent(),
-                        i18n("URL '%1' is invalid.").tqarg( url.prettyURL() ) );
+                        i18n("URL '%1' is invalid.").arg( url.prettyURL() ) );
     return;
   }
 
   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/archivedialog.cpp b/korganizer/archivedialog.cpp
index 6609b183a..04596b8c8 100644
--- a/korganizer/archivedialog.cpp
+++ b/korganizer/archivedialog.cpp
@@ -25,7 +25,7 @@
 // ArchiveDialog -- archive/delete past events.
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqdatetime.h>
 #include <tqcheckbox.h>
 #include <tqwhatsthis.h>
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 5b6d94928..b45b4ae01 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -93,14 +93,14 @@
 #include <kdirwatch.h>
 
 #include <tqapplication.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqcursor.h>
 #include <tqmultilineedit.h>
 #include <tqtimer.h>
 #include <tqwidgetstack.h>
 #include <tqptrlist.h>
 #include <tqfile.h>
-#include <tqlayout.h>
+#include <layout.h>
 #ifndef KORG_NOSPLITTER
 #include <tqsplitter.h>
 #endif
@@ -137,7 +137,7 @@ CalendarView::CalendarView( TQWidget *parent, const char *name )
   TQBoxLayout *topLayout = new TQVBoxLayout( this );
 
 #ifndef KORG_NOSPLITTER
-  // create the main tqlayout frames.
+  // create the main layout frames.
   mPanner = new TQSplitter( Qt::Horizontal, this,
                            "CalendarView::Panner" );
   topLayout->addWidget( mPanner );
@@ -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
 
@@ -277,7 +277,7 @@ CalendarView::CalendarView( TQWidget *parent, const char *name )
   KOGlobals::self()->
       setHolidays( new KHolidays( KOPrefs::instance()->mHolidays ) );
 
-  connect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ),
+  connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ),
            TQT_SLOT( checkClipboard() ) );
 
   connect( mTodoList, TQT_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ),
@@ -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();
   }
@@ -487,7 +487,7 @@ bool CalendarView::openCalendar(const TQString& filename, bool merge)
     // have become partially populated.  Clear it out.
     if ( !merge ) mCalendar->close();
 
-    KMessageBox::error(this,i18n("Could not load calendar '%1'.").tqarg(filename));
+    KMessageBox::error(this,i18n("Could not load calendar '%1'.").arg(filename));
 
     return false;
   }
@@ -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 );
@@ -776,18 +776,18 @@ void CalendarView::incidenceChanged( Incidence *oldIncidence,
       if ( todo->isCompleted() ||
            modification == KOGlobals::COMPLETION_MODIFIED_WITH_RECURRENCE ) {
         TQString timeStr = KGlobal::locale()->formatTime( TQTime::currentTime() );
-        TQString description = i18n( "To-do completed: %1 (%2)" ).tqarg(
-          newIncidence->summary() ).tqarg( timeStr );
+        TQString description = i18n( "To-do completed: %1 (%2)" ).arg(
+          newIncidence->summary() ).arg( 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() );
-          journal->setSummary( i18n("Journal of %1").tqarg( dateStr ) );
+          TQString dateStr = KGlobal::locale()->formatDate( TQDate::currentDate() );
+          journal->setSummary( i18n("Journal of %1").arg( dateStr ) );
           journal->setDescription( description );
 
           //TODO: recorded to-dos should save into the standard resource always
@@ -844,7 +844,7 @@ void CalendarView::checkForFilteredChange( Incidence *incidence )
     // user so that he isn't surprised if his new event doesn't show up
     KMessageBox::information( this, i18n("The item \"%1\" is filtered by "
                  "your current filter rules, so it will be hidden and not "
-                 "appear in the view.").tqarg( incidence->summary() ),
+                 "appear in the view.").arg( incidence->summary() ),
                  i18n("Filter Applied"), "ChangedIncidenceFiltered" );
   }
 }
@@ -901,7 +901,7 @@ void CalendarView::updateUnmanagedViews()
 int CalendarView::msgItemDelete( Incidence *incidence )
 {
   return KMessageBox::warningContinueCancel(this,
-      i18n("The item \"%1\" will be permanently deleted.").tqarg( incidence->summary() ),
+      i18n("The item \"%1\" will be permanently deleted.").arg( incidence->summary() ),
       i18n("KOrganizer Confirmation"), KGuiItem(i18n("&Delete"),"editdelete"));
 }
 
@@ -925,7 +925,7 @@ void CalendarView::edit_cut()
                                                 "Do you want to cut just this item and "
                                                 "make all its sub-to-dos independent, or "
                                                 "cut the to-do with all its sub-to-dos?"
-                                             ).tqarg( incidence->summary() ),
+                                             ).arg( incidence->summary() ),
                                            i18n("KOrganizer Confirmation"),
                                            i18n("Cut Only This"),
                                            i18n("Cut All"));
@@ -935,7 +935,7 @@ void CalendarView::edit_cut()
     incidences.append( incidence );
     makeChildrenIndependent( incidence );
   } else if ( km == KMessageBox::No ) { // all
-    // load incidence + tqchildren + grandtqchildren...
+    // load incidence + children + grandchildren...
     getIncidenceHierarchy( incidence, incidences );
   }
 
@@ -962,7 +962,7 @@ void CalendarView::edit_copy()
                                            i18n("The item \"%1\" has sub-to-dos. "
                                                 "Do you want to copy just this item or "
                                                 "copy the to-do with all its sub-to-dos?"
-                                             ).tqarg( incidence->summary() ),
+                                             ).arg( incidence->summary() ),
                                            i18n("KOrganizer Confirmation"),
                                            i18n("Copy Only This"),
                                            i18n("Copy All"));
@@ -971,7 +971,7 @@ void CalendarView::edit_copy()
   if ( km == KMessageBox::Yes ) { // only one
     incidences.append( incidence );
   } else if ( km == KMessageBox::No ) { // all
-    // load incidence + tqchildren + grandtqchildren...
+    // load incidence + children + grandchildren...
     getIncidenceHierarchy( incidence, incidences );
   }
 
@@ -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 );
   }
@@ -1585,7 +1585,7 @@ void CalendarView::schedule_publish(Incidence *incidence)
       KMessageBox::information( this, i18n("The item information was successfully sent."),
                                 i18n("Publishing"), "IncidencePublishSuccess" );
     } else {
-      KMessageBox::error( this, i18n("Unable to publish the item '%1'").tqarg( incidence->summary() ) );
+      KMessageBox::error( this, i18n("Unable to publish the item '%1'").arg( incidence->summary() ) );
     }
   }
   delete publishdlg;
@@ -1661,7 +1661,7 @@ void CalendarView::schedule_forward( Incidence *incidence )
     } else {
       KMessageBox::error(
         this,
-        i18n( "Unable to forward the item '%1'" ).tqarg( incidence->summary() ),
+        i18n( "Unable to forward the item '%1'" ).arg( incidence->summary() ),
         i18n( "Forwarding Error" ) );
     }
   }
@@ -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);
@@ -1727,16 +1727,16 @@ void CalendarView::schedule(Scheduler::Method method, Incidence *incidence)
   if ( scheduler.performTransaction( incidence, method ) ) {
     KMessageBox::information( this, i18n("The groupware message for item '%1'"
                                 "was successfully sent.\nMethod: %2")
-                                .tqarg( incidence->summary() )
-                                .tqarg( Scheduler::methodName( method ) ),
+                                .arg( incidence->summary() )
+                                .arg( Scheduler::methodName( method ) ),
                               i18n("Sending Free/Busy"),
                               "FreeBusyPublishSuccess" );
   } else {
     KMessageBox::error( this, i18n("Groupware message sending failed. "
                         "%2 is request/reply/add/cancel/counter/etc.",
                         "Unable to send the item '%1'.\nMethod: %2")
-                        .tqarg( incidence->summary() )
-                        .tqarg( Scheduler::methodName( method ) ) );
+                        .arg( incidence->summary() )
+                        .arg( Scheduler::methodName( method ) ) );
   }
 }
 
@@ -1817,7 +1817,7 @@ void CalendarView::exportICalendar()
     if ( TQFile( filename ).exists() ) {
       if ( KMessageBox::No == KMessageBox::warningYesNo(
              this,
-             i18n( "Do you want to overwrite %1?").tqarg(filename) ) ) {
+             i18n( "Do you want to overwrite %1?").arg(filename) ) ) {
 	      return;
       }
     }
@@ -1845,7 +1845,7 @@ void CalendarView::exportVCalendar()
     if ( TQFile( filename ).exists() ) {
       if ( KMessageBox::No == KMessageBox::warningYesNo(
              this,
-             i18n( "Do you want to overwrite %1?").tqarg(filename ) ) ) {
+             i18n( "Do you want to overwrite %1?").arg(filename ) ) ) {
              return;
       }
     }
@@ -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"));
@@ -1934,7 +1934,7 @@ void CalendarView::processIncidenceSelection( Incidence *incidence, const TQDate
 void CalendarView::checkClipboard()
 {
 #ifndef KORG_NODND
-  if (ICalDrag::canDecode(TQApplication::tqclipboard()->data())) {
+  if (ICalDrag::canDecode(TQApplication::clipboard()->data())) {
     kdDebug(5850) << "CalendarView::checkClipboard() true" << endl;
     emit pasteEnabled(true);
   } else {
@@ -2334,7 +2334,7 @@ void CalendarView::deleteTodoIncidence ( Todo *todo, bool force )
            "Do you want to delete just this item and "
            "make all its sub-to-dos independent, or "
            "delete the to-do with all its sub-to-dos?"
-        ).tqarg( todo->summary() ),
+        ).arg( todo->summary() ),
       i18n("KOrganizer Confirmation"),
       i18n("Delete Only This"),
       i18n("Delete All"));
@@ -2367,7 +2367,7 @@ void CalendarView::deleteIncidence(Incidence *incidence, bool force)
       KMessageBox::information( this, i18n("The item \"%1\" is marked read-only "
                                 "and cannot be deleted; it probably belongs to "
                                 "a read-only calendar resource.")
-                                .tqarg(incidence->summary()),
+                                .arg(incidence->summary()),
                                 i18n("Removing not possible"),
                                 "deleteReadOnlyIncidence" );
     }
@@ -2377,7 +2377,7 @@ void CalendarView::deleteIncidence(Incidence *incidence, bool force)
   CanDeleteIncidenceVisitor v;
 
   // Let the visitor do special things for special incidence types.
-  // e.g. todos with tqchildren cannot be deleted, so act(..) returns false
+  // e.g. todos with children cannot be deleted, so act(..) returns false
   if ( !v.act( incidence, this ) )
     return;
   //If it is a todo, there are specific delete function
@@ -2397,15 +2397,15 @@ void CalendarView::deleteIncidence(Incidence *incidence, bool force)
         km = KMessageBox::warningContinueCancel(this,
           i18n("The calendar item \"%1\" recurs over multiple dates; "
                "are you sure you want to delete it "
-               "and all its recurrences?").tqarg( incidence->summary() ),
+               "and all its recurrences?").arg( incidence->summary() ),
                i18n("KOrganizer Confirmation"), i18n("Delete All") );
       } else {
         km = KOMessageBox::fourBtnMsgBox( this, TQMessageBox::Warning,
           i18n("The calendar item \"%1\" recurs over multiple dates. "
                "Do you want to delete only the current one on %2, only all "
                "future recurrences, or all its recurrences?" )
-               .tqarg( incidence->summary() )
-               .tqarg( KGlobal::locale()->formatDate(itemDate)),
+               .arg( incidence->summary() )
+               .arg( KGlobal::locale()->formatDate(itemDate)),
                i18n("KOrganizer Confirmation"), i18n("Delete C&urrent"),
                i18n("Delete &Future"),
                i18n("Delete &All"));
@@ -2524,14 +2524,14 @@ void CalendarView::purgeCompleted()
       if ( aTodo && !aTodo->relatedTo() )
         rootTodos.append( aTodo );
     }
-    // now that we have a list of all root todos, check them and their tqchildren
+    // now that we have a list of all root todos, check them and their children
     for ( it = rootTodos.begin(); it != rootTodos.end(); ++it ) {
       purgeCompletedSubTodos( *it, allDeleted );
     }
     endMultiModify();
     if ( !allDeleted ) {
       KMessageBox::information( this, i18n("Unable to purge to-dos with "
-                                "uncompleted tqchildren."), i18n("Delete To-do"),
+                                "uncompleted children."), i18n("Delete To-do"),
                                 "UncompletedChildrenPurgeTodos" );
     }
   }
@@ -2577,7 +2577,7 @@ void CalendarView::addIncidenceOn( Incidence *incadd, const TQDate &dt )
 {
   if ( !incadd || !mChanger ) {
     KMessageBox::sorry(this, i18n("Unable to copy the item to %1.")
-                       .tqarg( dt.toString() ), i18n("Copying Failed") );
+                       .arg( dt.toString() ), i18n("Copying Failed") );
     return;
   }
   Incidence *incidence = mCalendar->incidence( incadd->uid() );
@@ -2621,7 +2621,7 @@ void CalendarView::moveIncidenceTo( Incidence *incmove, const TQDate &dt )
 {
   if ( !incmove || !mChanger ) {
     KMessageBox::sorry( this, i18n("Unable to move the item to %1.")
-                        .tqarg( dt.toString() ), i18n("Moving Failed") );
+                        .arg( dt.toString() ), i18n("Moving Failed") );
     return;
   }
   Incidence *incidence = mCalendar->incidence( incmove->uid() );
@@ -2794,16 +2794,16 @@ void CalendarView::selectWeek( const TQDate &date )
 }
 
 void CalendarView::getIncidenceHierarchy( Incidence *inc,
-                                          Incidence::List &tqchildren )
+                                          Incidence::List &children )
 {
   // protecion against looping hierarchies
-  if ( inc && !tqchildren.contains( inc ) ) {
+  if ( inc && !children.contains( inc ) ) {
     Incidence::List::ConstIterator it;
     Incidence::List immediateChildren = inc->relations();
     for ( it = immediateChildren.constBegin(); it != immediateChildren.constEnd(); ++it ) {
-      getIncidenceHierarchy( *it, tqchildren );
+      getIncidenceHierarchy( *it, children );
     }
-    tqchildren.append( inc );
+    children.append( inc );
   }
 }
 
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index c10d92414..131cd878f 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -454,10 +454,10 @@ class KDE_EXPORT CalendarView : public KOrg::CalendarViewBase, public Calendar::
      */
     void appointment_delete();
 
-    /* frees the selected to-do's tqchildren from it's relation, update the view */
+    /* frees the selected to-do's children from it's relation, update the view */
     void todo_unsub();
 
-    /* frees an incidence's tqchildren from it's relation, without update the view
+    /* frees an incidence's children from it's relation, without update the view
        Works with any incidence type, although currently we only pass to-dos
     */
     bool incidence_unsub( Incidence *inc );
@@ -465,7 +465,7 @@ class KDE_EXPORT CalendarView : public KOrg::CalendarViewBase, public Calendar::
     /** Make all sub-to-dos of the selected todo independent, update the view */
     bool makeSubTodosIndependent ( );
 
-    /** Make all tqchildren of incidence independent, not update the view
+    /** Make all children of incidence independent, not update the view
         Works with any incidence type, although currently we only pass to-dos
     */
     bool makeChildrenIndependent( Incidence *inc );
diff --git a/korganizer/datechecker.cpp b/korganizer/datechecker.cpp
index c311743eb..7d7cdedbe 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 a792b8416..bb4206b0c 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 5504e8f65..dd3f8a1ac 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 ae8f22a25..cd0b98e99 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 ac0cef045..be6854413 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
@@ -99,7 +99,7 @@ void EventArchiver::run( Calendar* calendar, const TQDate& limitDate, TQWidget*
         KMessageBox::information(
           widget,
           i18n( "Unable to archive to-do \"%1\" because at least one of its "
-                "sub-to-dos does not meet the archival requirements." ).tqarg( (*it)->summary() ),
+                "sub-to-dos does not meet the archival requirements." ).arg( (*it)->summary() ),
           i18n( "Archive To-do" ),
           "UncompletedChildrenArchiveTodos" );
       } else if ( todoComplete ) {
@@ -118,7 +118,7 @@ void EventArchiver::run( Calendar* calendar, const TQDate& limitDate, TQWidget*
       KMessageBox::information(
         widget,
         i18n( "There are no incidences available to archive before the specified cut-off date %1. "
-              "Archiving will not be performed." ).tqarg( KGlobal::locale()->formatDate( limitDate ) ),
+              "Archiving will not be performed." ).arg( KGlobal::locale()->formatDate( limitDate ) ),
         "ArchiverNoIncidences" );
     }
     return;
@@ -147,7 +147,7 @@ void EventArchiver::deleteIncidences( Calendar* calendar, const TQDate& limitDat
     int result = KMessageBox::warningContinueCancelList(
       widget, i18n("Delete all items before %1 without saving?\n"
                  "The following items will be deleted:")
-      .tqarg(KGlobal::locale()->formatDate(limitDate)), incidenceStrs,
+      .arg(KGlobal::locale()->formatDate(limitDate)), incidenceStrs,
 		 i18n("Delete Old Items"),KStdGuiItem::del());
     if (result != KMessageBox::Continue)
       return;
@@ -216,7 +216,7 @@ void EventArchiver::archiveIncidences( Calendar* calendar, const TQDate& /*limit
 
   // Save archive calendar
   if ( !archiveStore.save() ) {
-    KMessageBox::error(widget,i18n("Cannot write archive file %1.").tqarg( archiveStore.fileName() ));
+    KMessageBox::error(widget,i18n("Cannot write archive file %1.").arg( archiveStore.fileName() ));
     return;
   }
 
diff --git a/korganizer/exportwebdialog.cpp b/korganizer/exportwebdialog.cpp
index c5868f146..ea04c9dbd 100644
--- a/korganizer/exportwebdialog.cpp
+++ b/korganizer/exportwebdialog.cpp
@@ -22,7 +22,7 @@
     without including the source code for TQt in the source distribution.
 */
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqhgroupbox.h>
 #include <tqvgroupbox.h>
 #include <tqvbuttongroup.h>
@@ -33,7 +33,7 @@
 #include <tqvbox.h>
 #include <tqpushbutton.h>
 #include <tqfiledialog.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqlabel.h>
 
 #include <klocale.h>
diff --git a/korganizer/filteredit_base.ui b/korganizer/filteredit_base.ui
index f1bdc7902..a5c3f792b 100644
--- a/korganizer/filteredit_base.ui
+++ b/korganizer/filteredit_base.ui
@@ -50,7 +50,7 @@
                 </property>
                 <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -95,7 +95,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="3" column="0">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -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/filtereditdialog.cpp b/korganizer/filtereditdialog.cpp
index aceb6d27c..c8251ca61 100644
--- a/korganizer/filtereditdialog.cpp
+++ b/korganizer/filtereditdialog.cpp
@@ -186,7 +186,7 @@ void FilterEdit::filterSelected(CalFilter *filter)
 }
 
 void FilterEdit::bNewPressed() {
-  CalFilter *newFilter = new CalFilter( i18n("New Filter %1").tqarg(mFilters->count()) );
+  CalFilter *newFilter = new CalFilter( i18n("New Filter %1").arg(mFilters->count()) );
   mFilters->append( newFilter );
   updateFilterList();
   mRulesList->setSelected(mRulesList->count()-1, true);
diff --git a/korganizer/freebusymanager.cpp b/korganizer/freebusymanager.cpp
index ec32367b1..59775f070 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;
@@ -245,7 +245,7 @@ void FreeBusyManager::publishFreeBusy()
   if ( !targetURL.isValid() ) {
      KMessageBox::sorry( 0,
       i18n( "<qt>The target URL '%1' provided is invalid."
-            "</qt>" ).tqarg( targetURL.prettyURL() ), i18n("Invalid URL") );
+            "</qt>" ).arg( targetURL.prettyURL() ), i18n("Invalid URL") );
     mBrokenUrl = true;
     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 * ) ) );
@@ -353,8 +353,8 @@ void FreeBusyManager::slotUploadFreeBusyResult(KIO::Job *_job)
                 "URL '%1'. There might be a problem with the access rights, or "
                 "you specified an incorrect URL. The system said: <em>%2</em>."
                 "<br>Please check the URL or contact your system administrator."
-                "</qt>" ).tqarg( job->destURL().prettyURL() )
-                         .tqarg( job->errorString() ) );
+                "</qt>" ).arg( job->destURL().prettyURL() )
+                         .arg( job->errorString() ) );
     // Delete temp file
     KURL src = job->srcURL();
     Q_ASSERT( src.isLocalFile() );
@@ -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/freebusymanager.h b/korganizer/freebusymanager.h
index 1cda25fa3..d8fcc9522 100644
--- a/korganizer/freebusymanager.h
+++ b/korganizer/freebusymanager.h
@@ -92,7 +92,7 @@ class FreeBusyManager : public TQObject, public KCal::FreeBusyCache
     /**
       KOrganizer downloads somebody else's free/busy list
       The call is asynchronous, and upon download, the
-      tqreceivers slot specified by member will be called.
+      receivers slot specified by member will be called.
       The slot should be of type "member(const TQString&, KCal::FreeBusy*)"
 
       Return true if a download is initiated, and false otherwise
diff --git a/korganizer/freebusyurldialog.cpp b/korganizer/freebusyurldialog.cpp
index 67f23d35e..39dc7e691 100644
--- a/korganizer/freebusyurldialog.cpp
+++ b/korganizer/freebusyurldialog.cpp
@@ -32,7 +32,7 @@
 #include <kdebug.h>
 #include <kstandarddirs.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 
 FreeBusyUrlDialog::FreeBusyUrlDialog( KCal::Attendee *attendee, TQWidget *parent,
@@ -66,7 +66,7 @@ FreeBusyUrlWidget::FreeBusyUrlWidget( KCal::Attendee *attendee, TQWidget *parent
   
   TQLabel *label = new TQLabel(
       i18n("Location of Free/Busy information for %1 <%2>:")
-      .tqarg( mAttendee->name() ).tqarg( mAttendee->email() ), this );
+      .arg( mAttendee->name() ).arg( mAttendee->email() ), this );
   topLayout->addWidget( label );
 
   mUrlEdit = new KLineEdit( this );
diff --git a/korganizer/history.cpp b/korganizer/history.cpp
index 002f84a6b..0b9e5d995 100644
--- a/korganizer/history.cpp
+++ b/korganizer/history.cpp
@@ -182,7 +182,7 @@ void History::EntryDelete::redo()
 
 TQString History::EntryDelete::text()
 {
-  return i18n("Delete %1").tqarg(mIncidence->type().data());
+  return i18n("Delete %1").arg(mIncidence->type().data());
 }
 
 
@@ -211,7 +211,7 @@ void History::EntryAdd::redo()
 
 TQString History::EntryAdd::text()
 {
-  return i18n("Add %1").tqarg(mIncidence->type().data());
+  return i18n("Add %1").arg(mIncidence->type().data());
 }
 
 
@@ -248,7 +248,7 @@ void History::EntryEdit::redo()
 
 TQString History::EntryEdit::text()
 {
-  return i18n("Edit %1").tqarg(mNewIncidence->type().data());
+  return i18n("Edit %1").arg(mNewIncidence->type().data());
 }
 
 History::MultiEntry::MultiEntry( Calendar *calendar, const TQString &text )
diff --git a/korganizer/importdialog.cpp b/korganizer/importdialog.cpp
index 4db3a069b..7d4dd3fbc 100644
--- a/korganizer/importdialog.cpp
+++ b/korganizer/importdialog.cpp
@@ -31,7 +31,7 @@
 #include <klocale.h>
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqradiobutton.h>
 #include <tqbuttongroup.h>
 
@@ -46,7 +46,7 @@ ImportDialog::ImportDialog( const KURL &url, TQWidget *parent, bool isPart )
   TQVBoxLayout *topLayout = new TQVBoxLayout( topFrame, 0, spacingHint() );
 
   TQString txt = i18n("Import calendar/event at '%1' into KOrganizer.")
-                .tqarg( mUrl.prettyURL() );
+                .arg( mUrl.prettyURL() );
 
   topLayout->addWidget( new TQLabel( txt, topFrame ) );
 
diff --git a/korganizer/incidencechanger.cpp b/korganizer/incidencechanger.cpp
index 0cf69fc20..c3517e75f 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 b1f6afa1d..2a7fc375b 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 8c98dcd01..dcda1bee5 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 50c765d65..35e426d88 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 cf93a58f1..5734b6cc5 100644
--- a/korganizer/journalentry.cpp
+++ b/korganizer/journalentry.cpp
@@ -26,7 +26,7 @@
 // Journal Entry
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 #include <tqwhatsthis.h>
 #include <tqtooltip.h>
@@ -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() ) );
 }
@@ -86,7 +86,7 @@ JournalDateEntry::~JournalDateEntry()
 void JournalDateEntry::setDate(const TQDate &date)
 {
   TQString dtstring = TQString( "<qt><center><b><i>%1</i></b>  " )
-                     .tqarg( KGlobal::locale()->formatDate(date) );
+                     .arg( KGlobal::locale()->formatDate(date) );
 
   dtstring += " <font size=\"-1\"><a href=\"#\">" +
               i18n("[Add Journal Entry]") +
@@ -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 );
@@ -259,8 +259,8 @@ void JournalEntry::deleteItem()
 {
 /*  KMessageBox::ButtonCode *code = KMessageBox::warningContinueCancel(this,
       i18n("The journal \"%1\" on %2 will be permanently deleted.")
-               .tqarg( mJournal->summary() )
-               .tqarg( mJournal->dtStartStr() ),
+               .arg( mJournal->summary() )
+               .arg( mJournal->dtStartStr() ),
   i18n("KOrganizer Confirmation"), KStdGuiItem::del() );
   if ( code == KMessageBox::Yes ) {*/
     if ( mJournal )
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp
index d47b79748..980bd1124 100644
--- a/korganizer/kdatenavigator.cpp
+++ b/korganizer/kdatenavigator.cpp
@@ -25,7 +25,7 @@
 
 #include <tqstring.h>
 #include <tqkeycode.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtimer.h>
 #include <tqframe.h>
 #include <tqlabel.h>
@@ -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 );
 
@@ -121,8 +121,8 @@ void KDateNavigator::setBaseDate( const TQDate &date )
     dates.append( date );
     mNavigatorBar->selectDates( dates );
 
-    tqrepaint();
-    mDayMatrix->tqrepaint();
+    repaint();
+    mDayMatrix->repaint();
   }
 }
 
@@ -135,7 +135,7 @@ TQSizePolicy KDateNavigator::sizePolicy () const
 void KDateNavigator::updateToday()
 {
   mDayMatrix->recalculateToday();
-  mDayMatrix->tqrepaint();
+  mDayMatrix->repaint();
 }
 
 TQDate KDateNavigator::startDate() const
@@ -188,21 +188,21 @@ void KDateNavigator::updateDates()
 
     if ( weeknumstart != weeknumend ) {
       weeknum = i18n("start/end week number of line in date picker", "%1/%2")
-                .tqarg( weeknumstart ).tqarg( weeknumend );
+                .arg( weeknumstart ).arg( weeknumend );
     } else {
       weeknum.setNum( weeknumstart );
     }
     mWeeknos[i]->setText( weeknum );
   }
 
-// each updateDates is followed by an updateView -> tqrepaint is issued there !
-//  mDayMatrix->tqrepaint();
+// each updateDates is followed by an updateView -> repaint is issued there !
+//  mDayMatrix->repaint();
 }
 
 void KDateNavigator::updateDayMatrix()
 {
   mDayMatrix->updateView();
-  mDayMatrix->tqrepaint();
+  mDayMatrix->repaint();
 }
 
 void KDateNavigator::setUpdateNeeded()
@@ -228,7 +228,7 @@ void KDateNavigator::updateView()
 //   kdDebug(5850) << "KDateNavigator::updateView(), view " << this << endl;
 
   updateDayMatrix();
-  tqrepaint();
+  repaint();
 }
 
 void KDateNavigator::updateConfig()
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index 5600682f1..6c1c79521 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;
@@ -296,7 +296,7 @@ void KOAgenda::init()
   setMinimumSize( 30, int( mGridSpacingY + 1 ) );
 //  setMaximumHeight(mGridSpacingY * mRows + 5);
 
-  // Disable horizontal scrollbar. This is a hack. The tqgeometry should be
+  // Disable horizontal scrollbar. This is a hack. The geometry should be
   // controlled in a way that the contents horizontally always fits. Then it is
   // not necessary to turn off the scrollbar.
   setHScrollBarMode( AlwaysOff );
@@ -1300,11 +1300,11 @@ void KOAgenda::placeAgendaItem( KOAgendaItem *item, double subCellWidth )
     xpos = pt.x() + int( subCellPos );
     ypos = pt.y();
   }
-  if ( KOGlobals::self()->reverseLayout() ) { // RTL language/tqlayout
+  if ( KOGlobals::self()->reverseLayout() ) { // RTL language/layout
     xpos += width;
     width = -width;
   }
-  if ( height<0 ) { // BTT (bottom-to-top) tqlayout ?!?
+  if ( height<0 ) { // BTT (bottom-to-top) layout ?!?
     ypos += height;
     height = -height;
   }
@@ -1708,7 +1708,7 @@ void KOAgenda::insertMultiItem( Event *event, const TQDate &qd, int XBegin, int
         cellYBottom = rows() - 1;
       }
 
-      newtext = TQString("(%1/%2): ").tqarg( count ).tqarg( width );
+      newtext = TQString("(%1/%2): ").arg( count ).arg( width );
       newtext.append( event->summary() );
 
       current = insertItem( event, qd, cellX, cellYTop, cellYBottom, count, width );
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index 124102b00..f11ea8c01 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -562,7 +562,7 @@ void KOAgendaItem::addAttendee( const TQString &newAttendee )
   KPIM::getNameAndMail( newAttendee, name, email );
   if ( !( name.isEmpty() && email.isEmpty() ) ) {
     mIncidence->addAttendee(new Attendee(name,email));
-    KMessageBox::information( this, i18n("Attendee \"%1\" added to the calendar item \"%2\"").tqarg(KPIM::normalizedAddress(name, email, TQString())).tqarg(text()), i18n("Attendee added"), "AttendeeDroppedAdded" );
+    KMessageBox::information( this, i18n("Attendee \"%1\" added to the calendar item \"%2\"").arg(KPIM::normalizedAddress(name, email, TQString())).arg(text()), i18n("Attendee added"), "AttendeeDroppedAdded" );
   }
 
 }
@@ -739,14 +739,14 @@ void KOAgendaItem::paintEvent( TQPaintEvent *ev )
   TQRect visRect = visibleRect();
   // when scrolling horizontally in the side-by-side view, the repainted area is clipped
   // to the newly visible area, which is a problem since the content changes when visRect
-  // changes, so tqrepaint the full item in that case
+  // changes, so repaint the full item in that case
   if ( ev->rect() != visRect && visRect.isValid() && ev->rect().isValid() ) {
-    tqrepaint( visRect );
+    repaint( visRect );
     return;
   }
 
   TQPainter p( this );
-  const int ft = 2; // frame thickness for tqlayout, see paintFrame()
+  const int ft = 2; // frame thickness for layout, see paintFrame()
   const int margin = 1 + ft; // frame + space between frame and content
 
   // General idea is to always show the icons (even in the all-day events).
@@ -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();
   }
 
@@ -838,8 +838,8 @@ void KOAgendaItem::paintEvent( TQPaintEvent *ev )
   if ( !isMultiItem() ) {
     shortH = KGlobal::locale()->formatTime(mIncidence->dtStart().time());
     if (mIncidence->type() != "Todo")
-      longH = i18n("%1 - %2").tqarg(shortH)
-               .tqarg(KGlobal::locale()->formatTime(mIncidence->dtEnd().time()));
+      longH = i18n("%1 - %2").arg(shortH)
+               .arg(KGlobal::locale()->formatTime(mIncidence->dtEnd().time()));
     else
       longH = shortH;
   } else if ( !mMultiItemInfo->mFirstMultiItem ) {
@@ -847,7 +847,7 @@ void KOAgendaItem::paintEvent( TQPaintEvent *ev )
     longH = shortH;
   } else {
     shortH = KGlobal::locale()->formatTime(mIncidence->dtEnd().time());
-    longH = i18n("- %1").tqarg(shortH);
+    longH = i18n("- %1").arg(shortH);
   }
 
   KWordWrap *ww = KWordWrap::formatText( fm,
@@ -937,8 +937,8 @@ void KOAgendaItem::paintEvent( TQPaintEvent *ev )
          (mIncidence->dtStart() != mIncidence->dtEnd()) ) { // multi days
       shortH = longH =
         i18n("%1 - %2")
-             .tqarg(KGlobal::locale()->formatDate(mIncidence->dtStart().date()))
-             .tqarg(KGlobal::locale()->formatDate(mIncidence->dtEnd().date()));
+             .arg(KGlobal::locale()->formatDate(mIncidence->dtStart().date()))
+             .arg(KGlobal::locale()->formatDate(mIncidence->dtEnd().date()));
 
       // paint headline
       p.fillRect( 0, 0, width(), (ft/2) + margin + hlHeight,
diff --git a/korganizer/koagendaitem.h b/korganizer/koagendaitem.h
index 23a36acf9..c95a9f4fb 100644
--- a/korganizer/koagendaitem.h
+++ b/korganizer/koagendaitem.h
@@ -53,7 +53,7 @@ struct MultiItemInfo
 /*
   The KOAgendaItem has to make sure that it receives all mouse events, which are
   to be used for dragging and resizing. That means it has to be installed as
-  eventfiler for its tqchildren, if it has tqchildren, and it has to pass mouse
+  eventfiler for its children, if it has children, and it has to pass mouse
   events from the cildren to itself. See eventFilter().
 
 
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index ba565a8d2..cb604fcf7 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -26,7 +26,7 @@
 #include <tqvbox.h>
 #include <tqlabel.h>
 #include <tqframe.h>
-#include <tqlayout.h>
+#include <layout.h>
 #ifndef KORG_NOSPLITTER
 #include <tqsplitter.h>
 #endif
@@ -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 );
@@ -476,7 +476,7 @@ void KOAgendaView::zoomInVertically( )
 
   mTimeLabels->updateConfig();
   mTimeLabels->positionChanged();
-  mTimeLabels->tqrepaint();
+  mTimeLabels->repaint();
 
   updateView();
 }
@@ -493,7 +493,7 @@ void KOAgendaView::zoomOutVertically( )
 
     mTimeLabels->updateConfig();
     mTimeLabels->positionChanged();
-    mTimeLabels->tqrepaint();
+    mTimeLabels->repaint();
 
     updateView();
   }
@@ -627,16 +627,16 @@ void KOAgendaView::createDayLabels( bool force )
     int dW = calsys->dayOfWeek(date);
     TQString veryLongStr = KGlobal::locale()->formatDate( date );
     TQString longstr = i18n( "short_weekday date (e.g. Mon 13)","%1 %2" )
-        .tqarg( calsys->weekDayName( dW, true ) )
-        .tqarg( calsys->day(date) );
+        .arg( calsys->weekDayName( dW, true ) )
+        .arg( calsys->day(date) );
     TQString shortstr = TQString::number(calsys->day(date));
 
     KOAlternateLabel *dayLabel = new KOAlternateLabel(shortstr,
                                                       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();
 }
@@ -783,7 +783,7 @@ void KOAgendaView::updateConfig()
 {
 //  kdDebug(5850) << "KOAgendaView::updateConfig()" << endl;
 
-  // update config for tqchildren
+  // update config for children
   mTimeLabels->updateConfig();
   mAgenda->updateConfig();
   mAllDayAgenda->updateConfig();
@@ -793,7 +793,7 @@ void KOAgendaView::updateConfig()
   mTimeLabels->positionChanged();
 
   // for some reason, this needs to be called explicitly
-  mTimeLabels->tqrepaint();
+  mTimeLabels->repaint();
 
   updateTimeBarWidth();
 
@@ -1343,7 +1343,7 @@ void KOAgendaView::changeIncidenceDisplay( Incidence *incidence, int mode )
   }
 
   // HACK: Update the view if the all-day agenda has been modified.
-  // Do this because there are some tqlayout problems in the
+  // Do this because there are some layout problems in the
   // all-day agenda that are not easily solved, but clearing
   // and redrawing works ok.
   if ( incidence->doesFloat() ) {
@@ -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 647dcafcb..1a90bad09 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 aecf8ba9c..e20c42db1 100644
--- a/korganizer/koapp.cpp
+++ b/korganizer/koapp.cpp
@@ -57,7 +57,7 @@ using namespace std;
 KOrganizerApp::KOrganizerApp() : KUniqueApplication()
 {
   TQString prodId = "-//K Desktop Environment//NONSGML KOrganizer %1//EN";
-  CalFormat::setApplication( "KOrganizer", prodId.tqarg( korgVersion ) );
+  CalFormat::setApplication( "KOrganizer", prodId.arg( korgVersion ) );
 }
 
 KOrganizerApp::~KOrganizerApp()
@@ -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 497f10982..cb5ca0122 100644
--- a/korganizer/koattendeeeditor.cpp
+++ b/korganizer/koattendeeeditor.cpp
@@ -49,7 +49,7 @@
 #include <tqcombobox.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqwhatsthis.h>
 
@@ -61,10 +61,10 @@ KOAttendeeEditor::KOAttendeeEditor( TQWidget * parent, const char *name ) :
 {
 }
 
-void KOAttendeeEditor::initOrganizerWidgets(TQWidget * parent, TQBoxLayout * tqlayout)
+void KOAttendeeEditor::initOrganizerWidgets(TQWidget * parent, TQBoxLayout * layout)
 {
   mOrganizerHBox = new TQHBox( parent );
-  tqlayout->addWidget( mOrganizerHBox );
+  layout->addWidget( mOrganizerHBox );
   // If creating a new event, then the user is the organizer -> show the
   // identity combo
   // readEvent will delete it and set another label text instead, if the user
@@ -91,10 +91,10 @@ void KOAttendeeEditor::initOrganizerWidgets(TQWidget * parent, TQBoxLayout * tql
   mOrganizerHBox->setStretchFactor( mOrganizerCombo, 100 );
 }
 
-void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * tqlayout)
+void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * layout)
 {
   TQGridLayout *topLayout = new TQGridLayout();
-  tqlayout->addLayout( topLayout );
+  layout->addLayout( topLayout );
 
   TQString whatsThis = i18n("Edits the name of the attendee selected in the list "
                            "above, or adds a new attendee if there are no attendees"
@@ -309,7 +309,7 @@ void KOAttendeeEditor::readEvent(KCal::Incidence * incidence)
       delete mOrganizerCombo;
       mOrganizerCombo = 0;
     }
-    mOrganizerLabel->setText( i18n( "Organizer: %1" ).tqarg( incidence->organizer().fullName() ) );
+    mOrganizerLabel->setText( i18n( "Organizer: %1" ).arg( incidence->organizer().fullName() ) );
   }
 
   Attendee::List al = incidence->attendees();
@@ -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();
@@ -477,9 +477,9 @@ void KOAttendeeEditor::fillAttendeeInput( KCal::Attendee *a )
 
   if ( a->status() == Attendee::Delegated ) {
     if ( !a->delegate().isEmpty() )
-      mDelegateLabel->setText( i18n( "Delegated to %1" ).tqarg( a->delegate() ) );
+      mDelegateLabel->setText( i18n( "Delegated to %1" ).arg( a->delegate() ) );
     else if ( !a->delegator().isEmpty() )
-      mDelegateLabel->setText( i18n( "Delegated from %1" ).tqarg( a->delegator() ) );
+      mDelegateLabel->setText( i18n( "Delegated from %1" ).arg( a->delegator() ) );
     else
       mDelegateLabel->setText( i18n( "Not delegated" ) );
   }
diff --git a/korganizer/koattendeeeditor.h b/korganizer/koattendeeeditor.h
index 828bf479e..0719744bf 100644
--- a/korganizer/koattendeeeditor.h
+++ b/korganizer/koattendeeeditor.h
@@ -68,8 +68,8 @@ class KOAttendeeEditor : public TQWidget
     void updateAttendeeSummary( int count );
 
   protected:
-    void initOrganizerWidgets( TQWidget *parent, TQBoxLayout *tqlayout );
-    void initEditWidgets( TQWidget *parent, TQBoxLayout *tqlayout );
+    void initOrganizerWidgets( TQWidget *parent, TQBoxLayout *layout );
+    void initEditWidgets( TQWidget *parent, TQBoxLayout *layout );
 
     /** Reads values from a KABC::Addressee and inserts a new Attendee
      * item into the listview with those items. Used when adding attendees
diff --git a/korganizer/kocore.cpp b/korganizer/kocore.cpp
index b3781e2d9..7503d2de4 100644
--- a/korganizer/kocore.cpp
+++ b/korganizer/kocore.cpp
@@ -67,7 +67,7 @@ KTrader::OfferList KOCore::availablePlugins( const TQString &type, int version )
   TQString constraint;
   if ( version >= 0 ) {
     constraint = TQString("[X-KDE-PluginInterfaceVersion] == %1")
-                 .tqarg( TQString::number( version ) );
+                 .arg( TQString::number( version ) );
   }
 
   return KTrader::self()->query( type, constraint );
@@ -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 0e921e440..1ced5338e 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;
     }
   }
@@ -386,15 +386,15 @@ void KODayMatrix::mouseReleaseEvent( TQMouseEvent *e )
     mSelEnd = mSelInit;
     if (tmp != mSelStart) {
       mSelStart = tmp;
-      tqrepaint();
+      repaint();
     }
   } else {
     mSelStart = mSelInit;
 
-    //tqrepaint only if selection has changed
+    //repaint only if selection has changed
     if (tmp != mSelEnd) {
       mSelEnd = tmp;
-      tqrepaint();
+      repaint();
     }
   }
 
@@ -415,15 +415,15 @@ void KODayMatrix::mouseMoveEvent( TQMouseEvent *e )
     mSelEnd = mSelInit;
     if ( tmp != mSelStart ) {
       mSelStart = tmp;
-      tqrepaint();
+      repaint();
     }
   } else {
     mSelStart = mSelInit;
 
-    //tqrepaint only if selection has changed
+    //repaint only if selection has changed
     if ( tmp != mSelEnd ) {
       mSelEnd = tmp;
-      tqrepaint();
+      repaint();
     }
   }
 }
@@ -562,9 +562,9 @@ void KODayMatrix::paintEvent( TQPaintEvent * )
   int selw, selh;
   bool isRTL = KOGlobals::self()->reverseLayout();
 
-  TQColorGroup cg = tqpalette().active();
+  TQColorGroup cg = palette().active();
 
-  p.tqbegin(  &pm, this );
+  p.begin(  &pm, this );
   pm.fill( cg.base() );
 
   // draw topleft frame
diff --git a/korganizer/kodaymatrix.h b/korganizer/kodaymatrix.h
index 37a48ebd2..d24264253 100644
--- a/korganizer/kodaymatrix.h
+++ b/korganizer/kodaymatrix.h
@@ -132,7 +132,7 @@ class KODayMatrix: public TQFrame, public KCal::Calendar::Observer
 
     /** updates the day matrix to start with the given date. Does all the necessary
      *  checks for holidays or events on a day and stores them for display later on.
-     *  Does NOT update the view visually. Call tqrepaint() for this.
+     *  Does NOT update the view visually. Call repaint() for this.
      *
      *  @param actdate recalculates the day matrix to show NUMDAYS starting from this
      *                 date.
@@ -162,7 +162,7 @@ class KODayMatrix: public TQFrame, public KCal::Calendar::Observer
 
     /** sets the actual to be displayed selection in the day matrix starting from
      *  start and ending with end. Theview must be manually updated by calling
-     *  tqrepaint. (?)
+     *  repaint. (?)
      */
     void setSelectedDaysFrom( const TQDate &start, const TQDate &end );
 
@@ -313,7 +313,7 @@ class KODayMatrix: public TQFrame, public KCal::Calendar::Observer
     int       mTodayMarginWidth;
 
     /** stores actual size of each day in the widget so that I don't need to ask this data
-     *  on every tqrepaint.
+     *  on every repaint.
      */
     TQRect     mDaySize;
 
diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp
index 91e0e27d0..83ceec0ea 100644
--- a/korganizer/kodialogmanager.cpp
+++ b/korganizer/kodialogmanager.cpp
@@ -111,8 +111,8 @@ KODialogManager::~KODialogManager()
 void KODialogManager::errorSaveIncidence( TQWidget *parent, Incidence *incidence )
 {
   KMessageBox::sorry( parent, i18n("Unable to save %1 \"%2\".")
-                      .tqarg( i18n( incidence->type() ) )
-                      .tqarg( incidence->summary() ) );
+                      .arg( i18n( incidence->type() ) )
+                      .arg( incidence->summary() ) );
 }
 
 void KODialogManager::showOptionsDialog()
diff --git a/korganizer/koeditoralarms.cpp b/korganizer/koeditoralarms.cpp
index 4211e93a9..2cbcf533e 100644
--- a/korganizer/koeditoralarms.cpp
+++ b/korganizer/koeditoralarms.cpp
@@ -29,14 +29,14 @@
 
 #include <libkcal/duration.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlistview.h>
 #include <tqpushbutton.h>
 #include <tqspinbox.h>
 #include <tqcombobox.h>
 #include <tqcheckbox.h>
 #include <tqbuttongroup.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <tqwidgetstack.h>
 #include <tqradiobutton.h>
 #include <tqtooltip.h>
@@ -167,13 +167,13 @@ void AlarmListViewItem::construct()
 
     if ( offset % (24*60) == 0 && offset>0 ) { // divides evenly into days?
       useoffset = offset / (24*60);
-      offsetstr = offsetstr.tqarg( i18n("1 day", "%n days", useoffset ) );
+      offsetstr = offsetstr.arg( i18n("1 day", "%n days", useoffset ) );
     } else if (offset % 60 == 0 && offset>0 ) { // divides evenly into hours?
       useoffset = offset / 60;
-      offsetstr = offsetstr.tqarg( i18n("1 hour", "%n hours", useoffset ) );
+      offsetstr = offsetstr.arg( i18n("1 hour", "%n hours", useoffset ) );
     } else {
       useoffset = offset;
-      offsetstr = offsetstr.tqarg( i18n("1 minute", "%n minutes", useoffset ) );
+      offsetstr = offsetstr.arg( i18n("1 minute", "%n minutes", useoffset ) );
     }
     setText( ColAlarmOffset, offsetstr );
 
diff --git a/korganizer/koeditoralarms_base.ui b/korganizer/koeditoralarms_base.ui
index 9f599b6fd..716252f2a 100644
--- a/korganizer/koeditoralarms_base.ui
+++ b/korganizer/koeditoralarms_base.ui
@@ -35,7 +35,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -109,7 +109,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout8</cstring>
+                        <cstring>layout8</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -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>
@@ -530,7 +530,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout7</cstring>
+                <cstring>layout7</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -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 b39d5fe53..08e80b101 100644
--- a/korganizer/koeditorattachments.cpp
+++ b/korganizer/koeditorattachments.cpp
@@ -58,14 +58,14 @@
 #include <tqcheckbox.h>
 #include <tqfile.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlistview.h>
 #include <tqpushbutton.h>
 #include <tqdragobject.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 #include <tqapplication.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 
 #include <cassert>
 #include <cstdlib>
@@ -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() );
     }
@@ -718,7 +718,7 @@ void KOEditorAttachments::slotRemove()
 
   if ( KMessageBox::questionYesNo(
          this,
-         i18n( "<qt>Do you really want to remove these attachments?<p>%1</qt>" ).tqarg( labelsStr ),
+         i18n( "<qt>Do you really want to remove these attachments?<p>%1</qt>" ).arg( labelsStr ),
          i18n( "Remove Attachment?" ),
          KStdGuiItem::yes(), KStdGuiItem::no(),
          "calendarRemoveAttachments" ) != KMessageBox::Yes ) {
@@ -874,7 +874,7 @@ void KOEditorAttachments::writeIncidence( KCal::Incidence *i )
 
 void KOEditorAttachments::slotCopy()
 {
-    TQApplication::tqclipboard()->setData( mAttachments->mimeData(), TQClipboard::Clipboard );
+    TQApplication::clipboard()->setData( mAttachments->mimeData(), TQClipboard::Clipboard );
 }
 
 void KOEditorAttachments::slotCut()
@@ -885,7 +885,7 @@ void KOEditorAttachments::slotCut()
 
 void KOEditorAttachments::slotPaste()
 {
-    handlePasteOrDrop( TQApplication::tqclipboard()->data() );
+    handlePasteOrDrop( TQApplication::clipboard()->data() );
 }
 
 void KOEditorAttachments::selectionChanged()
diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp
index a47dc7374..d181e5a71 100644
--- a/korganizer/koeditordetails.cpp
+++ b/korganizer/koeditordetails.cpp
@@ -33,7 +33,7 @@
 #include <tqfiledialog.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
@@ -329,7 +329,7 @@ void KOEditorDetails::writeEvent(Incidence *event)
       bool skip = false;
       if ( attendee->email().endsWith( "example.net" ) ) {
         if ( KMessageBox::warningYesNo( this, i18n("%1 does not look like a valid email address. "
-                "Are you sure you want to invite this participant?").tqarg( attendee->email() ),
+                "Are you sure you want to invite this participant?").arg( attendee->email() ),
               i18n("Invalid email address") ) != KMessageBox::Yes ) {
           skip = true;
         }
@@ -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 2fc7b30fd..d19c2c90a 100644
--- a/korganizer/koeditorfreebusy.cpp
+++ b/korganizer/koeditorfreebusy.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <tqtooltip.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcombobox.h>
 #include <tqpushbutton.h>
@@ -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 );
   }
 
@@ -699,7 +699,7 @@ void KOEditorFreeBusy::updateStatusSummary()
     mStatusSummaryLabel->setText(
         i18n( "Of the %1 participants, %2 have accepted, %3"
               " have tentatively accepted, and %4 have declined.")
-        .tqarg( total ).tqarg( accepted ).tqarg( tentative ).tqarg( declined ) );
+        .arg( total ).arg( accepted ).arg( tentative ).arg( declined ) );
   } else {
     mStatusSummaryLabel->hide();
   }
@@ -783,7 +783,7 @@ void KOEditorFreeBusy::writeEvent(KCal::Event * event)
       bool skip = false;
       if ( attendee->email().endsWith( "example.net" ) ) {
         if ( KMessageBox::warningYesNo( this, i18n("%1 does not look like a valid email address. "
-                "Are you sure you want to invite this participant?").tqarg( attendee->email() ),
+                "Are you sure you want to invite this participant?").arg( attendee->email() ),
               i18n("Invalid email address") ) != KMessageBox::Yes ) {
           skip = true;
         }
@@ -852,8 +852,8 @@ void KOEditorFreeBusy::clearSelection() const
   KDGanttViewItem *item = mGanttView->selectedItem();
   if ( item )
     mGanttView->setSelected( item, false );
-  mGanttView->tqrepaint();
-  item->tqrepaint();
+  mGanttView->repaint();
+  item->repaint();
 }
 
 void KOEditorFreeBusy::setSelected( int index )
@@ -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/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index 8e4cb166c..805739371 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -25,7 +25,7 @@
 
 #include <tqwidget.h>
 #include <tqtooltip.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqvbox.h>
 #include <tqhbox.h>
 #include <tqbuttongroup.h>
@@ -426,7 +426,7 @@ void KOEditorGeneral::updateAlarmWidgets( Incidence *incidence )
         remStr = remStr.left( maxLen );
         remStr += etc;
       }
-      mAlarmInfoLabel->setText( i18n( "Triggers %1" ).tqarg( remStr ) );
+      mAlarmInfoLabel->setText( i18n( "Triggers %1" ).arg( remStr ) );
     }
   } else {  // alarm count is 1
     Alarm *alarm = mAlarmList.first();
@@ -465,7 +465,7 @@ void KOEditorGeneral::updateAlarmWidgets( Incidence *incidence )
       mSimpleAlarmBox->hide();
       if ( incidence ) {
         TQString remStr = IncidenceFormatter::reminderStringList( incidence ).first();
-        mAlarmInfoLabel->setText( i18n( "Triggers %1" ).tqarg( remStr ) );
+        mAlarmInfoLabel->setText( i18n( "Triggers %1" ).arg( remStr ) );
       }
     }
   }
@@ -497,7 +497,7 @@ void KOEditorGeneral::readIncidence( Incidence *incidence, Calendar *calendar )
 
   TQString resLabel = IncidenceFormatter::resourceString( calendar, incidence );
   if ( !resLabel.isEmpty() ) {
-    mResourceLabel->setText( i18n( "Calendar: %1" ).tqarg( resLabel ) );
+    mResourceLabel->setText( i18n( "Calendar: %1" ).arg( resLabel ) );
     mResourceLabel->show();
   }
 }
diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp
index e069d65de..a916b3741 100644
--- a/korganizer/koeditorgeneralevent.cpp
+++ b/korganizer/koeditorgeneralevent.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <tqtooltip.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqvbox.h>
 #include <tqbuttongroup.h>
 #include <tqvgroupbox.h>
@@ -193,15 +193,15 @@ void KOEditorGeneralEvent::initClass(TQWidget *parent,TQBoxLayout *topLayout)
   freeTimeLabel->setBuddy( mFreeTimeCombo );
 }
 
-void KOEditorGeneralEvent::initInvitationBar(TQWidget * parent, TQBoxLayout * tqlayout)
+void KOEditorGeneralEvent::initInvitationBar(TQWidget * parent, TQBoxLayout * layout)
 {
-  TQBoxLayout *topLayout = new TQHBoxLayout( tqlayout );
+  TQBoxLayout *topLayout = new TQHBoxLayout( layout );
   mInvitationBar = new TQFrame( parent );
   mInvitationBar->setPaletteBackgroundColor( KGlobalSettings::alternateBackgroundColor() );
   topLayout->addWidget( mInvitationBar );
 
   TQBoxLayout *barLayout = new TQHBoxLayout( mInvitationBar );
-  barLayout->setSpacing( tqlayout->spacing() );
+  barLayout->setSpacing( layout->spacing() );
   TQLabel *label = new TQLabel( i18n("You have not yet definitely responded to this invitation." ), mInvitationBar );
   barLayout->addWidget( label );
   barLayout->addStretch( 1 );
@@ -479,8 +479,8 @@ void KOEditorGeneralEvent::emitDateTimeStr()
     to = l->formatDateTime(mCurrEndDateTime);
   }
 
-  TQString str = i18n("From: %1   To: %2   %3").tqarg(from).tqarg(to)
-                .tqarg(mDurationLabel->text());
+  TQString str = i18n("From: %1   To: %2   %3").arg(from).arg(to)
+                .arg(mDurationLabel->text());
 
   emit dateTimeStrChanged(str);
 }
@@ -493,14 +493,14 @@ bool KOEditorGeneralEvent::validateInput()
     if (!mStartTimeEdit->inputIsValid()) {
       KMessageBox::sorry( 0,
           i18n("Please specify a valid start time, for example '%1'.")
-          .tqarg( KGlobal::locale()->formatTime( TQTime::currentTime() ) ) );
+          .arg( KGlobal::locale()->formatTime( TQTime::currentTime() ) ) );
       return false;
     }
 
     if (!mEndTimeEdit->inputIsValid()) {
       KMessageBox::sorry( 0,
           i18n("Please specify a valid end time, for example '%1'.")
-          .tqarg( KGlobal::locale()->formatTime( TQTime::currentTime() ) ) );
+          .arg( KGlobal::locale()->formatTime( TQTime::currentTime() ) ) );
       return false;
     }
   }
@@ -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() ) ) );
+        .arg( 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() ) ) );
+        .arg( KGlobal::locale()->formatDate( TQDate::currentDate() ) ) );
     return false;
   }
 
diff --git a/korganizer/koeditorgeneralevent.h b/korganizer/koeditorgeneralevent.h
index 734826eb9..037b2323b 100644
--- a/korganizer/koeditorgeneralevent.h
+++ b/korganizer/koeditorgeneralevent.h
@@ -49,7 +49,7 @@ class KOEditorGeneralEvent : public KOEditorGeneral
 
     void initTime(TQWidget *,TQBoxLayout *);
     void initClass(TQWidget *,TQBoxLayout *);
-    void initInvitationBar( TQWidget* parent, TQBoxLayout *tqlayout );
+    void initInvitationBar( TQWidget* parent, TQBoxLayout *layout );
 
     void finishSetup();
 
diff --git a/korganizer/koeditorgeneraljournal.cpp b/korganizer/koeditorgeneraljournal.cpp
index 25372ba49..fa3e40ac4 100644
--- a/korganizer/koeditorgeneraljournal.cpp
+++ b/korganizer/koeditorgeneraljournal.cpp
@@ -41,7 +41,7 @@
 #include <tqdatetime.h>
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 
 
@@ -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() ) ) );
+        .arg( KGlobal::locale()->formatDate( TQDate::currentDate() ) ) );
     return false;
   }
 
diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp
index fe2fbe2b2..f9cb9d7ec 100644
--- a/korganizer/koeditorgeneraltodo.cpp
+++ b/korganizer/koeditorgeneraltodo.cpp
@@ -24,7 +24,7 @@
 
 #include <tqtooltip.h>
 #include <tqfiledialog.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqvbox.h>
 #include <tqbuttongroup.h>
 #include <tqvgroupbox.h>
@@ -206,7 +206,7 @@ void KOEditorGeneralTodo::initCompletion( TQWidget *parent, TQBoxLayout *topLayo
                    i18n( "Use this combobox to set the completion percentage of the to-do." ) );
   for ( int i = 0; i <= 100; i+=10 ) {
     // xgettext:no-c-format
-    TQString label = i18n( "Percent complete", "%1 %" ).tqarg( i );
+    TQString label = i18n( "Percent complete", "%1 %" ).arg( i );
     mCompletedCombo->insertItem( label );
   }
   connect( mCompletedCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(completedChanged(int)) );
@@ -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 );
   }
@@ -569,18 +569,18 @@ void KOEditorGeneralTodo::dateChanged()
   TQString dateTimeStr = "";
 
   if ( mStartCheck->isChecked() ) {
-    dateTimeStr += i18n("Start: %1").tqarg(
+    dateTimeStr += i18n("Start: %1").arg(
                                      l->formatDate( mStartDateEdit->date() ) );
     if ( mTimeButton->isChecked() )
-      dateTimeStr += TQString(" %1").tqarg(
+      dateTimeStr += TQString(" %1").arg(
                                    l->formatTime( mStartTimeEdit->getTime() ) );
   }
 
   if ( mDueCheck->isChecked() ) {
-    dateTimeStr += i18n("   Due: %1").tqarg(
+    dateTimeStr += i18n("   Due: %1").arg(
                                       l->formatDate( mDueDateEdit->date() ) );
     if ( mTimeButton->isChecked() )
-      dateTimeStr += TQString(" %1").tqarg(
+      dateTimeStr += TQString(" %1").arg(
                                     l->formatTime( mDueTimeEdit->getTime() ) );
   }
 
diff --git a/korganizer/koeditorgeneraltodo.h b/korganizer/koeditorgeneraltodo.h
index 27ffdc270..bf7fb9794 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 b1174bbb9..a8b6c816f 100644
--- a/korganizer/koeditorrecurrence.cpp
+++ b/korganizer/koeditorrecurrence.cpp
@@ -24,7 +24,7 @@
 
 #include <tqtooltip.h>
 #include <tqfiledialog.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqvbox.h>
 #include <tqbuttongroup.h>
 #include <tqvgroupbox.h>
@@ -135,10 +135,10 @@ TQComboBox *RecurBase::createMonthNameCombo( TQWidget *parent, const char *name
   return combo;
 }
 
-TQBoxLayout *RecurBase::createFrequencySpinBar( TQWidget *parent, TQLayout *tqlayout,
+TQBoxLayout *RecurBase::createFrequencySpinBar( TQWidget *parent, TQLayout *layout,
     TQString everyText, TQString unitText )
 {
-  TQBoxLayout *freqLayout = new TQHBoxLayout( tqlayout );
+  TQBoxLayout *freqLayout = new TQHBoxLayout( layout );
 
   TQString whatsThis = i18n("Sets how often this event or to-do should recur.");
   TQLabel *preLabel = new TQLabel( everyText, parent );
@@ -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(
@@ -824,7 +824,7 @@ void RecurrenceRangeWidget::setDateTimes( const TQDateTime &start,
                                           const TQDateTime & )
 {
   mStartDateLabel->setText( i18n("Begins on: %1")
-      .tqarg( KGlobal::locale()->formatDate( start.date() ) ) );
+      .arg( KGlobal::locale()->formatDate( start.date() ) ) );
 }
 
 ///////////////////////// RecurrenceRangeDialog ///////////////////////////
@@ -1394,8 +1394,8 @@ bool KOEditorRecurrence::validateInput()
        mEventStartDt.isValid() && ((mRecurrenceRange->endDate())<mEventStartDt.date()) ) {
     KMessageBox::sorry( 0,
       i18n("The end date '%1' of the recurrence must be after the start date '%2' of the event.")
-      .tqarg( KGlobal::locale()->formatDate( mRecurrenceRange->endDate() ) )
-      .tqarg( KGlobal::locale()->formatDate( mEventStartDt.date() ) ) );
+      .arg( KGlobal::locale()->formatDate( mRecurrenceRange->endDate() ) )
+      .arg( KGlobal::locale()->formatDate( mEventStartDt.date() ) ) );
     return false;
   }
   int recurrenceType = mRecurrenceChooser->type();
diff --git a/korganizer/koeditorrecurrence.h b/korganizer/koeditorrecurrence.h
index 1592f4272..f3aeeb41d 100644
--- a/korganizer/koeditorrecurrence.h
+++ b/korganizer/koeditorrecurrence.h
@@ -61,7 +61,7 @@ class RecurBase : public TQWidget
     static TQComboBox *createWeekCountCombo( TQWidget *parent=0, const char *name=0 );
     static TQComboBox *createWeekdayCombo( TQWidget *parent=0, const char *name=0 );
     static TQComboBox *createMonthNameCombo( TQWidget *parent=0, const char *name=0 );
-    TQBoxLayout *createFrequencySpinBar( TQWidget *parent, TQLayout *tqlayout,
+    TQBoxLayout *createFrequencySpinBar( TQWidget *parent, TQLayout *layout,
     TQString everyText, TQString unitText );
 
   private:
diff --git a/korganizer/koeventeditor.cpp b/korganizer/koeventeditor.cpp
index c73a67ac2..dbbdfe127 100644
--- a/korganizer/koeventeditor.cpp
+++ b/korganizer/koeventeditor.cpp
@@ -26,7 +26,7 @@
 #include <tqtooltip.h>
 #include <tqframe.h>
 #include <tqpixmap.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwidgetstack.h>
 #include <tqwhatsthis.h>
 
@@ -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 ) );
@@ -285,7 +285,7 @@ bool KOEventEditor::processInput()
         // add dummy event at the position of the counter proposal
         Event *event = mEvent->clone();
         event->clearAttendees();
-        event->setSummary( i18n("My counter proposal for: %1").tqarg( mEvent->summary() ) );
+        event->setSummary( i18n("My counter proposal for: %1").arg( mEvent->summary() ) );
         mChanger->addIncidence( event, mResource, mSubResource, this );
       } else {
         if ( mRecurIncidence && mRecurIncidenceAfterDissoc ) {
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index a9746dbe9..2596f0b66 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -62,7 +62,7 @@ void KOEventViewer::message( const TQString &link )
   if ( link.startsWith( "kmail:" ) ) {
     ttStr = i18n( "Open the message in KMail" );
   } else if ( link.startsWith( "mailto:" ) ) {
-    ttStr = i18n( "Send an email message to %1" ).tqarg( link.mid( 7 ) );
+    ttStr = i18n( "Send an email message to %1" ).arg( link.mid( 7 ) );
   } else if ( link.startsWith( "uid:" ) ) {
     ttStr = i18n( "Lookup the contact in KAddressbook" );
   } else if ( link.startsWith( "ATTACH:" ) ) {
@@ -70,7 +70,7 @@ void KOEventViewer::message( const TQString &link )
     tmp.remove( TQRegExp( "^ATTACH://" ) );
     TQString uid = tmp.section( ':', 0, 0 );
     TQString name = tmp.section( ':', -1, -1 );
-    ttStr = i18n( "View attachment \"%1\"" ).tqarg( name );
+    ttStr = i18n( "View attachment \"%1\"" ).arg( name );
     mAttachLink = link;
   } else {  // no special URI, let KDE handle it
     ttStr = i18n( "Launch a viewer on the link" );
@@ -85,7 +85,7 @@ void KOEventViewer::readSettings( KConfig * config )
 // With each restart of KOrganizer the font site gets halfed. What should this
 // be good for?
 #if 0
-    config->setGroup( TQString("EventViewer-%1").tqarg( name() )  );
+    config->setGroup( TQString("EventViewer-%1").arg( name() )  );
     int zoomFactor = config->readNumEntry("ZoomFactor", pointSize() );
     zoomTo( zoomFactor/2 );
     kdDebug(5850) << " KOEventViewer: restoring the pointSize:  "<< pointSize()
@@ -98,7 +98,7 @@ void KOEventViewer::writeSettings( KConfig * config )
 {
   if ( config ) {
     kdDebug(5850) << " KOEventViewer: saving the zoomFactor: "<< pointSize() << endl;
-    config->setGroup( TQString("EventViewer-%1").tqarg( name() ) );
+    config->setGroup( TQString("EventViewer-%1").arg( name() ) );
     config->writeEntry("ZoomFactor", pointSize() );
   }
 }
diff --git a/korganizer/koeventviewer.h b/korganizer/koeventviewer.h
index bebbb4ed2..d7408aedc 100644
--- a/korganizer/koeventviewer.h
+++ b/korganizer/koeventviewer.h
@@ -26,7 +26,7 @@
 
 #include <tdepimmacros.h>
 #include <kconfig.h>
-#include <tqtextbrowser.h>
+#include <textbrowser.h>
 
 namespace KCal {
   class Calendar;
diff --git a/korganizer/kogroupware.cpp b/korganizer/kogroupware.cpp
index 5104383c1..10c6a1c1e 100644
--- a/korganizer/kogroupware.cpp
+++ b/korganizer/kogroupware.cpp
@@ -163,7 +163,7 @@ void KOGroupware::incomingDirChanged( const TQString& path )
   if ( !message ) {
     TQString errorMessage;
     if (mFormat.exception())
-      errorMessage = i18n( "Error message: %1" ).tqarg( mFormat.exception()->message() );
+      errorMessage = i18n( "Error message: %1" ).arg( mFormat.exception()->message() );
     kdDebug(5850) << "MailScheduler::retrieveTransactions() Error parsing "
                   << errorMessage << endl;
     KMessageBox::detailedError( mView,
@@ -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;
       }
     }
@@ -401,7 +401,7 @@ void KOGroupware::sendCounterProposal(KCal::Calendar *calendar, KCal::Event * ol
     return;
   if ( KOPrefs::instance()->outlookCompatCounterProposals() ) {
     Incidence* tmp = oldEvent->clone();
-    tmp->setSummary( i18n("Counter proposal: %1").tqarg( newEvent->summary() ) );
+    tmp->setSummary( i18n("Counter proposal: %1").arg( newEvent->summary() ) );
     tmp->setDescription( newEvent->description() );
     tmp->addComment( i18n("Proposed new meeting time: %1 - %2").
                      arg( IncidenceFormatter::dateToString( newEvent->dtStart() ),
diff --git a/korganizer/kogroupwareprefspage.ui b/korganizer/kogroupwareprefspage.ui
index feec8d710..24cf9bbfc 100644
--- a/korganizer/kogroupwareprefspage.ui
+++ b/korganizer/kogroupwareprefspage.ui
@@ -41,7 +41,7 @@
                         <property name="text">
                             <string>By publishing Free/Busy information, you allow others to take your calendar into account when inviting you for a meeting. Only the times you have already busy are published, not why they are busy. For Kolab2 Server leave this disabled (the information is generated on the server).</string>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>WordBreak|AlignVCenter</set>
                         </property>
                     </widget>
@@ -60,7 +60,7 @@ Note: If KOrganizer is acting as a KDE Kolab client, this is not required, as th
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout8</cstring>
+                            <cstring>layout8</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -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>
@@ -319,7 +319,7 @@ Ask the server administrator for this information.</string>
                         <property name="text">
                             <string>By retrieving Free/Busy information that others have published, you can take their calendar into account when inviting them to a meeting.</string>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>WordBreak|AlignVCenter</set>
                         </property>
                     </widget>
@@ -422,7 +422,7 @@ For example: "https://kolab2.example.com/freebusy/user.xfb"</string>
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout13</cstring>
+                                    <cstring>layout13</cstring>
                                 </property>
                                 <grid>
                                     <property name="name">
@@ -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/koincidenceeditor.cpp b/korganizer/koincidenceeditor.cpp
index 0a027181b..eb4880740 100644
--- a/korganizer/koincidenceeditor.cpp
+++ b/korganizer/koincidenceeditor.cpp
@@ -26,7 +26,7 @@
 #include <tqframe.h>
 #include <tqguardedptr.h>
 #include <tqpixmap.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwidgetstack.h>
 #include <tqdatetime.h>
 #include <tqwhatsthis.h>
@@ -172,12 +172,12 @@ void KOIncidenceEditor::slotLoadTemplate( const TQString& templateName )
 
   if ( fileName.isEmpty() ) {
     KMessageBox::error( this, i18n("Unable to find template '%1'.")
-        .tqarg( fileName ) );
+        .arg( fileName ) );
   } else {
     ICalFormat format;
     if ( !format.load( &cal, fileName ) ) {
       KMessageBox::error( this, i18n("Error loading template file '%1'.")
-          .tqarg( fileName ) );
+          .arg( fileName ) );
       return;
     }
   }
diff --git a/korganizer/kojournaleditor.cpp b/korganizer/kojournaleditor.cpp
index 30e6c7d71..458b2163e 100644
--- a/korganizer/kojournaleditor.cpp
+++ b/korganizer/kojournaleditor.cpp
@@ -39,7 +39,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 
 using namespace KCal;
 
@@ -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 1219fd57e..0eee35a24 100644
--- a/korganizer/kojournalview.cpp
+++ b/korganizer/kojournalview.cpp
@@ -25,7 +25,7 @@
 //
 // View of Journal entries
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpopupmenu.h>
 #include <tqvbox.h>
 #include <tqlabel.h>
@@ -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 056b456ee..347453cc2 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 32ddc327a..b714041cf 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -25,7 +25,7 @@
 */
 
 #include <tqlistview.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpopupmenu.h>
 #include <tqcursor.h>
 #include <tqstyle.h>
@@ -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();
 }
@@ -299,7 +299,7 @@ void KOListView::showDates( bool show )
     mListView->setColumnWidth( 1, oldColWidth1 );
     mListView->setColumnWidth( 3, oldColWidth3 );
   }
-  mListView->tqrepaint();
+  mListView->repaint();
 }
 
 void KOListView::showDates()
@@ -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 2480d6bef..a4533ea86 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 b664e68f3..1081f62a5 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 eead72522..5f6fd8ca7 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -34,7 +34,7 @@
 #include <tqpainter.h>
 #include <tqcursor.h>
 #include <tqlistbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 
 #include <kdebug.h>
@@ -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 );
@@ -425,8 +425,8 @@ void MonthViewCell::setDate( const TQDate &date )
   TQString text;
   if ( KOGlobals::self()->calendarSystem()->day( date ) == 1 ) {
     text = i18n("'Month day' for month view cells", "%1 %2")
-        .tqarg( KOGlobals::self()->calendarSystem()->monthName( date, true ) )
-        .tqarg( KOGlobals::self()->calendarSystem()->day(mDate) );
+        .arg( KOGlobals::self()->calendarSystem()->monthName( date, true ) )
+        .arg( KOGlobals::self()->calendarSystem()->day(mDate) );
     TQFontMetrics fm( mLabel->font() );
     mLabel->resize( mLabelSize + TQSize( fm.width( text ), 0 ) );
   } else {
@@ -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,14 +828,14 @@ 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 );
 
   dayLayout->addMultiCellWidget( mLabel, 0, 0, 0, mDaysPerWeek );
 
   // create the day of the week labels (Sun, Mon, etc) and add them to
-  // the tqlayout.
+  // the layout.
   mDayLabels.resize( mDaysPerWeek );
   int i;
   for( i = 0; i < mDaysPerWeek; i++ ) {
@@ -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;
 }
@@ -976,8 +976,8 @@ void KOMonthView::showDates( const TQDate &start, const TQDate & )
   mStartDate = mStartDate.addDays( -weekdayCol );
 
   mLabel->setText( i18n( "monthname year", "%1 %2" )
-                   .tqarg( calSys->monthName( start ) )
-                   .tqarg( calSys->year( start ) ) );
+                   .arg( calSys->monthName( start ) )
+                   .arg( calSys->year( start ) ) );
 
   showLabel( !KOPrefs::instance()->fullViewMonth() );
 
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index 732a63a1a..24f05f308 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/koprefs.cpp b/korganizer/koprefs.cpp
index 5b431f8e4..a7c4eea21 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -364,7 +364,7 @@ TQStringList KOPrefs::fullEmails()
 {
   TQStringList fullEmails;
   // The user name and email from the config dialog:
-  fullEmails << TQString("%1 <%2>").tqarg( fullName() ).tqarg( email() );
+  fullEmails << TQString("%1 <%2>").arg( fullName() ).arg( email() );
 
   TQStringList::Iterator it;
   // Grab emails from the email identities
@@ -377,7 +377,7 @@ TQStringList KOPrefs::fullEmails()
   // Add emails configured in korganizer
   lst = mAdditionalMails;
   for ( it = lst.begin(); it != lst.end(); ++it ) {
-    fullEmails << TQString("%1 <%2>").tqarg( fullName() ).tqarg( *it );
+    fullEmails << TQString("%1 <%2>").arg( fullName() ).arg( *it );
   }
   // Add emails from the user's kaddressbook entry
   KABC::Addressee me = KABC::StdAddressBook::self()->whoAmI();
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 1f3ede91a..47ee5484d 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -23,7 +23,7 @@
     without including the source code for TQt in the source distribution.
 */
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqgroupbox.h>
 #include <tqbuttongroup.h>
@@ -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 a1b436850..3f8be65b3 100644
--- a/korganizer/korgac/alarmdialog.cpp
+++ b/korganizer/korgac/alarmdialog.cpp
@@ -28,7 +28,7 @@
 #include <tqlabel.h>
 #include <tqfile.h>
 #include <tqspinbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqcstring.h>
 #include <tqdatastream.h>
@@ -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 );
@@ -566,7 +566,7 @@ void AlarmDialog::slotSave()
     if ( !incidence ) {
       continue;
     }
-    config->setGroup( TQString("Incidence-%1").tqarg(numReminders + 1) );
+    config->setGroup( TQString("Incidence-%1").arg(numReminders + 1) );
     config->writeEntry( "UID", incidence->uid() );
     config->writeEntry( "RemindAt", item->mRemindAt );
     ++numReminders;
diff --git a/korganizer/korgac/alarmdockwindow.cpp b/korganizer/korgac/alarmdockwindow.cpp
index 9e4e9c238..aaeedd7fe 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 045dd9923..5b3ee4e9a 100644
--- a/korganizer/korgac/koalarmclient.cpp
+++ b/korganizer/korgac/koalarmclient.cpp
@@ -71,7 +71,7 @@ KOAlarmClient::KOAlarmClient( TQObject *parent, const char *name )
   config->setGroup( "General" );
   int numReminders = config->readNumEntry( "Reminders", 0 );
   for ( int i = 1; i <= numReminders; ++i ) {
-    TQString group( TQString( "Incidence-%1" ).tqarg( i ) );
+    TQString group( TQString( "Incidence-%1" ).arg( i ) );
     config->setGroup( group );
     TQString uid = config->readEntry( "UID" );
     TQDateTime dt = config->readDateTimeEntry( "RemindAt" );
@@ -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 1d9159ae7..cd3f434f4 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.cpp b/korganizer/korganizer.cpp
index 6067ca02a..842c111fa 100644
--- a/korganizer/korganizer.cpp
+++ b/korganizer/korganizer.cpp
@@ -78,7 +78,7 @@
 #include <tqvbox.h>
 #include <tqfile.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <stdlib.h>
 
diff --git a/korganizer/korganizer.h b/korganizer/korganizer.h
index facf9f59d..9148a07f3 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 c79a784db..26d925ab3 100644
--- a/korganizer/korganizer_part.cpp
+++ b/korganizer/korganizer_part.cpp
@@ -61,7 +61,7 @@
 #include <tqapplication.h>
 #include <tqfile.h>
 #include <tqtimer.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 typedef KParts::GenericFactory< KOrganizerPart > KOrganizerFactory;
 K_EXPORT_COMPONENT_FACTORY( libkorganizerpart, KOrganizerFactory )
@@ -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 923a153d5..c7f1964a3 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 84c9d746c..811300ed5 100644
--- a/korganizer/kotimelineview.cpp
+++ b/korganizer/kotimelineview.cpp
@@ -26,7 +26,7 @@
 #include <libkcal/calendar.h>
 #include <libkcal/calendarresources.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kdgantt/KDGanttViewTaskItem.h>
 #include <kdgantt/KDGanttViewSubwidgets.h>
@@ -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 9442a32d5..683d0c4dc 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 c3eee2ee4..9640e1b71 100644
--- a/korganizer/kotodoeditor.cpp
+++ b/korganizer/kotodoeditor.cpp
@@ -27,7 +27,7 @@
 #include <tqtooltip.h>
 #include <tqframe.h>
 #include <tqpixmap.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqdatetime.h>
 
 #include <kiconloader.h>
@@ -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 895238213..72f61439e 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -23,7 +23,7 @@
     without including the source code for TQt in the source distribution.
 */
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqheader.h>
 #include <tqcursor.h>
 #include <tqlabel.h>
@@ -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 6175a053a..f9ce40703 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 3fe929b64..e7fad7dae 100644
--- a/korganizer/kotodoviewitem.cpp
+++ b/korganizer/kotodoviewitem.cpp
@@ -240,7 +240,7 @@ bool KOTodoViewItem::isAlternate()
 #endif
 }
 
-void KOTodoViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment)
+void KOTodoViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment)
 {
   TQColorGroup _cg = cg;
   // If no todo is set, just don't paint anything...
@@ -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));
@@ -275,6 +275,6 @@ void KOTodoViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column,
         KGlobalSettings::highlightColor() );
     p->restore();
   } else {
-    TQCheckListItem::paintCell(p, _cg, column, width, tqalignment);
+    TQCheckListItem::paintCell(p, _cg, column, width, alignment);
   }
 }
diff --git a/korganizer/kotodoviewitem.h b/korganizer/kotodoviewitem.h
index d2e679757..5bf5e5b72 100644
--- a/korganizer/kotodoviewitem.h
+++ b/korganizer/kotodoviewitem.h
@@ -28,7 +28,7 @@
 
 #include <tqmap.h>
 #include <tqlistview.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqdatetime.h>
 
 namespace KCal {
@@ -66,7 +66,7 @@ class KOTodoViewItem : public TQCheckListItem
     bool isAlternate();
     int compare( TQListViewItem *i, int col, bool ascending ) const;
     virtual void paintCell(TQPainter *p, const TQColorGroup &cg,
-      int column, int width, int tqalignment);
+      int column, int width, int alignment);
 
   protected:
     void paintBranches(TQPainter *p,const TQColorGroup & cg,int w,int y,int h);
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 38ab086af..69bf88b66 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 c98c6c31d..722ba2681 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -22,9 +22,9 @@
     without including the source code for TQt in the source distribution.
 */
 
-#include <tqlayout.h>
-#include <tqtextbrowser.h>
-#include <tqtextcodec.h>
+#include <layout.h>
+#include <textbrowser.h>
+#include <textcodec.h>
 #include <tqfileinfo.h>
 #include <tqlabel.h>
 
@@ -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 );
 }
@@ -106,8 +106,8 @@ void KOWhatsNextView::updateView()
     mText += KGlobal::locale()->formatDate( mStartDate );
   } else {
     mText += i18n("Date from - to", "%1 - %2")
-            .tqarg( KGlobal::locale()->formatDate( mStartDate ) )
-            .tqarg( KGlobal::locale()->formatDate( mEndDate ) );
+            .arg( KGlobal::locale()->formatDate( mStartDate ) )
+            .arg( KGlobal::locale()->formatDate( mEndDate ) );
   }
   mText+="</h2>\n";
 
@@ -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;
@@ -281,14 +281,14 @@ void KOWhatsNextView::appendEvent( Incidence *ev, const TQDateTime &start,
 
       if ( starttime.date().daysTo( endtime.date() ) >= 1 ) {
         mText += i18n("date from - to", "%1 - %2")
-              .tqarg( KGlobal::locale()->formatDateTime( starttime ) )
-              .tqarg( KGlobal::locale()->formatDateTime( endtime ) );
+              .arg( KGlobal::locale()->formatDateTime( starttime ) )
+              .arg( KGlobal::locale()->formatDateTime( endtime ) );
       } else {
         /*if (reply) */
         mText += i18n("date, from - to", "%1, %2 - %3")
-            .tqarg( KGlobal::locale()->formatDate( starttime.date(), true ) )
-            .tqarg( KGlobal::locale()->formatTime( starttime.time() ) )
-            .tqarg( KGlobal::locale()->formatTime( endtime.time() ) );
+            .arg( KGlobal::locale()->formatDate( starttime.date(), true ) )
+            .arg( KGlobal::locale()->formatTime( starttime.time() ) )
+            .arg( KGlobal::locale()->formatTime( endtime.time() ) );
       }
     }
 //  }
diff --git a/korganizer/kowhatsnextview.h b/korganizer/kowhatsnextview.h
index e899ae157..ee1e4ad30 100644
--- a/korganizer/kowhatsnextview.h
+++ b/korganizer/kowhatsnextview.h
@@ -24,7 +24,7 @@
 #ifndef KOWHATSNEXTVIEW_H
 #define KOWHATSNEXTVIEW_H
 
-#include <tqtextbrowser.h>
+#include <textbrowser.h>
 
 #include <korganizer/baseview.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/mailscheduler.cpp b/korganizer/mailscheduler.cpp
index f810e9843..671e15d3d 100644
--- a/korganizer/mailscheduler.cpp
+++ b/korganizer/mailscheduler.cpp
@@ -86,7 +86,7 @@ bool MailScheduler::performTransaction( IncidenceBase *incidence,
     TQString subject;
     Incidence *inc = dynamic_cast<Incidence*>( incidence );
     if ( inc && method == Counter )
-      subject = i18n( "Counter proposal: %1" ).tqarg( inc->summary() );
+      subject = i18n( "Counter proposal: %1" ).arg( inc->summary() );
     status = mailer.mailOrganizer( incidence, messageText, subject );
   }
   return status;
diff --git a/korganizer/multiagendaview.cpp b/korganizer/multiagendaview.cpp
index 8558d846f..b0c0ac370 100644
--- a/korganizer/multiagendaview.cpp
+++ b/korganizer/multiagendaview.cpp
@@ -27,7 +27,7 @@
 
 #include <kglobalsettings.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqvbox.h>
 #include <tqobjectlist.h>
 #include <tqheader.h>
@@ -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();
@@ -536,7 +536,7 @@ void MultiAgendaView::zoomView( const int delta, const TQPoint & pos, const Qt::
 
   mTimeLabels->updateConfig();
   mTimeLabels->positionChanged();
-  mTimeLabels->tqrepaint();
+  mTimeLabels->repaint();
 }
 
 // KDE4: not needed, use existing TQSplitter signals instead
diff --git a/korganizer/multiagendaview.h b/korganizer/multiagendaview.h
index 06c219dc5..a702b9c01 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 23a017167..4966e24db 100644
--- a/korganizer/navigatorbar.cpp
+++ b/korganizer/navigatorbar.cpp
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <tqtooltip.h>
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqframe.h>
 #include <tqpopupmenu.h>
 #include <tqlabel.h>
@@ -71,43 +71,43 @@ 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
+  // set up control frame layout
   TQHBoxLayout *ctrlLayout = new TQHBoxLayout( this );
   ctrlLayout->addWidget( mPrevYear );
   ctrlLayout->addWidget( mPrevMonth );
@@ -174,8 +174,8 @@ void NavigatorBar::selectDates( const KCal::DateList &dateList )
     mHasMinWidth = true;
 
     // set the label text at the top of the navigator
-    mMonth->setText( i18n( "monthname", "%1" ).tqarg( calSys->monthName( mDate ) ) );
-    mYear->setText( i18n( "4 digit year", "%1" ).tqarg( calSys->yearString( mDate, false ) ) );
+    mMonth->setText( i18n( "monthname", "%1" ).arg( calSys->monthName( mDate ) ) );
+    mYear->setText( i18n( "4 digit year", "%1" ).arg( calSys->yearString( mDate, false ) ) );
   }
 }
 
diff --git a/korganizer/plugins/datenums/configdialog.cpp b/korganizer/plugins/datenums/configdialog.cpp
index 3766e2ffd..bf524e466 100644
--- a/korganizer/plugins/datenums/configdialog.cpp
+++ b/korganizer/plugins/datenums/configdialog.cpp
@@ -18,7 +18,7 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqvbuttongroup.h>
 #include <tqradiobutton.h>
diff --git a/korganizer/plugins/datenums/datenums.cpp b/korganizer/plugins/datenums/datenums.cpp
index b0a25ce4a..af022837e 100644
--- a/korganizer/plugins/datenums/datenums.cpp
+++ b/korganizer/plugins/datenums/datenums.cpp
@@ -56,8 +56,8 @@ TQString Datenums::shortText(const TQDate &date)
         return TQString::number( KOGlobals::self()->calendarSystem()->daysInYear(date) - doy );
         break;
     case 2: // both day of year and days till end of year
-        return i18n("dayOfYear / daysTillEndOfYear", "%1 / %2").tqarg( doy )
-               .tqarg(KOGlobals::self()->calendarSystem()->daysInYear(date) - doy);
+        return i18n("dayOfYear / daysTillEndOfYear", "%1 / %2").arg( doy )
+               .arg(KOGlobals::self()->calendarSystem()->daysInYear(date) - doy);
         break;
     case 0: // only day of year
     default:
diff --git a/korganizer/plugins/exchange/exchange.cpp b/korganizer/plugins/exchange/exchange.cpp
index 87784c282..a0062387c 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/exchange/exchangeconfig.cpp b/korganizer/plugins/exchange/exchangeconfig.cpp
index fe01324ac..1f2c42014 100644
--- a/korganizer/plugins/exchange/exchangeconfig.cpp
+++ b/korganizer/plugins/exchange/exchangeconfig.cpp
@@ -17,7 +17,7 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcombobox.h>
 
diff --git a/korganizer/plugins/exchange/exchangedialog.cpp b/korganizer/plugins/exchange/exchangedialog.cpp
index de56a3a19..229333956 100644
--- a/korganizer/plugins/exchange/exchangedialog.cpp
+++ b/korganizer/plugins/exchange/exchangedialog.cpp
@@ -17,7 +17,7 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqcombobox.h>
 
diff --git a/korganizer/plugins/hebrew/configdialog.cpp b/korganizer/plugins/hebrew/configdialog.cpp
index 6298151ac..fbd82c68c 100644
--- a/korganizer/plugins/hebrew/configdialog.cpp
+++ b/korganizer/plugins/hebrew/configdialog.cpp
@@ -19,7 +19,7 @@
 #include "configdialog.h"
 #include "configdialog.moc"
 #include <klocale.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <kapplication.h>
 #include <kglobal.h>
 #include <kconfig.h>
diff --git a/korganizer/plugins/hebrew/hebrew.cpp b/korganizer/plugins/hebrew/hebrew.cpp
index e36925aa5..8a9f37bd4 100644
--- a/korganizer/plugins/hebrew/hebrew.cpp
+++ b/korganizer/plugins/hebrew/hebrew.cpp
@@ -81,8 +81,8 @@ TQString Hebrew::shortText(const TQDate & date)
                          hebrew_day_number, hebrew_year);
 
   KCalendarSystem *cal = KCalendarSystemFactory::create("hebrew");
-  label_text = TQString("%1 %2").tqarg(cal->dayString(date, false))
-                                .tqarg(cal->monthName(date));
+  label_text = TQString("%1 %2").arg(cal->dayString(date, false))
+                                .arg(cal->monthName(date));
 
   if (holidays.count())
       {
diff --git a/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui b/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui
index 1ef0c311b..6868729b5 100644
--- a/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui
+++ b/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui
@@ -65,7 +65,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout2</cstring>
+                        <cstring>layout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -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 b27389b6c..249531df0 100644
--- a/korganizer/plugins/printing/list/calprintlistconfig_base.ui
+++ b/korganizer/plugins/printing/list/calprintlistconfig_base.ui
@@ -40,7 +40,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout2</cstring>
+                        <cstring>layout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -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 41d9fef01..a3d4fb69c 100644
--- a/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui
+++ b/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui
@@ -40,7 +40,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout2</cstring>
+                        <cstring>layout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -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 e0f52d6cb..d02ca9f0e 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/printing/year/yearprint.cpp b/korganizer/plugins/printing/year/yearprint.cpp
index 5c36772fb..0c124bbeb 100644
--- a/korganizer/plugins/printing/year/yearprint.cpp
+++ b/korganizer/plugins/printing/year/yearprint.cpp
@@ -177,8 +177,8 @@ void CalPrintYear::print( TQPainter &p, int width, int height )
       title = i18n("date from -\nto", "%1 -\n%2");
     }
     drawHeader( p, title
-        .tqarg( locale->formatDate( start ) )
-        .tqarg( locale->formatDate( end ) ),
+        .arg( locale->formatDate( start ) )
+        .arg( locale->formatDate( end ) ),
       calsys->addMonths( start, -1), calsys->addMonths( start, monthsPerPage ),
       headerBox );
 
diff --git a/korganizer/plugins/projectview/koprojectview.cpp b/korganizer/plugins/projectview/koprojectview.cpp
index 79b146b35..5c123d02c 100644
--- a/korganizer/plugins/projectview/koprojectview.cpp
+++ b/korganizer/plugins/projectview/koprojectview.cpp
@@ -17,7 +17,7 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqheader.h>
 #include <tqpushbutton.h>
 #include <tqfont.h>
@@ -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 d05610527..6065f9c3e 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 08fd51b16..462fe5489 100644
--- a/korganizer/plugins/timespanview/kotimespanview.cpp
+++ b/korganizer/plugins/timespanview/kotimespanview.cpp
@@ -22,7 +22,7 @@
     without including the source code for TQt in the source distribution.
 */
 
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kconfig.h>
 #include <kstandarddirs.h>
@@ -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 c121d8970..7018ce469 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/plugins/timespanview/timespanwidget.cpp b/korganizer/plugins/timespanview/timespanwidget.cpp
index b1c156ee5..11204a7fb 100644
--- a/korganizer/plugins/timespanview/timespanwidget.cpp
+++ b/korganizer/plugins/timespanview/timespanwidget.cpp
@@ -24,7 +24,7 @@
 
 #include <tqsplitter.h>
 #include <tqlistview.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqheader.h>
 #include <tqpushbutton.h>
 
diff --git a/korganizer/previewdialog.cpp b/korganizer/previewdialog.cpp
index 23671bd92..5915e29dd 100644
--- a/korganizer/previewdialog.cpp
+++ b/korganizer/previewdialog.cpp
@@ -42,7 +42,7 @@
 #include <kio/netaccess.h>
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqradiobutton.h>
 #include <tqpushbutton.h>
 #include <tqdialog.h>
diff --git a/korganizer/printing/calprintdayconfig_base.ui b/korganizer/printing/calprintdayconfig_base.ui
index bd9227ce8..b9c070eb1 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/calprintdefaultplugins.cpp b/korganizer/printing/calprintdefaultplugins.cpp
index fbb06795f..caa2e69ef 100644
--- a/korganizer/printing/calprintdefaultplugins.cpp
+++ b/korganizer/printing/calprintdefaultplugins.cpp
@@ -346,13 +346,13 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height )
 
         if ( offset % (24*60) == 0 && offset>0 ) { // divides evenly into days?
           useoffset = offset / (24*60);
-          offsetstr = offsetstr.tqarg( i18n("1 day", "%n days", useoffset ) );
+          offsetstr = offsetstr.arg( i18n("1 day", "%n days", useoffset ) );
         } else if (offset % 60 == 0 && offset>0 ) { // divides evenly into hours?
           useoffset = offset / 60;
-          offsetstr = offsetstr.tqarg( i18n("1 hour", "%n hours", useoffset ) );
+          offsetstr = offsetstr.arg( i18n("1 hour", "%n hours", useoffset ) );
         } else {
           useoffset = offset;
-          offsetstr = offsetstr.tqarg( i18n("1 minute", "%n minutes", useoffset ) );
+          offsetstr = offsetstr.arg( i18n("1 minute", "%n minutes", useoffset ) );
         }
         alarmStrings << offsetstr;
       }
@@ -481,24 +481,24 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height )
           datesString = "";
           if ( (*rit)->dtStart().isValid() ) {
                 datesString += i18n(
-                "Start Date: %1\n").tqarg(
+                "Start Date: %1\n").arg(
                 KGlobal::locale()->formatDate( (*rit)->dtStart().date(),
                                 true ) );
             if ( !(*rit)->doesFloat() ) {
                 datesString += i18n(
-                "Start Time: %1\n").tqarg(
+                "Start Time: %1\n").arg(
                 KGlobal::locale()->formatTime((*rit)->dtStart().time(),
                      false, false) );
             }
           }
           if ( (*rit)->dtEnd().isValid() ) {
             subitemString += i18n(
-                "Due Date: %1\n").tqarg(
+                "Due Date: %1\n").arg(
                 KGlobal::locale()->formatDate( (*rit)->dtEnd().date(),
                                 true ) );
             if ( !(*rit)->doesFloat() ) {
               subitemString += i18n(
-                  "subitem due time", "Due Time: %1\n").tqarg(
+                  "subitem due time", "Due Time: %1\n").arg(
                   KGlobal::locale()->formatTime((*rit)->dtEnd().time(),
                       false, false) );
             }
@@ -511,12 +511,12 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height )
             subitemString += "\n";
           }
           subitemString += i18n( "subitem Status: statusString",
-                                  "Status: %1\n").tqarg( statusString );
+                                  "Status: %1\n").arg( statusString );
           subitemString += IncidenceFormatter::recurrenceString((*rit)) + "\n";
           subitemString += i18n( "subitem Priority: N",
-                                  "Priority: %1\n").tqarg( (*rit)->priority() );
+                                  "Priority: %1\n").arg( (*rit)->priority() );
           subitemString += i18n( "subitem Secrecy: secrecyString",
-                                  "Secrecy: %1\n").tqarg( (*rit)->secrecyStr() );
+                                  "Secrecy: %1\n").arg( (*rit)->secrecyStr() );
           subitemString += "\n";
         }
         drawBoxWithCaption( p, notesBox, i18n("Subitems:"),
@@ -562,8 +562,8 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height )
                "'Name (Role): Status', e.g. 'Reinhold Kainhofer "
                "<[email protected]> (Participant): Awaiting Response'",
                "%1 (%2): %3")
-                       .tqarg( (*ait)->fullName() )
-                       .tqarg( (*ait)->roleStr() ).tqarg( (*ait)->statusStr() );
+                       .arg( (*ait)->fullName() )
+                       .arg( (*ait)->roleStr() ).arg( (*ait)->statusStr() );
       }
       drawBoxWithCaption( p, attendeesBox, i18n("Attendees:"), attendeeString,
                /*sameLine=*/false, /*expand=*/false, captionFont, textFont );
@@ -572,11 +572,11 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height )
     if ( mShowOptions ) {
       TQString optionsString;
       if ( !(*it)->statusStr().isEmpty() ) {
-        optionsString += i18n("Status: %1").tqarg( (*it)->statusStr() );
+        optionsString += i18n("Status: %1").arg( (*it)->statusStr() );
         optionsString += "\n";
       }
       if ( !(*it)->secrecyStr().isEmpty() ) {
-        optionsString += i18n("Secrecy: %1").tqarg( (*it)->secrecyStr() );
+        optionsString += i18n("Secrecy: %1").arg( (*it)->secrecyStr() );
         optionsString += "\n";
       }
       if ( (*it)->type() == "Event" ) {
@@ -936,7 +936,7 @@ void CalPrintWeek::print( TQPainter &p, int width, int height )
         } else {
           title = i18n("date from-\nto", "%1 -\n%2");;
         }
-        title = title.tqarg( line1 ).tqarg( line2 );
+        title = title.arg( line1 ).arg( line2 );
         drawHeader( p, title, curWeek.addDays( -6 ), TQDate(), headerBox );
 
         drawWeek( p, curWeek, weekBox );
@@ -959,7 +959,7 @@ void CalPrintWeek::print( TQPainter &p, int width, int height )
         } else {
           title = i18n("date from -\nto (week number)", "%1 -\n%2 (Week %3)");
         }
-        title = title.tqarg( line1 ).tqarg( line2 ).tqarg( curWeek.weekNumber() );
+        title = title.arg( line1 ).arg( line2 ).arg( curWeek.weekNumber() );
         drawHeader( p, title, curWeek, TQDate(), headerBox );
 
         TQRect weekBox( headerBox );
@@ -1121,8 +1121,8 @@ void CalPrintMonth::print( TQPainter &p, int width, int height )
 
   do {
     TQString title( i18n("monthname year", "%1 %2") );
-    title = title.tqarg( calSys->monthName( curMonth ) )
-                 .tqarg( curMonth.year() );
+    title = title.arg( calSys->monthName( curMonth ) )
+                 .arg( curMonth.year() );
     TQDate tmp( fromMonth );
     int weekdayCol = weekdayColumn( tmp.dayOfWeek() );
     tmp = tmp.addDays( -weekdayCol );
diff --git a/korganizer/printing/calprinter.cpp b/korganizer/printing/calprinter.cpp
index e87f3c5a3..fc99ffee0 100644
--- a/korganizer/printing/calprinter.cpp
+++ b/korganizer/printing/calprinter.cpp
@@ -26,7 +26,7 @@
 #include <tqvbuttongroup.h>
 #include <tqwidgetstack.h>
 #include <tqradiobutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
@@ -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 68afdecb1..509d4c54b 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 a6c5ba0e9..ceace2461 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 27c3cb336..26ac86c88 100644
--- a/korganizer/printing/calprintpluginbase.cpp
+++ b/korganizer/printing/calprintpluginbase.cpp
@@ -24,7 +24,7 @@
 */
 
 #include <tqpainter.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqframe.h>
 #include <tqlabel.h>
 
@@ -128,7 +128,7 @@ CalPrintPluginBase::~CalPrintPluginBase()
 TQWidget *CalPrintPluginBase::createConfigWidget( TQWidget *w )
 {
   TQFrame *wdg = new TQFrame( w );
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( wdg );
+  TQVBoxLayout *layout = new TQVBoxLayout( wdg );
 
   TQLabel *title = new TQLabel( description(), wdg );
   TQFont titleFont( title->font() );
@@ -136,13 +136,13 @@ TQWidget *CalPrintPluginBase::createConfigWidget( TQWidget *w )
   titleFont.setBold( true );
   title->setFont( titleFont );
 
-  tqlayout->addWidget( title );
-  tqlayout->addWidget( new TQLabel( info(), wdg ) );
-  tqlayout->addSpacing( 20 );
-  tqlayout->addWidget( new TQLabel( i18n("This printing style does not "
+  layout->addWidget( title );
+  layout->addWidget( new TQLabel( info(), wdg ) );
+  layout->addSpacing( 20 );
+  layout->addWidget( new TQLabel( i18n("This printing style does not "
                                       "have any configuration options."),
                                  wdg ) );
-  tqlayout->addStretch();
+  layout->addStretch();
   return wdg;
 }
 
@@ -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,9 +558,9 @@ 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 ) );
+              i18n( "print date: formatted-datetime", "printed: %1" ).arg( dateStr ) );
   p.setFont( oldfont );
 
   return footbox.bottom();
@@ -933,9 +933,9 @@ void CalPrintPluginBase::drawDayBox( TQPainter &p, const TQDate &qd,
   if ( fullDate && mCalSys ) {
 
     dayNumStr = i18n("weekday month date", "%1 %2 %3")
-        .tqarg( mCalSys->weekDayName( qd ) )
-        .tqarg( mCalSys->monthName( qd ) )
-        .tqarg( qd.day() );
+        .arg( mCalSys->weekDayName( qd ) )
+        .arg( mCalSys->monthName( qd ) )
+        .arg( qd.day() );
 //    dayNumStr = local->formatDate(qd);
   } else {
     dayNumStr = TQString::number( qd.day() );
@@ -984,7 +984,7 @@ void CalPrintPluginBase::drawDayBox( TQPainter &p, const TQDate &qd,
     TQString str;
     if ( !currEvent->location().isEmpty() ) {
       str = i18n( "summary, location", "%1, %2" ).
-            tqarg( currEvent->summary() ).tqarg( currEvent->location() );
+            arg( currEvent->summary() ).arg( currEvent->location() );
     } else {
       str = currEvent->summary();
     }
@@ -1008,7 +1008,7 @@ void CalPrintPluginBase::drawDayBox( TQPainter &p, const TQDate &qd,
       TQString summaryStr;
       if ( !todo->location().isEmpty() ) {
         summaryStr = i18n( "summary, location", "%1, %2" ).
-                     tqarg( todo->summary() ).tqarg( todo->location() );
+                     arg( todo->summary() ).arg( todo->location() );
       } else {
         summaryStr = todo->summary();
       }
@@ -1026,7 +1026,7 @@ void CalPrintPluginBase::drawDayBox( TQPainter &p, const TQDate &qd,
       } else {
         str = summaryStr;
       }
-      drawIncidence( p, box, timeText, i18n("To-do: %1").tqarg( str ), textY );
+      drawIncidence( p, box, timeText, i18n("To-do: %1").arg( str ), textY );
     }
   }
 
@@ -1572,7 +1572,7 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p,
     }
 
     //now, write the percentage
-    outStr = i18n( "%1%" ).tqarg( todo->percentComplete() );
+    outStr = i18n( "%1%" ).arg( todo->percentComplete() );
     rect = p.boundingRect( posPercentComplete+lwidth+3, y, x + width, -1,
                            TQt::AlignTop | TQt::AlignLeft, outStr );
     p.drawText( rect, TQt::AlignTop | TQt::AlignLeft, outStr );
@@ -1648,7 +1648,7 @@ void CalPrintPluginBase::drawJournalField( TQPainter &p, TQString field, TQStrin
 {
   if ( text.isEmpty() ) return;
 
-  TQString entry( field.tqarg( text ) );
+  TQString entry( field.arg( text ) );
 
   TQRect rect( p.boundingRect( x, y, width, -1, TQt::WordBreak, entry) );
   if ( rect.bottom() > pageHeight) {
@@ -1677,8 +1677,8 @@ void CalPrintPluginBase::drawJournal( Journal * journal, TQPainter &p, int x, in
     headerText = dateText;
   } else {
     headerText = i18n("Description - date", "%1 - %2")
-                     .tqarg( journal->summary() )
-                     .tqarg( dateText );
+                     .arg( journal->summary() )
+                     .arg( dateText );
   }
 
   TQRect rect( p.boundingRect( x, y, width, -1, TQt::WordBreak, headerText) );
@@ -1717,15 +1717,15 @@ void CalPrintPluginBase::drawSplitHeaderRight( TQPainter &p, const TQDate &fd,
   if ( mCalSys ) {
     if ( fd.month() == td.month() ) {
       title = i18n("Date range: Month dayStart - dayEnd", "%1 %2 - %3")
-        .tqarg( mCalSys->monthName( fd.month(), false ) )
-        .tqarg( mCalSys->dayString( fd, false ) )
-        .tqarg( mCalSys->dayString( td, false ) );
+        .arg( mCalSys->monthName( fd.month(), false ) )
+        .arg( mCalSys->dayString( fd, false ) )
+        .arg( mCalSys->dayString( td, false ) );
     } else {
       title = i18n("Date range: monthStart dayStart - monthEnd dayEnd", "%1 %2 - %3 %4")
-        .tqarg( mCalSys->monthName( fd.month(), false ) )
-        .tqarg( mCalSys->dayString( fd, false ) )
-        .tqarg( mCalSys->monthName( td.month(), false ) )
-        .tqarg( mCalSys->dayString( td, false ) );
+        .arg( mCalSys->monthName( fd.month(), false ) )
+        .arg( mCalSys->dayString( fd, false ) )
+        .arg( mCalSys->monthName( td.month(), false ) )
+        .arg( mCalSys->dayString( td, false ) );
     }
   }
 
diff --git a/korganizer/printing/calprinttodoconfig_base.ui b/korganizer/printing/calprinttodoconfig_base.ui
index f416c0ea8..106ffd7d6 100644
--- a/korganizer/printing/calprinttodoconfig_base.ui
+++ b/korganizer/printing/calprinttodoconfig_base.ui
@@ -86,7 +86,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout2</cstring>
+                        <cstring>layout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -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 f367f3c41..0be844abb 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>
@@ -246,7 +246,7 @@
                         <string>Print as &amp;timetable view</string>
                     </property>
                     <property name="whatsThis" stdset="0">
-                        <string>This view is similar to the weekview in KOrganizer. The week is printed in landscape tqlayout. You can even use the same colors for the items if you check &lt;i&gt;Use Colors&lt;/i&gt;.</string>
+                        <string>This view is similar to the weekview in KOrganizer. The week is printed in landscape layout. You can even use the same colors for the items if you check &lt;i&gt;Use Colors&lt;/i&gt;.</string>
                     </property>
                 </widget>
                 <widget class="TQRadioButton" row="2" column="0" rowspan="1" colspan="3">
@@ -257,7 +257,7 @@
                         <string>Print as split week view</string>
                     </property>
                     <property name="whatsThis" stdset="0">
-                        <string>This view is similar to the week view in KOrganizer. The only difference with the timetable view is the page tqlayout. Timetables are printed in landscape, the split week view in portrait.</string>
+                        <string>This view is similar to the week view in KOrganizer. The only difference with the timetable view is the page layout. Timetables are printed in landscape, the split week view in portrait.</string>
                     </property>
                 </widget>
             </grid>
diff --git a/korganizer/publishdialog_base.ui b/korganizer/publishdialog_base.ui
index 76efbe645..640b19fb6 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/resourceview.cpp b/korganizer/resourceview.cpp
index a4475a4c2..322d6b639 100644
--- a/korganizer/resourceview.cpp
+++ b/korganizer/resourceview.cpp
@@ -44,7 +44,7 @@
 
 #include <tqhbox.h>
 #include <tqheader.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqpainter.h>
 #include <tqpushbutton.h>
@@ -70,12 +70,12 @@ static TQString labelFromSubResName( ResourceCalendar *resource, const TQString
   TQString label;
   if ( (int)reply > 1 ) {
     if( resource && !resource->resourceName().isEmpty() ) {
-      label = i18n( "My %1 (%2)" ).tqarg( subRes, resource->resourceName() );
+      label = i18n( "My %1 (%2)" ).arg( subRes, resource->resourceName() );
     } else {
-      label = i18n( "My %1" ).tqarg( subRes );
+      label = i18n( "My %1" ).arg( subRes );
     }
   } else {
-    label = i18n( "My %1" ).tqarg( subRes );
+    label = i18n( "My %1" ).arg( subRes );
   }
   return label;
 }
@@ -238,18 +238,18 @@ void ResourceItem::setStandardResource( bool std )
 {
   if ( mIsStandardResource != std ) {
     mIsStandardResource = std;
-    tqrepaint();
+    repaint();
   }
 }
 
 void ResourceItem::paintCell(TQPainter *p, const TQColorGroup &cg,
-      int column, int width, int tqalignment)
+      int column, int width, int alignment)
 {
   TQFont oldFont = p->font();
   TQFont newFont = oldFont;
   newFont.setBold( mIsStandardResource && !mIsSubresource );
   p->setFont( newFont );
-  TQCheckListItem::paintCell( p, cg, column, width, tqalignment );
+  TQCheckListItem::paintCell( p, cg, column, width, alignment );
   p->setFont( oldFont );
 /*  TQColorGroup _cg = cg;
   if(!mResource) return;
@@ -376,7 +376,7 @@ void ResourceView::addResource()
     if ( !item->resource()->addSubresource( folderName, parentId ) ) {
       KMessageBox::error(
         this,
-        i18n( "<qt>Unable to create subresource <b>%1</b>.</qt>" ).tqarg( folderName ) );
+        i18n( "<qt>Unable to create subresource <b>%1</b>.</qt>" ).arg( folderName ) );
     }
     return;
   }
@@ -398,7 +398,7 @@ void ResourceView::addResource()
   if( !resource ) {
     KMessageBox::error(
       this,
-      i18n( "<qt>Unable to create resource of type <b>%1</b>.</qt>" ).tqarg( type ) );
+      i18n( "<qt>Unable to create resource of type <b>%1</b>.</qt>" ).arg( type ) );
     return;
   }
 
@@ -414,7 +414,7 @@ void ResourceView::addResource()
     if ( resource->isActive() && ( !resource->open() || !resource->load() ) ) {
       // ### There is a resourceLoadError() signal declared in ResourceCalendar
       //     but no subclass seems to make use of it. We could do better.
-      KMessageBox::error( this, i18n("Unable to create the resource.").tqarg( type ) );
+      KMessageBox::error( this, i18n("Unable to create the resource.").arg( type ) );
       success = false;
     }
   }
@@ -573,7 +573,7 @@ void ResourceView::removeResource()
         i18n ("<qt>Failed to remove the subresource <b>%1</b>. The "
               "reason could be that it is a built-in one which cannot "
               "be removed, or that the removal of the underlying storage "
-              "folder failed.</qt>").tqarg( item->resource()->name() ) );
+              "folder failed.</qt>").arg( item->resource()->name() ) );
       return;
   } else {
     mCalendar->resourceManager()->remove( item->resource() );
@@ -632,7 +632,7 @@ void ResourceView::editResource()
     } else {
       KMessageBox::sorry(
         this,
-        i18n ("<qt>Cannot edit the subresource <b>%1</b>.</qt>").tqarg( item->resource()->name() ) );
+        i18n ("<qt>Cannot edit the subresource <b>%1</b>.</qt>").arg( item->resource()->name() ) );
     }
   } else {
     KRES::ConfigDialog dlg( this, TQString("calendar"), resource, "KRES::ConfigDialog" );
diff --git a/korganizer/resourceview.h b/korganizer/resourceview.h
index e5bb9d3e6..6734c4bcb 100644
--- a/korganizer/resourceview.h
+++ b/korganizer/resourceview.h
@@ -69,7 +69,7 @@ class ResourceItem : public TQCheckListItem
     void update();
 
     virtual void paintCell(TQPainter *p, const TQColorGroup &cg,
-      int column, int width, int tqalignment);
+      int column, int width, int alignment);
 
     void setResourceColor(TQColor& color);
     TQColor &resourceColor() {return mResourceColor;}
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index 497ad1f6e..bec56d41a 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -24,7 +24,7 @@
     without including the source code for TQt in the source distribution.
 */
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
 #include <tqhbuttongroup.h>
@@ -52,11 +52,11 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent)
   mCalendar = calendar;
 
   TQFrame *topFrame = plainPage();
-  TQVBoxLayout *tqlayout = new TQVBoxLayout(topFrame,0,spacingHint());
+  TQVBoxLayout *layout = new TQVBoxLayout(topFrame,0,spacingHint());
 
   // Search expression
   TQHBoxLayout *subLayout = new TQHBoxLayout();
-  tqlayout->addLayout(subLayout);
+  layout->addLayout(subLayout);
 
   searchEdit = new TQLineEdit( "*", topFrame ); // Find all events by default
   searchLabel = new TQLabel( searchEdit, i18n("&Search for:"), topFrame );
@@ -68,7 +68,7 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent)
 
 
   TQHButtonGroup *itemsGroup = new TQHButtonGroup( i18n("Search For"), topFrame );
-  tqlayout->addWidget( itemsGroup );
+  layout->addWidget( itemsGroup );
   mEventsCheck = new TQCheckBox( i18n("&Events"), itemsGroup );
   mTodosCheck = new TQCheckBox( i18n("To-&dos"), itemsGroup );
   mJournalsCheck = new TQCheckBox( i18n("&Journal entries"), itemsGroup );
@@ -78,7 +78,7 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent)
   // Date range
   TQGroupBox *rangeGroup = new TQGroupBox( 1, Qt::Horizontal, i18n( "Date Range" ),
                                         topFrame );
-  tqlayout->addWidget( rangeGroup );
+  layout->addWidget( rangeGroup );
 
   TQWidget *rangeWidget = new TQWidget( rangeGroup );
   TQHBoxLayout *rangeLayout = new TQHBoxLayout( rangeWidget, 0, spacingHint() );
@@ -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"),
@@ -100,7 +100,7 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent)
 
   // Subjects to search
   TQHButtonGroup *subjectGroup = new TQHButtonGroup( i18n("Search In"), topFrame );
-  tqlayout->addWidget(subjectGroup);
+  layout->addWidget(subjectGroup);
 
   mSummaryCheck = new TQCheckBox( i18n("Su&mmaries"), subjectGroup );
   mSummaryCheck->setChecked( true );
@@ -111,7 +111,7 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent)
   // Results list view
   listView = new KOListView( mCalendar, topFrame );
   listView->showDates();
-  tqlayout->addWidget( listView );
+  layout->addWidget( listView );
 
   if ( KOPrefs::instance()->mCompactDialogs ) {
     KOGlobals::fitDialogToScreen( this, true );
diff --git a/korganizer/statusdialog.cpp b/korganizer/statusdialog.cpp
index 15e15e5ab..1aea9e21a 100644
--- a/korganizer/statusdialog.cpp
+++ b/korganizer/statusdialog.cpp
@@ -24,7 +24,7 @@
 
 #include <tqlabel.h>
 #include <tqstringlist.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcombobox.h>
 
 #include <kdebug.h>
@@ -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 9f01bca6e..5906b44df 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 db3402424..7fd65a105 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>
diff --git a/korganizer/timelabels.cpp b/korganizer/timelabels.cpp
index c2802acb3..a4aa4a7dd 100644
--- a/korganizer/timelabels.cpp
+++ b/korganizer/timelabels.cpp
@@ -28,7 +28,7 @@
 #include <tqvbox.h>
 #include <tqlabel.h>
 #include <tqframe.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqfont.h>
 #include <tqfontmetrics.h>
 #include <tqpainter.h>
@@ -197,7 +197,7 @@ void TimeLabels::updateConfig()
   sFont.setPointSize(  sFont.pointSize()/2 );
   TQFontMetrics fmS(   sFont );
   mMiniWidth += fmS.width(  test ) + frameWidth()*2+4 ;
-  // update tqgeometry restrictions based on new settings
+  // update geometry restrictions based on new settings
   setFixedWidth(  mMiniWidth );
 
   // update HourSize
@@ -237,7 +237,7 @@ void TimeLabels::setAgenda( KOAgenda* agenda )
 }
 
 
-/** This is called in response to tqrepaint() */
+/** This is called in response to repaint() */
 void TimeLabels::paintEvent(TQPaintEvent*)
 {
 //  kdDebug(5850) << "paintevent..." << endl;