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

This reverts commit 252fce5a2a5384702fbcc1c9987284d7bd2e6943.

1 files changed, 19 insertions, 19 deletions

diff --git a/kmymoney2/widgets/kmymoneycalendar.cpp b/kmymoney2/widgets/kmymoneycalendar.cpp
index 61b91fd..664548d 100644
--- a/kmymoney2/widgets/kmymoneycalendar.cpp
+++ b/kmymoney2/widgets/kmymoneycalendar.cpp
@@ -138,10 +138,10 @@ void kMyMoneyCalendar::init( const TQDate &dt )
   setFontSize(10);
   line->setValidator(val);
   line->installEventFilter( this );
-  yearForward->setPixmap(BarIcon(TQString::fromLatin1("2rightarrow")));
-  yearBackward->setPixmap(BarIcon(TQString::fromLatin1("2leftarrow")));
-  monthForward->setPixmap(BarIcon(TQString::fromLatin1("1rightarrow")));
-  monthBackward->setPixmap(BarIcon(TQString::fromLatin1("1leftarrow")));
+  yearForward->setPixmap(BarIcon(TQString::tqfromLatin1("2rightarrow")));
+  yearBackward->setPixmap(BarIcon(TQString::tqfromLatin1("2leftarrow")));
+  monthForward->setPixmap(BarIcon(TQString::tqfromLatin1("1rightarrow")));
+  monthBackward->setPixmap(BarIcon(TQString::tqfromLatin1("1leftarrow")));
   setDate(dt); // set button texts
   connect(table, TQT_SIGNAL(dateChanged(TQDate)), TQT_SLOT(dateChangedSlot(TQDate)));
   connect(table, TQT_SIGNAL(tableClicked()), TQT_SLOT(tableClickedSlot()));
@@ -200,7 +200,7 @@ kMyMoneyCalendar::resizeEvent(TQResizeEvent*)
     // ----- calculate button row height:
     for(count=0; count<NoOfButtons; ++count) {
         if ( buttons[count] ) { // closeButton may be 0L
-            sizes[count]=buttons[count]->sizeHint();
+            sizes[count]=buttons[count]->tqsizeHint();
             buttonHeight=TQMAX(buttonHeight, sizes[count].height());
         }
         else
@@ -211,7 +211,7 @@ kMyMoneyCalendar::resizeEvent(TQResizeEvent*)
     for(count=0; count<NoOfButtons; ++count) {
   if(buttons[count]==selectMonth) {
       TQSize metricBound = tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, selectMonth, maxMonthRect);
-      sizes[count].setWidth(TQMAX(metricBound.width(), maxMonthRect.width()+2*TQApplication::tqstyle().pixelMetric(TQStyle::PM_ButtonMargin)));
+      sizes[count].setWidth(TQMAX(metricBound.width(), maxMonthRect.width()+2*TQApplication::tqstyle().tqpixelMetric(TQStyle::PM_ButtonMargin)));
   }
     }
     // ----- place the buttons:
@@ -245,7 +245,7 @@ kMyMoneyCalendar::resizeEvent(TQResizeEvent*)
     }
 
     // ----- place the line edit for direct input:
-    sizes[0]=line->sizeHint();
+    sizes[0]=line->tqsizeHint();
     int week_width=d->selectWeek->fontMetrics().width(i18n("Week XX"))+((d->closeButton != 0L) ? 50 : 20);
     line->setGeometry(0, height()-sizes[0].height(), width()-week_width, sizes[0].height());
     d->selectWeek->setGeometry(width()-week_width, height()-sizes[0].height(), week_width, sizes[0].height());
