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

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.

1 files changed, 12 insertions, 12 deletions

diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp
index 4966e24db..23a017167 100644
--- a/korganizer/navigatorbar.cpp
+++ b/korganizer/navigatorbar.cpp
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <tqtooltip.h>
 #include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqframe.h>
 #include <tqpopupmenu.h>
 #include <tqlabel.h>
@@ -71,43 +71,43 @@ NavigatorBar::NavigatorBar( TQWidget *parent, const char *name )
   pix = KOGlobals::self()->smallIcon( isRTL ? "2rightarrow" : "2leftarrow" );
   mPrevYear = new TQPushButton( this );
   mPrevYear->setPixmap( pix );
-  mPrevYear->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+  mPrevYear->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
   TQToolTip::add( mPrevYear, i18n( "Previous year" ) );
 
   pix = KOGlobals::self()->smallIcon( isRTL ? "1rightarrow" : "1leftarrow");
   mPrevMonth = new TQPushButton( this );
   mPrevMonth->setPixmap( pix );
-  mPrevMonth->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+  mPrevMonth->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
   TQToolTip::add( mPrevMonth, i18n( "Previous month" ) );
 
   // Create forward navigation buttons
   pix = KOGlobals::self()->smallIcon( isRTL ? "1leftarrow" : "1rightarrow");
   mNextMonth = new TQPushButton( this );
   mNextMonth->setPixmap( pix );
-  mNextMonth->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+  mNextMonth->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
   TQToolTip::add( mNextMonth, i18n( "Next month" ) );
 
   pix = KOGlobals::self()->smallIcon( isRTL ? "2leftarrow" : "2rightarrow");
   mNextYear = new TQPushButton( this );
   mNextYear->setPixmap( pix );
-  mNextYear->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
+  mNextYear->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
   TQToolTip::add( mNextYear, i18n( "Next year" ) );
 
   // Create month name button
   mMonth = new ActiveLabel( this );
   mMonth->setFont( tfont );
-  mMonth->setAlignment( AlignCenter );
-  mMonth->setMinimumHeight( mPrevYear->sizeHint().height() );
+  mMonth->tqsetAlignment( AlignCenter );
+  mMonth->setMinimumHeight( mPrevYear->tqsizeHint().height() );
   TQToolTip::add( mMonth, i18n( "Select a month" ) );
 
   // Create year button
   mYear = new ActiveLabel( this );
   mYear->setFont( tfont );
-  mYear->setAlignment( AlignCenter );
-  mYear->setMinimumHeight( mPrevYear->sizeHint().height() );
+  mYear->tqsetAlignment( AlignCenter );
+  mYear->setMinimumHeight( mPrevYear->tqsizeHint().height() );
   TQToolTip::add( mYear, i18n( "Select a year" ) );
 
-  // set up control frame layout
+  // set up control frame tqlayout
   TQHBoxLayout *ctrlLayout = new TQHBoxLayout( this );
   ctrlLayout->addWidget( mPrevYear );
   ctrlLayout->addWidget( mPrevMonth );
@@ -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" ).arg( calSys->monthName( mDate ) ) );
-    mYear->setText( i18n( "4 digit year", "%1" ).arg( calSys->yearString( mDate, false ) ) );
+    mMonth->setText( i18n( "monthname", "%1" ).tqarg( calSys->monthName( mDate ) ) );
+    mYear->setText( i18n( "4 digit year", "%1" ).tqarg( calSys->yearString( mDate, false ) ) );
   }
 }