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

8 files changed, 67 insertions, 67 deletions

diff --git a/korganizer/printing/calprintdayconfig_base.ui b/korganizer/printing/calprintdayconfig_base.ui
index bd9227ce8..b9c070eb1 100644
--- a/korganizer/printing/calprintdayconfig_base.ui
+++ b/korganizer/printing/calprintdayconfig_base.ui
@@ -56,7 +56,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>121</width>
                             <height>21</height>
@@ -73,7 +73,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>121</width>
                             <height>21</height>
@@ -228,7 +228,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>21</width>
                     <height>201</height>
diff --git a/korganizer/printing/calprintdefaultplugins.cpp b/korganizer/printing/calprintdefaultplugins.cpp
index fbb06795f..caa2e69ef 100644
--- a/korganizer/printing/calprintdefaultplugins.cpp
+++ b/korganizer/printing/calprintdefaultplugins.cpp
@@ -346,13 +346,13 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height )
 
         if ( offset % (24*60) == 0 && offset>0 ) { // divides evenly into days?
           useoffset = offset / (24*60);
-          offsetstr = offsetstr.tqarg( i18n("1 day", "%n days", useoffset ) );
+          offsetstr = offsetstr.arg( i18n("1 day", "%n days", useoffset ) );
         } else if (offset % 60 == 0 && offset>0 ) { // divides evenly into hours?
           useoffset = offset / 60;
-          offsetstr = offsetstr.tqarg( i18n("1 hour", "%n hours", useoffset ) );
+          offsetstr = offsetstr.arg( i18n("1 hour", "%n hours", useoffset ) );
         } else {
           useoffset = offset;
-          offsetstr = offsetstr.tqarg( i18n("1 minute", "%n minutes", useoffset ) );
+          offsetstr = offsetstr.arg( i18n("1 minute", "%n minutes", useoffset ) );
         }
         alarmStrings << offsetstr;
       }
@@ -481,24 +481,24 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height )
           datesString = "";
           if ( (*rit)->dtStart().isValid() ) {
                 datesString += i18n(
-                "Start Date: %1\n").tqarg(
+                "Start Date: %1\n").arg(
                 KGlobal::locale()->formatDate( (*rit)->dtStart().date(),
                                 true ) );
             if ( !(*rit)->doesFloat() ) {
                 datesString += i18n(
-                "Start Time: %1\n").tqarg(
+                "Start Time: %1\n").arg(
                 KGlobal::locale()->formatTime((*rit)->dtStart().time(),
                      false, false) );
             }
           }
           if ( (*rit)->dtEnd().isValid() ) {
             subitemString += i18n(
-                "Due Date: %1\n").tqarg(
+                "Due Date: %1\n").arg(
                 KGlobal::locale()->formatDate( (*rit)->dtEnd().date(),
                                 true ) );
             if ( !(*rit)->doesFloat() ) {
               subitemString += i18n(
-                  "subitem due time", "Due Time: %1\n").tqarg(
+                  "subitem due time", "Due Time: %1\n").arg(
                   KGlobal::locale()->formatTime((*rit)->dtEnd().time(),
                       false, false) );
             }
@@ -511,12 +511,12 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height )
             subitemString += "\n";
           }
           subitemString += i18n( "subitem Status: statusString",
-                                  "Status: %1\n").tqarg( statusString );
+                                  "Status: %1\n").arg( statusString );
           subitemString += IncidenceFormatter::recurrenceString((*rit)) + "\n";
           subitemString += i18n( "subitem Priority: N",
-                                  "Priority: %1\n").tqarg( (*rit)->priority() );
+                                  "Priority: %1\n").arg( (*rit)->priority() );
           subitemString += i18n( "subitem Secrecy: secrecyString",
-                                  "Secrecy: %1\n").tqarg( (*rit)->secrecyStr() );
+                                  "Secrecy: %1\n").arg( (*rit)->secrecyStr() );
           subitemString += "\n";
         }
         drawBoxWithCaption( p, notesBox, i18n("Subitems:"),
@@ -562,8 +562,8 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height )
                "'Name (Role): Status', e.g. 'Reinhold Kainhofer "
                "<reinhold@kainhofer.com> (Participant): Awaiting Response'",
                "%1 (%2): %3")
