1 files changed, 16 insertions, 16 deletions

diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp
index 0849dde74..b16b638c9 100644
--- a/kontact/plugins/korganizer/todosummarywidget.cpp
+++ b/kontact/plugins/korganizer/todosummarywidget.cpp
@@ -23,7 +23,7 @@
 
 #include <tqcursor.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtooltip.h>
 
 #include <kdialog.h>
@@ -94,7 +94,7 @@ void TodoSummaryWidget::updateView()
   TQLabel *label = 0;
   int counter = 0;
 
-  TQDate tqcurrentDate = TQDate::tqcurrentDate();
+  TQDate currentDate = TQDate::currentDate();
   KCal::Todo::List todos = mCalendar->todos();
   if ( todos.count() > 0 ) {
     TQPixmap pm = loader.loadIcon( "todo", KIcon::Small );
@@ -111,27 +111,27 @@ void TodoSummaryWidget::updateView()
 
       // show uncomplete todos from the last days
       if ( todo->hasDueDate() && !todo->isCompleted() &&
-           todo->dtDue().date() < tqcurrentDate ) {
+           todo->dtDue().date() < currentDate ) {
         accepted = true;
         stateText = i18n( "overdue" );
       }
 
       // show todos which started somewhere in the past and has to be finished in future
       if ( todo->hasStartDate() && todo->hasDueDate() &&
-           todo->dtStart().date() < tqcurrentDate &&
-           tqcurrentDate < todo->dtDue().date() ) {
+           todo->dtStart().date() < currentDate &&
+           currentDate < todo->dtDue().date() ) {
         accepted = true;
         stateText = i18n( "in progress" );
       }
 
       // all todos which start today
-      if ( todo->hasStartDate() && todo->dtStart().date() == tqcurrentDate ) {
+      if ( todo->hasStartDate() && todo->dtStart().date() == currentDate ) {
         accepted = true;
         stateText = i18n( "starts today" );
       }
 
       // all todos which end today
-      if ( todo->hasDueDate() && todo->dtDue().date() == tqcurrentDate ) {
+      if ( todo->hasDueDate() && todo->dtDue().date() == currentDate ) {
         accepted = true;
         stateText = i18n( "ends today" );
       }
@@ -141,13 +141,13 @@ void TodoSummaryWidget::updateView()
 
       label = new TQLabel( this );
       label->setPixmap( pm );
-      label->tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum );
+      label->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum );
       mLayout->addWidget( label, counter, 0 );
       mLabels.append( label );
 
       label = new TQLabel( TQString::number( todo->percentComplete() ) + "%", this );
-      label->tqsetAlignment( AlignHCenter | AlignVCenter );
-      label->tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum );
+      label->setAlignment( AlignHCenter | AlignVCenter );
+      label->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum );
       mLayout->addWidget( label, counter, 1 );
       mLabels.append( label );
 
@@ -168,14 +168,14 @@ void TodoSummaryWidget::updateView()
       connect( urlLabel, TQT_SIGNAL( rightClickedURL( const TQString& ) ),
                this, TQT_SLOT( popupMenu( const TQString& ) ) );
 
-      TQString tipText( KCal::IncidenceFormatter::toolTipStr( mCalendar, todo, tqcurrentDate, true ) );
+      TQString tipText( KCal::IncidenceFormatter::toolTipStr( mCalendar, todo, currentDate, true ) );
       if ( !tipText.isEmpty() ) {
         TQToolTip::add( urlLabel, tipText );
       }
 
       label = new TQLabel( stateText, this );
-      label->tqsetAlignment( AlignLeft | AlignVCenter );
-      label->tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum );
+      label->setAlignment( AlignLeft | AlignVCenter );
+      label->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum );
       mLayout->addWidget( label, counter, 3 );
       mLabels.append( label );
 
@@ -185,7 +185,7 @@ void TodoSummaryWidget::updateView()
 
   if ( counter == 0 ) {
     TQLabel *noTodos = new TQLabel( i18n( "No to-dos pending" ), this );
-    noTodos->tqsetAlignment( AlignHCenter | AlignVCenter );
+    noTodos->setAlignment( AlignHCenter | AlignVCenter );
     mLayout->addWidget( noTodos, 0, 1 );
     mLabels.append( noTodos );
   }
@@ -214,7 +214,7 @@ void TodoSummaryWidget::completeTodo( const TQString &uid )
   IncidenceChanger *changer = new IncidenceChanger( mCalendar, TQT_TQOBJECT(this) );
   if ( !todo->isReadOnly() && changer->beginChange( todo, 0, TQString() ) ) {
     KCal::Todo *oldTodo = todo->clone();
-    todo->setCompleted( TQDateTime::tqcurrentDateTime() );
+    todo->setCompleted( TQDateTime::currentDateTime() );
     changer->changeIncidence( oldTodo, todo, KOGlobals::COMPLETION_MODIFIED, this );
     changer->endChange( todo, 0, TQString() );
     delete oldTodo;
@@ -253,7 +253,7 @@ bool TodoSummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
   if ( obj->inherits( "KURLLabel" ) ) {
     KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) );
     if ( e->type() == TQEvent::Enter )
-      emit message( i18n( "Edit To-do: \"%1\"" ).tqarg( label->text() ) );
+      emit message( i18n( "Edit To-do: \"%1\"" ).arg( label->text() ) );
     if ( e->type() == TQEvent::Leave )
       emit message( TQString() );
   }