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

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.

1 files changed, 21 insertions, 21 deletions

diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index cb604fcf7..ba565a8d2 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -26,7 +26,7 @@
 #include <tqvbox.h>
 #include <tqlabel.h>
 #include <tqframe.h>
-#include <layout.h>
+#include <tqlayout.h>
 #ifndef KORG_NOSPLITTER
 #include <tqsplitter.h>
 #endif
@@ -137,7 +137,7 @@ KOAlternateLabel::KOAlternateLabel(const TQString &shortlabel, const TQString &l
   : TQLabel(parent, name), mTextTypeFixed(false), mShortText(shortlabel),
     mLongText(longlabel), mExtensiveText(extensivelabel)
 {
-  setSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+  tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
   if (mExtensiveText.isEmpty()) mExtensiveText = mLongText;
   squeezeTextToLabel();
 }
@@ -235,9 +235,9 @@ void KOAlternateLabel::resizeEvent( TQResizeEvent * )
   squeezeTextToLabel();
 }
 
-TQSize KOAlternateLabel::minimumSizeHint() const
+TQSize KOAlternateLabel::tqminimumSizeHint() const
 {
-  TQSize sh = TQLabel::minimumSizeHint();
+  TQSize sh = TQLabel::tqminimumSizeHint();
   sh.setWidth(-1);
   return sh;
 }
@@ -258,7 +258,7 @@ KOAgendaView::KOAgendaView( Calendar *cal,
   mPendingChanges( true ),
   mAreDatesInitialized( false )
 {
-  mSelectedDates.append(TQDate::currentDate());
+  mSelectedDates.append(TQDate::tqcurrentDate());
 
   mLayoutDayLabels = 0;
   mDayLabelsFrame = 0;
@@ -313,12 +313,12 @@ KOAgendaView::KOAgendaView( Calendar *cal,
   if ( KOPrefs::instance()->compactDialogs() ) {
     mExpandButton = new TQPushButton(mDummyAllDayLeft);
     mExpandButton->setPixmap( mNotExpandedPixmap );
-    mExpandButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed,
+    mExpandButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed,
                                   TQSizePolicy::Fixed ) );
     connect( mExpandButton, TQT_SIGNAL( clicked() ), TQT_SIGNAL( toggleExpand() ) );
   } else {
     TQLabel *label = new TQLabel( i18n("All Day"), mDummyAllDayLeft );
-    label->setAlignment( TQt::AlignRight | TQt::AlignVCenter | TQt::WordBreak );
+    label->tqsetAlignment( TQt::AlignRight | TQt::AlignVCenter | TQt::WordBreak );
   }
 
   mAllDayAgenda = new KOAgenda( 1, calendarView, mAllDayFrame );
@@ -476,7 +476,7 @@ void KOAgendaView::zoomInVertically( )
 
   mTimeLabels->updateConfig();
   mTimeLabels->positionChanged();
-  mTimeLabels->repaint();
+  mTimeLabels->tqrepaint();
 
   updateView();
 }
@@ -493,7 +493,7 @@ void KOAgendaView::zoomOutVertically( )
 
     mTimeLabels->updateConfig();
     mTimeLabels->positionChanged();
-    mTimeLabels->repaint();
+    mTimeLabels->tqrepaint();
 
     updateView();
   }
@@ -627,16 +627,16 @@ void KOAgendaView::createDayLabels( bool force )
     int dW = calsys->dayOfWeek(date);
     TQString veryLongStr = KGlobal::locale()->formatDate( date );
     TQString longstr = i18n( "short_weekday date (e.g. Mon 13)","%1 %2" )
-        .arg( calsys->weekDayName( dW, true ) )
-        .arg( calsys->day(date) );
+        .tqarg( calsys->weekDayName( dW, true ) )
+        .tqarg( calsys->day(date) );
     TQString shortstr = TQString::number(calsys->day(date));
 
     KOAlternateLabel *dayLabel = new KOAlternateLabel(shortstr,
                                                       longstr, veryLongStr, mDayLabels);
     dayLabel->useShortText(); // will be recalculated in updateDayLabelSizes() anyway
     dayLabel->setMinimumWidth(1);
-    dayLabel->setAlignment(TQLabel::AlignHCenter);
-    if (date == TQDate::currentDate()) {
+    dayLabel->tqsetAlignment(TQLabel::AlignHCenter);
+    if (date == TQDate::tqcurrentDate()) {
       TQFont font = dayLabel->font();
       font.setBold(true);
       dayLabel->setFont(font);
@@ -651,7 +651,7 @@ void KOAgendaView::createDayLabels( bool force )
       // use a KOAlternateLabel so when the text doesn't fit any more a tooltip is used
       KOAlternateLabel*label = new KOAlternateLabel( (*textit), (*textit), TQString(), mDayLabels );
       label->setMinimumWidth(1);
-      label->setAlignment(AlignCenter);
+      label->tqsetAlignment(AlignCenter);
       dayLayout->addWidget(label);
     }
 
@@ -664,7 +664,7 @@ void KOAgendaView::createDayLabels( bool force )
         // use a KOAlternateLabel so when the text doesn't fit any more a tooltip is used
         KOAlternateLabel*label = new KOAlternateLabel( text, text, TQString(), mDayLabels );
         label->setMinimumWidth(1);
-        label->setAlignment(AlignCenter);
+        label->tqsetAlignment(AlignCenter);
         dayLayout->addWidget(label);
       }
     }
@@ -696,7 +696,7 @@ int KOAgendaView::maxDatesHint()
   return 0;
 }
 
-int KOAgendaView::currentDateCount()
+int KOAgendaView::tqcurrentDateCount()
 {
   return mSelectedDates.count();
 }
@@ -783,7 +783,7 @@ void KOAgendaView::updateConfig()
 {
 //  kdDebug(5850) << "KOAgendaView::updateConfig()" << endl;
 
-  // update config for children
+  // update config for tqchildren
   mTimeLabels->updateConfig();
   mAgenda->updateConfig();
   mAllDayAgenda->updateConfig();
@@ -793,7 +793,7 @@ void KOAgendaView::updateConfig()
   mTimeLabels->positionChanged();
 
   // for some reason, this needs to be called explicitly
-  mTimeLabels->repaint();
+  mTimeLabels->tqrepaint();
 
   updateTimeBarWidth();
 
@@ -1343,7 +1343,7 @@ void KOAgendaView::changeIncidenceDisplay( Incidence *incidence, int mode )
   }
 
   // HACK: Update the view if the all-day agenda has been modified.
-  // Do this because there are some layout problems in the
+  // Do this because there are some tqlayout problems in the
   // all-day agenda that are not easily solved, but clearing
   // and redrawing works ok.
   if ( incidence->doesFloat() ) {
@@ -1420,7 +1420,7 @@ void KOAgendaView::fillAgenda()
 
 void KOAgendaView::displayIncidence( Incidence *incidence )
 {
-  TQDate today = TQDate::currentDate();
+  TQDate today = TQDate::tqcurrentDate();
   DateTimeList::iterator t;
 
   // FIXME: use a visitor here
@@ -1523,7 +1523,7 @@ void KOAgendaView::clearView()
 
 CalPrinterBase::PrintType KOAgendaView::printType()
 {
-  if ( currentDateCount() == 1 ) return CalPrinterBase::Day;
+  if ( tqcurrentDateCount() == 1 ) return CalPrinterBase::Day;
   else return CalPrinterBase::Week;
 }