-                       .tqarg( (*ait)->fullName() )
-                       .tqarg( (*ait)->roleStr() ).tqarg( (*ait)->statusStr() );
+                       .arg( (*ait)->fullName() )
+                       .arg( (*ait)->roleStr() ).arg( (*ait)->statusStr() );
       }
       drawBoxWithCaption( p, attendeesBox, i18n("Attendees:"), attendeeString,
                /*sameLine=*/false, /*expand=*/false, captionFont, textFont );
@@ -572,11 +572,11 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height )
     if ( mShowOptions ) {
       TQString optionsString;
       if ( !(*it)->statusStr().isEmpty() ) {
-        optionsString += i18n("Status: %1").tqarg( (*it)->statusStr() );
+        optionsString += i18n("Status: %1").arg( (*it)->statusStr() );
         optionsString += "\n";
       }
       if ( !(*it)->secrecyStr().isEmpty() ) {
-        optionsString += i18n("Secrecy: %1").tqarg( (*it)->secrecyStr() );
+        optionsString += i18n("Secrecy: %1").arg( (*it)->secrecyStr() );
         optionsString += "\n";
       }
       if ( (*it)->type() == "Event" ) {
@@ -936,7 +936,7 @@ void CalPrintWeek::print( TQPainter &p, int width, int height )
         } else {
           title = i18n("date from-\nto", "%1 -\n%2");;
         }
-        title = title.tqarg( line1 ).tqarg( line2 );
+        title = title.arg( line1 ).arg( line2 );
         drawHeader( p, title, curWeek.addDays( -6 ), TQDate(), headerBox );
 
         drawWeek( p, curWeek, weekBox );
@@ -959,7 +959,7 @@ void CalPrintWeek::print( TQPainter &p, int width, int height )
         } else {
           title = i18n("date from -\nto (week number)", "%1 -\n%2 (Week %3)");
         }
-        title = title.tqarg( line1 ).tqarg( line2 ).tqarg( curWeek.weekNumber() );
+        title = title.arg( line1 ).arg( line2 ).arg( curWeek.weekNumber() );
         drawHeader( p, title, curWeek, TQDate(), headerBox );
 
         TQRect weekBox( headerBox );
