Remove additional unneeded tq method conversions

56 files changed, 235 insertions, 235 deletions

diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp
index 1d61545f..10a791a9 100644
--- a/korganizer/actionmanager.cpp
+++ b/korganizer/actionmanager.cpp
@@ -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;
 }
@@ -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,7 +2006,7 @@ 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;
   }
 
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 56f3007e..84af159b 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -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;
   }
@@ -776,8 +776,8 @@ 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::currentDate() );
         Journal *journal;
@@ -787,7 +787,7 @@ void CalendarView::incidenceChanged( Incidence *oldIncidence,
           journal->setDtStart( TQDateTime::currentDateTime() );
 
           TQString dateStr = KGlobal::locale()->formatDate( TQDate::currentDate() );
-          journal->setSummary( i18n("Journal of %1").tqarg( dateStr ) );
+          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 );
   }
 
@@ -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" ) );
     }
   }
@@ -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;
       }
     }
@@ -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 c10d9241..131cd878 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/eventarchiver.cpp b/korganizer/eventarchiver.cpp
index 51e25517..be685441 100644
--- a/korganizer/eventarchiver.cpp
+++ b/korganizer/eventarchiver.cpp
@@ -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/filtereditdialog.cpp b/korganizer/filtereditdialog.cpp
index aceb6d27..c8251ca6 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 62c4e6ef..59775f07 100644
--- a/korganizer/freebusymanager.cpp
+++ b/korganizer/freebusymanager.cpp
@@ -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;
   }
@@ -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() );
diff --git a/korganizer/freebusymanager.h b/korganizer/freebusymanager.h
index 1cda25fa..d8fcc952 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 67f23d35..eac14271 100644
--- a/korganizer/freebusyurldialog.cpp
+++ b/korganizer/freebusyurldialog.cpp
@@ -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 002f84a6..0b9e5d99 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 4db3a069..ee638fc7 100644
--- a/korganizer/importdialog.cpp
+++ b/korganizer/importdialog.cpp
@@ -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 c3517e75..20f409e7 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->seStatus( KCal::Attendee::Declined );
+          newMe->setStatus( KCal::Attendee::Declined );
           tmp->clearAttendees();
           tmp->addAttendee( newMe );
           break;
diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp
index a9660cea..7808dcbb 100644
--- a/korganizer/journalentry.cpp
+++ b/korganizer/journalentry.cpp
@@ -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]") +
@@ -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 c97ec9f7..08780410 100644
--- a/korganizer/kdatenavigator.cpp
+++ b/korganizer/kdatenavigator.cpp
@@ -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 a05a82d2..346bb9d8 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -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 );
@@ -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 b8cd33fd..751c9659 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,9 +739,9 @@ 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;
   }
 
@@ -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 23a36acf..c95a9f4f 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 7b48d9cc..e48796c7 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -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,8 +627,8 @@ 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,
@@ -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();
 
diff --git a/korganizer/koapp.cpp b/korganizer/koapp.cpp
index dcebd48b..e20c42db 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()
diff --git a/korganizer/koattendeeeditor.cpp b/korganizer/koattendeeeditor.cpp
index 6e3b7815..36037ea9 100644
--- a/korganizer/koattendeeeditor.cpp
+++ b/korganizer/koattendeeeditor.cpp
@@ -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->seStatus( Attendee::PartStat( mStatusCombo->currentItem() ) );
+  a->setStatus( 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/kocore.cpp b/korganizer/kocore.cpp
index 957e6c08..7503d2de 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 );
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 718cc5c0..431b4b3d 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -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();
     }
   }
 }
@@ -564,7 +564,7 @@ void KODayMatrix::paintEvent( TQPaintEvent * )
 
   TQColorGroup cg = tqpalette().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 37a48ebd..d2426425 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 91e0e27d..83ceec0e 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 4211e93a..6d91d118 100644
--- a/korganizer/koeditoralarms.cpp
+++ b/korganizer/koeditoralarms.cpp
@@ -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/koeditorattachments.cpp b/korganizer/koeditorattachments.cpp
index fe67a54e..ed358947 100644
--- a/korganizer/koeditorattachments.cpp
+++ b/korganizer/koeditorattachments.cpp
@@ -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 ) {
diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp
index be9a7fba..adeb9bb0 100644
--- a/korganizer/koeditordetails.cpp
+++ b/korganizer/koeditordetails.cpp
@@ -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()->seStatus( status );
+        item->data()->setStatus( status );
         item->updateItem();
       }
     }
diff --git a/korganizer/koeditorfreebusy.cpp b/korganizer/koeditorfreebusy.cpp
index e3f88f14..807901b8 100644
--- a/korganizer/koeditorfreebusy.cpp
+++ b/korganizer/koeditorfreebusy.cpp
@@ -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()->seStatus( status );
+        item->attendee()->setStatus( 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()->seStatus( (Attendee::PartStat)status );
+    currentAttendee()->setStatus( (Attendee::PartStat)status );
     updateCurrentItem();
     updateAttendeeInput();
   }
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index 8e4cb166..fb8b4bc5 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -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 793b90d7..cec2e721 100644
--- a/korganizer/koeditorgeneralevent.cpp
+++ b/korganizer/koeditorgeneralevent.cpp
@@ -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::currentDate() ) ) );
+        .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::currentDate() ) ) );
+        .arg( KGlobal::locale()->formatDate( TQDate::currentDate() ) ) );
     return false;
   }
 