@@ -261,7 +261,7 @@ kMyMoneyCalendar::dateChangedSlot(TQDate date)
 {
     kdDebug() << "kMyMoneyCalendar::dateChangedSlot: date changed (" << date.year() << "/" << date.month() << "/" << date.day() << ")." << endl;
     line->setText(KGlobal::locale()->formatDate(date, true));
-    d->selectWeek->setText(i18n("Week %1").arg(weekOfYear(date)));
+    d->selectWeek->setText(i18n("Week %1").tqarg(weekOfYear(date)));
     selectMonth->setText(MONTH_NAME(date.month(), date.year(), false));
     selectYear->setText(date.toString("yyyy"));
     emit(dateChanged(date));
@@ -297,7 +297,7 @@ kMyMoneyCalendar::setDate(const TQDate& date)
   TQString temp;
   // -----
   table->setDate(date);
-  d->selectWeek->setText(i18n("Week %1").arg(weekOfYear(date)));
+  d->selectWeek->setText(i18n("Week %1").tqarg(weekOfYear(date)));
   selectMonth->setText(MONTH_NAME(date.month(), date.year(), false));
   temp.setNum(date.year());
   selectYear->setText(temp);
@@ -341,7 +341,7 @@ kMyMoneyCalendar::selectWeekClicked()
   KPopupFrame* popup = new KPopupFrame(this);
   KDateInternalWeekSelector* picker = new KDateInternalWeekSelector(/*fontsize, */popup);
   // -----
-  picker->resize(picker->sizeHint());
+  picker->resize(picker->tqsizeHint());
   popup->setMainWidget(picker);
   connect(picker, TQT_SIGNAL(closeMe(int)), popup, TQT_SLOT(close(int)));
   picker->setFocus();
@@ -380,7 +380,7 @@ kMyMoneyCalendar::selectMonthClicked()
   KPopupFrame* popup = new KPopupFrame(this);
   KDateInternalMonthPicker* picker = new KDateInternalMonthPicker(/*fontsize, */popup);
   // -----
-  picker->resize(picker->sizeHint());
+  picker->resize(picker->tqsizeHint());
   popup->setMainWidget(picker);
   picker->setFocus();
   connect(picker, TQT_SIGNAL(closeMe(int)), popup, TQT_SLOT(close(int)));
@@ -412,7 +412,7 @@ kMyMoneyCalendar::selectYearClicked()
   KPopupFrame* popup = new KPopupFrame(this);
   KDateInternalYearSelector* picker = new KDateInternalYearSelector(fontsize, popup);
   // -----
-  picker->resize(picker->sizeHint());
+  picker->resize(picker->tqsizeHint());
   popup->setMainWidget(picker);
   connect(picker, TQT_SIGNAL(closeMe(int)), popup, TQT_SLOT(close(int)));
   picker->setFocus();
@@ -470,9 +470,9 @@ kMyMoneyCalendar::lineEnterPressed()
 }
 
 TQSize
-kMyMoneyCalendar::sizeHint() const
+kMyMoneyCalendar::tqsizeHint() const
 {
-  TQSize tableSize=table->sizeHint();
+  TQSize tableSize=table->tqsizeHint();
   TQWidget *buttons[]={
     styleControl,
     yearBackward,
@@ -492,14 +492,14 @@ kMyMoneyCalendar::sizeHint() const
   for(count=0; count<NoOfButtons; ++count)
     {
       if ( buttons[count] )
-          sizes[count]=buttons[count]->sizeHint();
+          sizes[count]=buttons[count]->tqsizeHint();
       else
           sizes[count] = TQSize(0,0);
 
       if(buttons[count]==selectMonth)
   {
     TQSize metricBound = tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, selectMonth, maxMonthRect);
-    cx+=TQMAX(metricBound.width(), maxMonthRect.width()+2*TQApplication::tqstyle().pixelMetric(TQStyle::PM_ButtonMargin));
+    cx+=TQMAX(metricBound.width(), maxMonthRect.width()+2*TQApplication::tqstyle().tqpixelMetric(TQStyle::PM_ButtonMargin));
   } else {
     cx+=sizes[count].width();
   }
@@ -508,7 +508,7 @@ kMyMoneyCalendar::sizeHint() const
   // ----- calculate width hint:
   cx=TQMAX(cx, tableSize.width()); // line edit ignored
   // ----- calculate height hint:
-  cy+=tableSize.height()+line->sizeHint().height();
+  cy+=tableSize.height()+line->tqsizeHint().height();
   return TQSize(cx, cy);
 }
 
@@ -540,7 +540,7 @@ kMyMoneyCalendar::setFontSize(int s)
       }
     TQFontMetrics metrics(selectMonth->fontMetrics());
     for(int i=1; i <= 12; ++i)
-      { // maxMonthRect is used by sizeHint()
+      { // maxMonthRect is used by tqsizeHint()
         r=metrics.boundingRect(MONTH_NAME(i, 2000, false));
         maxMonthRect.setWidth(TQMAX(r.width(), maxMonthRect.width()));
         maxMonthRect.setHeight(TQMAX(r.height(),  maxMonthRect.height()));
@@ -560,7 +560,7 @@ kMyMoneyCalendar::setCloseButton( bool enable )
         TQToolTip::add(d->closeButton, i18n("Close"));
         d->closeButton->setPixmap( SmallIcon("remove") );
         connect( d->closeButton, TQT_SIGNAL( clicked() ),
-                 topLevelWidget(), TQT_SLOT( close() ) );
+                 tqtopLevelWidget(), TQT_SLOT( close() ) );
     }
     else {
         delete d->closeButton;