@@ -1121,8 +1121,8 @@ void CalPrintMonth::print( TQPainter &p, int width, int height )
 
   do {
     TQString title( i18n("monthname year", "%1 %2") );
-    title = title.tqarg( calSys->monthName( curMonth ) )
-                 .tqarg( curMonth.year() );
+    title = title.arg( calSys->monthName( curMonth ) )
+                 .arg( curMonth.year() );
     TQDate tmp( fromMonth );
     int weekdayCol = weekdayColumn( tmp.dayOfWeek() );
     tmp = tmp.addDays( -weekdayCol );
diff --git a/korganizer/printing/calprinter.cpp b/korganizer/printing/calprinter.cpp
index e87f3c5a3..fc99ffee0 100644
--- a/korganizer/printing/calprinter.cpp
+++ b/korganizer/printing/calprinter.cpp
@@ -26,7 +26,7 @@
 #include <tqvbuttongroup.h>
 #include <tqwidgetstack.h>
 #include <tqradiobutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
@@ -178,7 +178,7 @@ CalPrintDialog::CalPrintDialog( KOrg::PrintPlugin::List plugins,
 
   mTypeGroup = new TQVButtonGroup( i18n("Print Style"), splitter, "buttonGroup" );
   // use the minimal width possible = max width of the radio buttons, not extensible
-/*  mTypeGroup->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)4,
+/*  mTypeGroup->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)4,
     (TQSizePolicy::SizeType)5, 0, 0,
       mTypeGroup->sizePolicy().hasHeightForWidth() ) );*/
 
@@ -220,11 +220,11 @@ CalPrintDialog::CalPrintDialog( KOrg::PrintPlugin::List plugins,
     TQRadioButton *radioButton = new TQRadioButton( p->description(), mTypeGroup );
     radioButton->setEnabled( p->enabled() );
     mTypeGroup->insert( radioButton, mapit.key() );
-//     radioButton->setMinimumHeight( radioButton->tqsizeHint().height() - 5 );
+//     radioButton->setMinimumHeight( radioButton->sizeHint().height() - 5 );
   }
 
-  setMinimumSize( tqminimumSizeHint() );
-  resize( tqminimumSizeHint() );
+  setMinimumSize( minimumSizeHint() );
+  resize( minimumSizeHint() );
 }
 
 CalPrintDialog::~CalPrintDialog()
diff --git a/korganizer/printing/calprintincidenceconfig_base.ui b/korganizer/printing/calprintincidenceconfig_base.ui
index 68afdecb1..509d4c54b 100644
--- a/korganizer/printing/calprintincidenceconfig_base.ui
+++ b/korganizer/printing/calprintincidenceconfig_base.ui
@@ -90,7 +90,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>21</width>
                     <height>201</height>
diff --git a/korganizer/printing/calprintmonthconfig_base.ui b/korganizer/printing/calprintmonthconfig_base.ui
index a6c5ba0e9..ceace2461 100644
--- a/korganizer/printing/calprintmonthconfig_base.ui
+++ b/korganizer/printing/calprintmonthconfig_base.ui
@@ -31,7 +31,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>21</width>
                     <height>20</height>
@@ -131,7 +131,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>17</width>
                             <height>21</height>
diff --git a/korganizer/printing/calprintpluginbase.cpp b/korganizer/printing/calprintpluginbase.cpp
index 27c3cb336..26ac86c88 100644
--- a/korganizer/printing/calprintpluginbase.cpp
+++ b/korganizer/printing/calprintpluginbase.cpp
@@ -24,7 +24,7 @@
 */
 
 #include <tqpainter.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqframe.h>
 #include <tqlabel.h>
 
@@ -128,7 +128,7 @@ CalPrintPluginBase::~CalPrintPluginBase()
 TQWidget *CalPrintPluginBase::createConfigWidget( TQWidget *w )
 {
   TQFrame *wdg = new TQFrame( w );
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( wdg );
+  TQVBoxLayout *layout = 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 );
 
-  tqlayout->addWidget( title );
-  tqlayout->addWidget( new TQLabel( info(), wdg ) );
-  tqlayout->addSpacing( 20 );
-  tqlayout->addWidget( new TQLabel( i18n("This printing style does not "
+  layout->addWidget( title );
+  layout->addWidget( new TQLabel( info(), wdg ) );
+  layout->addSpacing( 20 );
+  layout->addWidget( new TQLabel( i18n("This printing style does not "
                                       "have any configuration options."),
                                  wdg ) );
-  tqlayout->addStretch();
+  layout->addStretch();
   return wdg;
 }
 
@@ -182,7 +182,7 @@ void CalPrintPluginBase::doLoadConfig()
   if ( mConfig ) {
     KConfigGroupSaver saver( mConfig, description() );
     mConfig->sync();
-    TQDateTime currDate( TQDate::tqcurrentDate() );
+    TQDateTime currDate( TQDate::currentDate() );
     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::tqcurrentDateTime(), false );
+  TQString dateStr = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), false );
   p.drawText( footbox, TQt::AlignCenter | TQt::AlignVCenter | TQt::SingleLine,
-              i18n( "print date: formatted-datetime", "printed: %1" ).tqarg( dateStr ) );
+              i18n( "print date: formatted-datetime", "printed: %1" ).arg( 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")
-        .tqarg( mCalSys->weekDayName( qd ) )
-        .tqarg( mCalSys->monthName( qd ) )
-        .tqarg( qd.day() );
+        .arg( mCalSys->weekDayName( qd ) )
+        .arg( mCalSys->monthName( qd ) )
+        .arg( 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" ).
-            tqarg( currEvent->summary() ).tqarg( currEvent->location() );
+            arg( currEvent->summary() ).arg( 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" ).
-                     tqarg( todo->summary() ).tqarg( todo->location() );
+                     arg( todo->summary() ).arg( 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").tqarg( str ), textY );
+      drawIncidence( p, box, timeText, i18n("To-do: %1").arg( str ), textY );
     }
   }
 
@@ -1572,7 +1572,7 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p,
     }
 
     //now, write the percentage
-    outStr = i18n( "%1%" ).tqarg( todo->percentComplete() );
+    outStr = i18n( "%1%" ).arg( 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.tqarg( text ) );
+  TQString entry( field.arg( 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")
-                     .tqarg( journal->summary() )
-                     .tqarg( dateText );
+                     .arg( journal->summary() )
+                     .arg( 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")
-        .tqarg( mCalSys->monthName( fd.month(), false ) )
-        .tqarg( mCalSys->dayString( fd, false ) )
-        .tqarg( mCalSys->dayString( td, false ) );
+        .arg( mCalSys->monthName( fd.month(), false ) )
+        .arg( mCalSys->dayString( fd, false ) )
+        .arg( mCalSys->dayString( td, false ) );
     } else {
       title = i18n("Date range: monthStart dayStart - monthEnd dayEnd", "%1 %2 - %3 %4")
-        .tqarg( mCalSys->monthName( fd.month(), false ) )
-        .tqarg( mCalSys->dayString( fd, false ) )
-        .tqarg( mCalSys->monthName( td.month(), false ) )
-        .tqarg( mCalSys->dayString( td, false ) );
+        .arg( mCalSys->monthName( fd.month(), false ) )
+        .arg( mCalSys->dayString( fd, false ) )
+        .arg( mCalSys->monthName( td.month(), false ) )
+        .arg( mCalSys->dayString( td, false ) );
     }
   }
 
diff --git a/korganizer/printing/calprinttodoconfig_base.ui b/korganizer/printing/calprinttodoconfig_base.ui
index f416c0ea8..106ffd7d6 100644
--- a/korganizer/printing/calprinttodoconfig_base.ui
+++ b/korganizer/printing/calprinttodoconfig_base.ui
@@ -86,7 +86,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout2</cstring>
+                        <cstring>layout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -102,7 +102,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>20</height>
@@ -191,7 +191,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>21</height>
@@ -275,7 +275,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -341,7 +341,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>121</width>
                             <height>20</height>
@@ -358,7 +358,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>121</width>
                             <height>20</height>
diff --git a/korganizer/printing/calprintweekconfig_base.ui b/korganizer/printing/calprintweekconfig_base.ui
index f367f3c41..0be844abb 100644
--- a/korganizer/printing/calprintweekconfig_base.ui
+++ b/korganizer/printing/calprintweekconfig_base.ui
@@ -34,7 +34,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>21</width>
                     <height>27</height>
@@ -62,7 +62,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>16</width>
                             <height>21</height>
@@ -118,7 +118,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>110</width>
                             <height>20</height>
@@ -246,7 +246,7 @@
                         <string>Print as &amp;timetable view</string>
                     </property>
                     <property name="whatsThis" stdset="0">
-                        <string>This view is similar to the weekview in KOrganizer. The week is printed in landscape tqlayout. You can even use the same colors for the items if you check &lt;i&gt;Use Colors&lt;/i&gt;.</string>
+                        <string>This view is similar to the weekview in KOrganizer. The week is printed in landscape layout. You can even use the same colors for the items if you check &lt;i&gt;Use Colors&lt;/i&gt;.</string>
                     </property>
                 </widget>
                 <widget class="TQRadioButton" row="2" column="0" rowspan="1" colspan="3">
@@ -257,7 +257,7 @@
                         <string>Print as split week view</string>
                     </property>
                     <property name="whatsThis" stdset="0">
-                        <string>This view is similar to the week view in KOrganizer. The only difference with the timetable view is the page tqlayout. Timetables are printed in landscape, the split week view in portrait.</string>
+                        <string>This view is similar to the week view in KOrganizer. The only difference with the timetable view is the page layout. Timetables are printed in landscape, the split week view in portrait.</string>
                     </property>
                 </widget>
             </grid>