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

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.

1 files changed, 27 insertions, 27 deletions

diff --git a/korganizer/printing/calprintpluginbase.cpp b/korganizer/printing/calprintpluginbase.cpp
index 26ac86c88..27c3cb336 100644
--- a/korganizer/printing/calprintpluginbase.cpp
+++ b/korganizer/printing/calprintpluginbase.cpp
@@ -24,7 +24,7 @@
 */
 
 #include <tqpainter.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqframe.h>
 #include <tqlabel.h>
 
@@ -128,7 +128,7 @@ CalPrintPluginBase::~CalPrintPluginBase()
 TQWidget *CalPrintPluginBase::createConfigWidget( TQWidget *w )
 {
   TQFrame *wdg = new TQFrame( w );
-  TQVBoxLayout *layout = new TQVBoxLayout( wdg );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( wdg );
 
   TQLabel *title = new TQLabel( description(), wdg );
   TQFont titleFont( title->font() );
@@ -136,13 +136,13 @@ TQWidget *CalPrintPluginBase::createConfigWidget( TQWidget *w )
   titleFont.setBold( true );
   title->setFont( titleFont );
 
-  layout->addWidget( title );
-  layout->addWidget( new TQLabel( info(), wdg ) );
-  layout->addSpacing( 20 );
-  layout->addWidget( new TQLabel( i18n("This printing style does not "
+  tqlayout->addWidget( title );
+  tqlayout->addWidget( new TQLabel( info(), wdg ) );
+  tqlayout->addSpacing( 20 );
+  tqlayout->addWidget( new TQLabel( i18n("This printing style does not "
                                       "have any configuration options."),
                                  wdg ) );
-  layout->addStretch();
+  tqlayout->addStretch();
   return wdg;
 }
 
@@ -182,7 +182,7 @@ void CalPrintPluginBase::doLoadConfig()
   if ( mConfig ) {
     KConfigGroupSaver saver( mConfig, description() );
     mConfig->sync();
-    TQDateTime currDate( TQDate::currentDate() );
+    TQDateTime currDate( TQDate::tqcurrentDate() );
     mFromDate = mConfig->readDateTimeEntry( "FromDate", &currDate ).date();
     mToDate = mConfig->readDateTimeEntry( "ToDate" ).date();
     mUseColors = mConfig->readBoolEntry( "UseColors", true );
@@ -558,9 +558,9 @@ int CalPrintPluginBase::drawFooter( TQPainter &p, TQRect &footbox )
   TQFont oldfont( p.font() );
   p.setFont( TQFont( "sans-serif", 6 ) );
   TQFontMetrics fm( p.font() );
-  TQString dateStr = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), false );
+  TQString dateStr = KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(), false );
   p.drawText( footbox, TQt::AlignCenter | TQt::AlignVCenter | TQt::SingleLine,
-              i18n( "print date: formatted-datetime", "printed: %1" ).arg( dateStr ) );
+              i18n( "print date: formatted-datetime", "printed: %1" ).tqarg( dateStr ) );
   p.setFont( oldfont );
 
   return footbox.bottom();
