Rename old tq methods that no longer need a unique name

4 files changed, 32 insertions, 32 deletions

diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp
index 7c2140b36..6d39d413a 100644
--- a/kontact/plugins/korganizer/korganizerplugin.cpp
+++ b/kontact/plugins/korganizer/korganizerplugin.cpp
@@ -224,8 +224,8 @@ void KOrganizerPlugin::processDropEvent( TQDropEvent *event )
 
       KTempFile tf;
       tf.setAutoDelete( true );
-      TQString uri = TQString::tqfromLatin1("kmail:") + TQString::number( mail.serialNumber() );
-      tf.file()->writeBlock( event->tqencodedData( "message/rfc822" ) );
+      TQString uri = TQString::fromLatin1("kmail:") + TQString::number( mail.serialNumber() );
+      tf.file()->writeBlock( event->encodedData( "message/rfc822" ) );
       tf.close();
       interface()->openEventEditor( i18n("Mail: %1").tqarg( mail.subject() ), txt,
                                     uri, tf.name(), TQStringList(), "message/rfc822" );
diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp
index 7c3a1bed9..c4c4dad9c 100644
--- a/kontact/plugins/korganizer/summarywidget.cpp
+++ b/kontact/plugins/korganizer/summarywidget.cpp
@@ -97,9 +97,9 @@ void SummaryWidget::updateView()
   TQPixmap pma = loader.loadIcon( "calendaranniversary", KIcon::Small );
 
   TQDate dt;
-  TQDate tqcurrentDate = TQDate::tqcurrentDate();
-  for ( dt=tqcurrentDate;
-        dt<=tqcurrentDate.addDays( days - 1 );
+  TQDate currentDate = TQDate::currentDate();
+  for ( dt=currentDate;
+        dt<=currentDate.addDays( days - 1 );
         dt=dt.addDays(1) ) {
 
     KCal::Event::List events = mCalendar->events( dt );
@@ -123,8 +123,8 @@ void SummaryWidget::updateView()
       int span=1; int dayof=1;
       if ( ev->isMultiDay() ) {
         TQDate d = ev->dtStart().date();
-        if ( d < tqcurrentDate ) {
-          d = tqcurrentDate;
+        if ( d < currentDate ) {
+          d = currentDate;
         }
         while ( d < ev->dtEnd().date() ) {
           if ( d < dt ) {
@@ -148,8 +148,8 @@ void SummaryWidget::updateView()
       } else {
         label->setPixmap( pm );
       }
-      label->setMaximumWidth( label->tqminimumSizeHint().width() );
-      label->tqsetAlignment( AlignVCenter );
+      label->setMaximumWidth( label->minimumSizeHint().width() );
+      label->setAlignment( AlignVCenter );
       mLayout->addWidget( label, counter, 0 );
       mLabels.append( label );
 
@@ -159,12 +159,12 @@ void SummaryWidget::updateView()
 
       // Modify event date for printing
       TQDate sD = TQDate( dt.year(), dt.month(), dt.day() );
-      if ( ( sD.month() == tqcurrentDate.month() ) &&
-           ( sD.day()   == tqcurrentDate.day() ) ) {
+      if ( ( sD.month() == currentDate.month() ) &&
+           ( sD.day()   == currentDate.day() ) ) {
         datestr = i18n( "Today" );
         makeBold = true;
-      } else if ( ( sD.month() == tqcurrentDate.addDays( 1 ).month() ) &&
-                  ( sD.day()   == tqcurrentDate.addDays( 1 ).day() ) ) {
+      } else if ( ( sD.month() == currentDate.addDays( 1 ).month() ) &&
+                  ( sD.day()   == currentDate.addDays( 1 ).day() ) ) {
         datestr = i18n( "Tomorrow" );
       } else {
         datestr = KGlobal::locale()->formatDate( sD );
@@ -179,7 +179,7 @@ void SummaryWidget::updateView()
       }
 
       label = new TQLabel( datestr, this );
-      label->tqsetAlignment( AlignLeft | AlignVCenter );
+      label->setAlignment( AlignLeft | AlignVCenter );
       if ( makeBold ) {
         TQFont font = label->font();
         font.setBold( true );
@@ -198,7 +198,7 @@ void SummaryWidget::updateView()
       urlLabel->setText( newtext );
       urlLabel->setURL( ev->uid() );
       urlLabel->installEventFilter( this );
-      urlLabel->tqsetAlignment( urlLabel->tqalignment() | TQt::WordBreak );
+      urlLabel->setAlignment( urlLabel->tqalignment() | TQt::WordBreak );
       mLayout->addWidget( urlLabel, counter, 2 );
       mLabels.append( urlLabel );
 
@@ -228,7 +228,7 @@ void SummaryWidget::updateView()
                   .tqarg( KGlobal::locale()->formatTime( sST ) )
                   .tqarg( KGlobal::locale()->formatTime( sET ) );
         label = new TQLabel( datestr, this );
-        label->tqsetAlignment( AlignLeft | AlignVCenter );
+        label->setAlignment( AlignLeft | AlignVCenter );
         mLayout->addWidget( label, counter, 3 );
         mLabels.append( label );
       }
@@ -242,7 +242,7 @@ void SummaryWidget::updateView()
       i18n( "No appointments pending within the next day",
             "No appointments pending within the next %n days",
             days ), this, "nothing to see" );
-    noEvents->tqsetAlignment( AlignHCenter | AlignVCenter );
+    noEvents->setAlignment( AlignHCenter | AlignVCenter );
     mLayout->addWidget( noEvents, 0, 2 );
     mLabels.append( noEvents );
   }
diff --git a/kontact/plugins/korganizer/todoplugin.cpp b/kontact/plugins/korganizer/todoplugin.cpp
index caaaaf91d..c17b153f5 100644
--- a/kontact/plugins/korganizer/todoplugin.cpp
+++ b/kontact/plugins/korganizer/todoplugin.cpp
@@ -217,7 +217,7 @@ void TodoPlugin::processDropEvent( TQDropEvent *event )
       tf.setAutoDelete( true );
       TQString uri = "kmail:" + TQString::number( mail.serialNumber() ) + "/" +
                     mail.messageId();
-      tf.file()->writeBlock( event->tqencodedData( "message/rfc822" ) );
+      tf.file()->writeBlock( event->encodedData( "message/rfc822" ) );
       tf.close();
       interface()->openTodoEditor( i18n("Mail: %1").tqarg( mail.subject() ),
                                    txt, uri, tf.name(), TQStringList(), "message/rfc822", false );
diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp
index 0849dde74..ed21f40bf 100644
--- a/kontact/plugins/korganizer/todosummarywidget.cpp
+++ b/kontact/plugins/korganizer/todosummarywidget.cpp
@@ -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;