diff --git a/korganizer/koeditorgeneraljournal.cpp b/korganizer/koeditorgeneraljournal.cpp
index b14aa7e5..de97376d 100644
--- a/korganizer/koeditorgeneraljournal.cpp
+++ b/korganizer/koeditorgeneraljournal.cpp
@@ -196,7 +196,7 @@ bool KOEditorGeneralJournal::validateInput()
   if (!mDateEdit->date().isValid()) {
     KMessageBox::sorry( 0,
         i18n("Please specify a valid date, for example '%1'.")
-        .tqarg( KGlobal::locale()->formatDate( TQDate::currentDate() ) ) );
+        .arg( KGlobal::locale()->formatDate( TQDate::currentDate() ) ) );
     return false;
   }
 
diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp
index 7f4684e1..5ba7188b 100644
--- a/korganizer/koeditorgeneraltodo.cpp
+++ b/korganizer/koeditorgeneraltodo.cpp
@@ -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)) );
@@ -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/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp
index b93f6d19..c2e108a8 100644
--- a/korganizer/koeditorrecurrence.cpp
+++ b/korganizer/koeditorrecurrence.cpp
@@ -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/koeventeditor.cpp b/korganizer/koeventeditor.cpp
index 27bcb827..c24af1a0 100644
--- a/korganizer/koeventeditor.cpp
+++ b/korganizer/koeventeditor.cpp
@@ -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 a9746dbe..2596f0b6 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/kogroupware.cpp b/korganizer/kogroupware.cpp
index 28f62dd4..0673ec6e 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,
@@ -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)->seStatus( KCal::Attendee::Accepted );
+          (*it)->setStatus( KCal::Attendee::Accepted );
         else if ( action.startsWith( "tentative" ) )
-          (*it)->seStatus( KCal::Attendee::Tentative );
+          (*it)->setStatus( KCal::Attendee::Tentative );
         else if ( KOPrefs::instance()->outlookCompatCounterProposals() && action.startsWith( "counter" ) )
-          (*it)->seStatus( KCal::Attendee::Tentative );
+          (*it)->setStatus( KCal::Attendee::Tentative );
         else if ( action.startsWith( "delegated" ) )
-          (*it)->seStatus( KCal::Attendee::Delegated );
+          (*it)->setStatus( 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 1eb5fc66..76bd7c6c 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>
@@ -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>
diff --git a/korganizer/koincidenceeditor.cpp b/korganizer/koincidenceeditor.cpp
index 0a027181..55afba9e 100644
--- a/korganizer/koincidenceeditor.cpp
+++ b/korganizer/koincidenceeditor.cpp
@@ -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/kolistview.cpp b/korganizer/kolistview.cpp
index 24ffb202..f6b12b59 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -299,7 +299,7 @@ void KOListView::showDates( bool show )
     mListView->setColumnWidth( 1, oldColWidth1 );
     mListView->setColumnWidth( 3, oldColWidth3 );
   }
-  mListView->tqrepaint();
+  mListView->repaint();
 }
 
 void KOListView::showDates()
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 669049d7..5c9edbca 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -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 {
@@ -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/koprefs.cpp b/korganizer/koprefs.cpp
index 5b431f8e..a7c4eea2 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/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp
index cd46bbe4..bf9c29a2 100644
--- a/korganizer/korgac/alarmdialog.cpp
+++ b/korganizer/korgac/alarmdialog.cpp
@@ -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/koalarmclient.cpp b/korganizer/korgac/koalarmclient.cpp
index 93c0602a..5b3ee4e9 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" );
diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp
index 06b98b0b..e7fad7da 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...
@@ -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 d2e67975..774a45d7 100644
--- a/korganizer/kotodoviewitem.h
+++ b/korganizer/kotodoviewitem.h
@@ -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/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index fd8e5742..6287890c 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -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";
 
@@ -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/mailscheduler.cpp b/korganizer/mailscheduler.cpp
index f810e984..671e15d3 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 99893622..7370f6f1 100644
--- a/korganizer/multiagendaview.cpp
+++ b/korganizer/multiagendaview.cpp
@@ -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/navigatorbar.cpp b/korganizer/navigatorbar.cpp
index ba884204..322daf92 100644
--- a/korganizer/navigatorbar.cpp
+++ b/korganizer/navigatorbar.cpp
@@ -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/datenums.cpp b/korganizer/plugins/datenums/datenums.cpp
index b0a25ce4..af022837 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/hebrew/hebrew.cpp b/korganizer/plugins/hebrew/hebrew.cpp
index e36925aa..8a9f37bd 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/year/yearprint.cpp b/korganizer/plugins/printing/year/yearprint.cpp
index 5c36772f..0c124bbe 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/printing/calprintdefaultplugins.cpp b/korganizer/printing/calprintdefaultplugins.cpp
index fbb06795..caa2e69e 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 "
                "<reinhold@kainhofer.com> (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/calprintpluginbase.cpp b/korganizer/printing/calprintpluginbase.cpp
index 52be67ec..22d6a065 100644
--- a/korganizer/printing/calprintpluginbase.cpp
+++ b/korganizer/printing/calprintpluginbase.cpp
@@ -560,7 +560,7 @@ int CalPrintPluginBase::drawFooter( TQPainter &p, TQRect &footbox )
   TQFontMetrics fm( p.font() );
   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/resourceview.cpp b/korganizer/resourceview.cpp
index a4475a4c..04927bd0 100644
--- a/korganizer/resourceview.cpp
+++ b/korganizer/resourceview.cpp
@@ -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 e5bb9d3e..6734c4bc 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/timelabels.cpp b/korganizer/timelabels.cpp
index c2802acb..38c58728 100644
--- a/korganizer/timelabels.cpp
+++ b/korganizer/timelabels.cpp
@@ -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;