@@ -933,9 +933,9 @@ void CalPrintPluginBase::drawDayBox( TQPainter &p, const TQDate &qd,
   if ( fullDate && mCalSys ) {
 
     dayNumStr = i18n("weekday month date", "%1 %2 %3")
-        .arg( mCalSys->weekDayName( qd ) )
-        .arg( mCalSys->monthName( qd ) )
-        .arg( qd.day() );
+        .tqarg( mCalSys->weekDayName( qd ) )
+        .tqarg( mCalSys->monthName( qd ) )
+        .tqarg( qd.day() );
 //    dayNumStr = local->formatDate(qd);
   } else {
     dayNumStr = TQString::number( qd.day() );
@@ -984,7 +984,7 @@ void CalPrintPluginBase::drawDayBox( TQPainter &p, const TQDate &qd,
     TQString str;
     if ( !currEvent->location().isEmpty() ) {
       str = i18n( "summary, location", "%1, %2" ).
-            arg( currEvent->summary() ).arg( currEvent->location() );
+            tqarg( currEvent->summary() ).tqarg( currEvent->location() );
     } else {
       str = currEvent->summary();
     }
@@ -1008,7 +1008,7 @@ void CalPrintPluginBase::drawDayBox( TQPainter &p, const TQDate &qd,
       TQString summaryStr;
       if ( !todo->location().isEmpty() ) {
         summaryStr = i18n( "summary, location", "%1, %2" ).
-                     arg( todo->summary() ).arg( todo->location() );
+                     tqarg( todo->summary() ).tqarg( todo->location() );
       } else {
         summaryStr = todo->summary();
       }
@@ -1026,7 +1026,7 @@ void CalPrintPluginBase::drawDayBox( TQPainter &p, const TQDate &qd,
       } else {
         str = summaryStr;
       }
-      drawIncidence( p, box, timeText, i18n("To-do: %1").arg( str ), textY );
+      drawIncidence( p, box, timeText, i18n("To-do: %1").tqarg( str ), textY );
     }
   }
 
@@ -1572,7 +1572,7 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p,
     }
 
     //now, write the percentage
-    outStr = i18n( "%1%" ).arg( todo->percentComplete() );
+    outStr = i18n( "%1%" ).tqarg( todo->percentComplete() );
     rect = p.boundingRect( posPercentComplete+lwidth+3, y, x + width, -1,
                            TQt::AlignTop | TQt::AlignLeft, outStr );
     p.drawText( rect, TQt::AlignTop | TQt::AlignLeft, outStr );
@@ -1648,7 +1648,7 @@ void CalPrintPluginBase::drawJournalField( TQPainter &p, TQString field, TQStrin
 {
   if ( text.isEmpty() ) return;
 
-  TQString entry( field.arg( text ) );
+  TQString entry( field.tqarg( text ) );
 
   TQRect rect( p.boundingRect( x, y, width, -1, TQt::WordBreak, entry) );
   if ( rect.bottom() > pageHeight) {
@@ -1677,8 +1677,8 @@ void CalPrintPluginBase::drawJournal( Journal * journal, TQPainter &p, int x, in
     headerText = dateText;
   } else {
     headerText = i18n("Description - date", "%1 - %2")
-                     .arg( journal->summary() )
-                     .arg( dateText );
+                     .tqarg( journal->summary() )
+                     .tqarg( dateText );
   }
 
   TQRect rect( p.boundingRect( x, y, width, -1, TQt::WordBreak, headerText) );
@@ -1717,15 +1717,15 @@ void CalPrintPluginBase::drawSplitHeaderRight( TQPainter &p, const TQDate &fd,
   if ( mCalSys ) {
     if ( fd.month() == td.month() ) {
       title = i18n("Date range: Month dayStart - dayEnd", "%1 %2 - %3")
-        .arg( mCalSys->monthName( fd.month(), false ) )
-        .arg( mCalSys->dayString( fd, false ) )
-        .arg( mCalSys->dayString( td, false ) );
+        .tqarg( mCalSys->monthName( fd.month(), false ) )
+        .tqarg( mCalSys->dayString( fd, false ) )
+        .tqarg( mCalSys->dayString( td, false ) );
     } else {
       title = i18n("Date range: monthStart dayStart - monthEnd dayEnd", "%1 %2 - %3 %4")
-        .arg( mCalSys->monthName( fd.month(), false ) )
-        .arg( mCalSys->dayString( fd, false ) )
-        .arg( mCalSys->monthName( td.month(), false ) )
-        .arg( mCalSys->dayString( td, false ) );
+        .tqarg( mCalSys->monthName( fd.month(), false ) )
+        .tqarg( mCalSys->dayString( fd, false ) )
+        .tqarg( mCalSys->monthName( td.month(), false ) )
+        .tqarg( mCalSys->dayString( td, false ) );
     }
   }