Rename old tq methods that no longer need a unique name

1 files changed, 24 insertions, 24 deletions

diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp
index 3fbac9d2e..9b5c27efe 100644
--- a/kontact/plugins/specialdates/sdsummarywidget.cpp
+++ b/kontact/plugins/specialdates/sdsummarywidget.cpp
@@ -183,8 +183,8 @@ int SDSummaryWidget::span( KCal::Event *event )
   int span=1;
   if ( event->isMultiDay() && event->doesFloat() ) {
     TQDate d = event->dtStart().date();
-    if ( d < TQDate::tqcurrentDate() ) {
-      d = TQDate::tqcurrentDate();
+    if ( d < TQDate::currentDate() ) {
+      d = TQDate::currentDate();
     }
     while ( d < event->dtEnd().date() ) {
       span++;
@@ -199,8 +199,8 @@ int SDSummaryWidget::dayof( KCal::Event *event, const TQDate& date )
 {
   int dayof=1;
   TQDate d = event->dtStart().date();
-  if ( d < TQDate::tqcurrentDate() ) {
-    d = TQDate::tqcurrentDate();
+  if ( d < TQDate::currentDate() ) {
+    d = TQDate::currentDate();
   }
   while ( d < event->dtEnd().date() ) {
     if ( d < date ) {
@@ -269,9 +269,9 @@ void SDSummaryWidget::updateView()
   // Search for Birthdays, Anniversaries, Holidays, and Special Occasions
   // in the Calendar
   TQDate dt;
-  TQDate tqcurrentDate = TQDate::tqcurrentDate();
-  for ( dt=tqcurrentDate;
-        dt<=tqcurrentDate.addDays( mDaysAhead - 1 );
+  TQDate currentDate = TQDate::currentDate();
+  for ( dt=currentDate;
+        dt<=currentDate.addDays( mDaysAhead - 1 );
         dt=dt.addDays(1) ) {
     KCal::Event::List events = mCalendar->events( dt,
                                                   KCal::EventSortStartDate,
@@ -358,8 +358,8 @@ void SDSummaryWidget::updateView()
   // Seach for Holidays
   if ( mShowHolidays ) {
     if ( initHolidays() ) {
-      for ( dt=tqcurrentDate;
-            dt<=tqcurrentDate.addDays( mDaysAhead - 1 );
+      for ( dt=currentDate;
+            dt<=currentDate.addDays( mDaysAhead - 1 );
             dt=dt.addDays(1) ) {
         TQValueList<KHoliday> holidays = mHolidays->getHolidays( dt );
         TQValueList<KHoliday>::ConstIterator it = holidays.begin();
@@ -429,8 +429,8 @@ void SDSummaryWidget::updateView()
       } else {
         label->setPixmap( icon_img );
       }
-      label->setMaximumWidth( label->tqminimumSizeHint().width() );
-      label->tqsetAlignment( AlignVCenter );
+      label->setMaximumWidth( label->minimumSizeHint().width() );
+      label->setAlignment( AlignVCenter );
       mLayout->addWidget( label, counter, 0 );
       mLabels.append( label );
 
@@ -438,7 +438,7 @@ void SDSummaryWidget::updateView()
       TQString datestr;
 
       //Muck with the year -- change to the year 'daysTo' days away
-      int year = tqcurrentDate.addDays( (*addrIt).daysTo ).year();
+      int year = currentDate.addDays( (*addrIt).daysTo ).year();
       TQDate sD = TQDate( year, (*addrIt).date.month(), (*addrIt).date.day() );
 
       if ( (*addrIt).daysTo == 0 ) {
@@ -457,7 +457,7 @@ void SDSummaryWidget::updateView()
       }
 
       label = new TQLabel( datestr, this );
-      label->tqsetAlignment( AlignLeft | AlignVCenter );
+      label->setAlignment( AlignLeft | AlignVCenter );
       mLayout->addWidget( label, counter, 1 );
       mLabels.append( label );
       if ( makeBold ) {
@@ -474,7 +474,7 @@ void SDSummaryWidget::updateView()
         label->setText( i18n( "in 1 day", "in %n days", (*addrIt).daysTo ) );
       }
 
-      label->tqsetAlignment( AlignLeft | AlignVCenter );
+      label->setAlignment( AlignLeft | AlignVCenter );
       mLayout->addWidget( label, counter, 2 );
       mLabels.append( label );
 
@@ -492,7 +492,7 @@ void SDSummaryWidget::updateView()
       }
       label = new TQLabel( this );
       label->setText( what );
-      label->tqsetAlignment( AlignLeft | AlignVCenter );
+      label->setAlignment( AlignLeft | AlignVCenter );
       mLayout->addWidget( label, counter, 3 );
       mLabels.append( label );
 
@@ -530,7 +530,7 @@ void SDSummaryWidget::updateView()
         } else {
           label->setText( i18n( "one year", "%n years", (*addrIt).yearsOld  ) );
         }
-        label->tqsetAlignment( AlignLeft | AlignVCenter );
+        label->setAlignment( AlignLeft | AlignVCenter );
         mLayout->addWidget( label, counter, 5 );
         mLabels.append( label );
       }
@@ -542,7 +542,7 @@ void SDSummaryWidget::updateView()
         i18n( "No special dates within the next 1 day",
               "No special dates pending within the next %n days",
               mDaysAhead ), this, "nothing to see" );
-    label->tqsetAlignment( AlignHCenter | AlignVCenter );
+    label->setAlignment( AlignHCenter | AlignVCenter );
     mLayout->addMultiCellWidget( label, 0, 0, 0, 4 );
     mLabels.append( label );
   }
@@ -605,27 +605,27 @@ bool SDSummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
 
 void SDSummaryWidget::dateDiff( const TQDate &date, int &days, int &years )
 {
-  TQDate tqcurrentDate;
+  TQDate currentDate;
   TQDate eventDate;
 
   if ( TQDate::leapYear( date.year() ) && date.month() == 2 && date.day() == 29 ) {
-    tqcurrentDate = TQDate( date.year(), TQDate::tqcurrentDate().month(), TQDate::tqcurrentDate().day() );
-    if ( !TQDate::leapYear( TQDate::tqcurrentDate().year() ) )
+    currentDate = TQDate( date.year(), TQDate::currentDate().month(), TQDate::currentDate().day() );
+    if ( !TQDate::leapYear( TQDate::currentDate().year() ) )
       eventDate = TQDate( date.year(), date.month(), 28 ); // celebrate one day earlier ;)
     else
       eventDate = TQDate( date.year(), date.month(), date.day() );
   } else {
-    tqcurrentDate = TQDate( 0, TQDate::tqcurrentDate().month(), TQDate::tqcurrentDate().day() );
+    currentDate = TQDate( 0, TQDate::currentDate().month(), TQDate::currentDate().day() );
     eventDate = TQDate( 0, date.month(), date.day() );
   }
 
-  int offset = tqcurrentDate.daysTo( eventDate );
+  int offset = currentDate.daysTo( eventDate );
   if ( offset < 0 ) {
     days = 365 + offset;
-    years = TQDate::tqcurrentDate().year() + 1 - date.year();
+    years = TQDate::currentDate().year() + 1 - date.year();
   } else {
     days = offset;
-    years = TQDate::tqcurrentDate().year() - date.year();
+    years = TQDate::currentDate().year() - date.year();
   }
 }