Remove additional unneeded tq method conversions

15 files changed, 49 insertions, 49 deletions

diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
index 34bec493e..88a975b70 100644
--- a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
+++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
@@ -171,7 +171,7 @@ void KAddressbookPlugin::processDropEvent( TQDropEvent *event )
   }
 
   KMessageBox::sorry( core(), i18n( "Cannot handle drop events of type '%1'." )
-                      .tqarg( event->format() ) );
+                      .arg( event->format() ) );
 }
 
 
diff --git a/kontact/plugins/kmail/summarywidget.cpp b/kontact/plugins/kmail/summarywidget.cpp
index 3a0b16591..76b2b759c 100644
--- a/kontact/plugins/kmail/summarywidget.cpp
+++ b/kontact/plugins/kmail/summarywidget.cpp
@@ -142,7 +142,7 @@ void SummaryWidget::updateFolderList( const TQStringList& folders )
       TQLabel *label =
         new TQLabel( TQString( i18n("%1: number of unread messages "
                                   "%2: total number of messages", "%1 / %2") )
-                    .tqarg( numUnreadMsg ).tqarg( numMsg ), this );
+                    .arg( numUnreadMsg ).arg( numMsg ), this );
       label->setAlignment( AlignLeft );
       label->show();
       mLayout->addWidget( label, counter, 2 );
@@ -166,7 +166,7 @@ bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
   if ( obj->inherits( "KURLLabel" ) ) {
     KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) );
     if ( e->type() == TQEvent::Enter )
-      emit message( i18n( "Open Folder: \"%1\"" ).tqarg( label->text() ) );
+      emit message( i18n( "Open Folder: \"%1\"" ).arg( label->text() ) );
     if ( e->type() == TQEvent::Leave )
       emit message( TQString() );
   }
diff --git a/kontact/plugins/knotes/summarywidget.cpp b/kontact/plugins/knotes/summarywidget.cpp
index 2f598990f..309904a9b 100644
--- a/kontact/plugins/knotes/summarywidget.cpp
+++ b/kontact/plugins/knotes/summarywidget.cpp
@@ -103,7 +103,7 @@ void KNotesSummaryWidget::updateView()
       KURLLabel *urlLabel = new KURLLabel( (*it)->uid(), newtext, this );
       urlLabel->installEventFilter( this );
       urlLabel->setTextFormat(RichText);
-      urlLabel->setAlignment( urlLabel->tqalignment() | TQt::WordBreak );
+      urlLabel->setAlignment( urlLabel->alignment() | TQt::WordBreak );
       mLayout->addWidget( urlLabel, counter, 1 );
       mLabels.append( urlLabel );
 
@@ -140,7 +140,7 @@ bool KNotesSummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
   if ( obj->inherits( "KURLLabel" ) ) {
     KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) );
     if ( e->type() == TQEvent::Enter )
-      emit message( i18n( "Read Note: \"%1\"" ).tqarg( label->text() ) );
+      emit message( i18n( "Read Note: \"%1\"" ).arg( label->text() ) );
     if ( e->type() == TQEvent::Leave )
       emit message( TQString() );
   }
diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp
index 6d39d413a..2262dcef3 100644
--- a/kontact/plugins/korganizer/korganizerplugin.cpp
+++ b/kontact/plugins/korganizer/korganizerplugin.cpp
@@ -195,7 +195,7 @@ void KOrganizerPlugin::processDropEvent( TQDropEvent *event )
               KCal::Incidence *i = incidences.first();
               TQString summary;
               if ( dynamic_cast<KCal::Journal*>( i ) )
-                  summary = i18n( "Note: %1" ).tqarg( i->summary() );
+                  summary = i18n( "Note: %1" ).arg( i->summary() );
               else
                   summary = i->summary();
               interface()->openEventEditor( summary, i->description(), TQString() );
@@ -219,22 +219,22 @@ void KOrganizerPlugin::processDropEvent( TQDropEvent *event )
                           i18n("Drops of multiple mails are not supported." ) );
     } else {
       KPIM::MailSummary mail = mails.first();
-      TQString txt = i18n("From: %1\nTo: %2\nSubject: %3").tqarg( mail.from() )
-                    .tqarg( mail.to() ).tqarg( mail.subject() );
+      TQString txt = i18n("From: %1\nTo: %2\nSubject: %3").arg( mail.from() )
+                    .arg( mail.to() ).arg( mail.subject() );
 
       KTempFile tf;
       tf.setAutoDelete( true );
       TQString uri = TQString::fromLatin1("kmail:") + TQString::number( mail.serialNumber() );
       tf.file()->writeBlock( event->encodedData( "message/rfc822" ) );
       tf.close();
-      interface()->openEventEditor( i18n("Mail: %1").tqarg( mail.subject() ), txt,
+      interface()->openEventEditor( i18n("Mail: %1").arg( mail.subject() ), txt,
                                     uri, tf.name(), TQStringList(), "message/rfc822" );
     }
     return;
   }
 
   KMessageBox::sorry( core(), i18n("Cannot handle drop events of type '%1'.")
-                              .tqarg( event->format() ) );
+                              .arg( event->format() ) );
 }
 
 bool KOrganizerPlugin::queryClose() const {
diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp
index c4c4dad9c..ee8eefdcd 100644
--- a/kontact/plugins/korganizer/summarywidget.cpp
+++ b/kontact/plugins/korganizer/summarywidget.cpp
@@ -191,14 +191,14 @@ void SummaryWidget::updateView()
       // Fill Event Summary Field
       TQString newtext = ev->summary();
       if ( ev->isMultiDay() &&  !ev->doesFloat() ) {
-        newtext.append( TQString(" (%1/%2)").tqarg( dayof ).tqarg( span ) );
+        newtext.append( TQString(" (%1/%2)").arg( dayof ).arg( span ) );
       }
 
       KURLLabel *urlLabel = new KURLLabel( this );
       urlLabel->setText( newtext );
       urlLabel->setURL( ev->uid() );
       urlLabel->installEventFilter( this );
-      urlLabel->setAlignment( urlLabel->tqalignment() | TQt::WordBreak );
+      urlLabel->setAlignment( urlLabel->alignment() | TQt::WordBreak );
       mLayout->addWidget( urlLabel, counter, 2 );
       mLabels.append( urlLabel );
 
@@ -225,8 +225,8 @@ void SummaryWidget::updateView()
           }
         }
         datestr = i18n( "Time from - to", "%1 - %2" )
-                  .tqarg( KGlobal::locale()->formatTime( sST ) )
-                  .tqarg( KGlobal::locale()->formatTime( sET ) );
+                  .arg( KGlobal::locale()->formatTime( sST ) )
+                  .arg( KGlobal::locale()->formatTime( sET ) );
         label = new TQLabel( datestr, this );
         label->setAlignment( AlignLeft | AlignVCenter );
         mLayout->addWidget( label, counter, 3 );
@@ -288,7 +288,7 @@ bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
   if ( obj->inherits( "KURLLabel" ) ) {
     KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) );
     if ( e->type() == TQEvent::Enter )
-      emit message( i18n( "Edit Appointment: \"%1\"" ).tqarg( label->text() ) );
+      emit message( i18n( "Edit Appointment: \"%1\"" ).arg( label->text() ) );
     if ( e->type() == TQEvent::Leave )
       emit message( TQString() );
   }
diff --git a/kontact/plugins/korganizer/todoplugin.cpp b/kontact/plugins/korganizer/todoplugin.cpp
index c17b153f5..e3ff2ba8f 100644
--- a/kontact/plugins/korganizer/todoplugin.cpp
+++ b/kontact/plugins/korganizer/todoplugin.cpp
@@ -187,7 +187,7 @@ void TodoPlugin::processDropEvent( TQDropEvent *event )
         KCal::Incidence *i = incidences.first();
         TQString summary;
         if ( dynamic_cast<KCal::Journal*>( i ) )
-          summary = i18n( "Note: %1" ).tqarg( i->summary() );
+          summary = i18n( "Note: %1" ).arg( i->summary() );
         else
           summary = i->summary();
         interface()->openTodoEditor( summary, i->description(), TQString() );
@@ -210,8 +210,8 @@ void TodoPlugin::processDropEvent( TQDropEvent *event )
                           i18n("Drops of multiple mails are not supported." ) );
     } else {
       KPIM::MailSummary mail = mails.first();
-      TQString txt = i18n("From: %1\nTo: %2\nSubject: %3").tqarg( mail.from() )
-                    .tqarg( mail.to() ).tqarg( mail.subject() );
+      TQString txt = i18n("From: %1\nTo: %2\nSubject: %3").arg( mail.from() )
+                    .arg( mail.to() ).arg( mail.subject() );
 
       KTempFile tf;
       tf.setAutoDelete( true );
@@ -219,14 +219,14 @@ void TodoPlugin::processDropEvent( TQDropEvent *event )
                     mail.messageId();
       tf.file()->writeBlock( event->encodedData( "message/rfc822" ) );
       tf.close();
-      interface()->openTodoEditor( i18n("Mail: %1").tqarg( mail.subject() ),
+      interface()->openTodoEditor( i18n("Mail: %1").arg( mail.subject() ),
                                    txt, uri, tf.name(), TQStringList(), "message/rfc822", false );
     }
     return;
   }
 
   KMessageBox::sorry( core(), i18n("Cannot handle drop events of type '%1'.")
-                              .tqarg( event->format() ) );
+                              .arg( event->format() ) );
 }
 
 #include "todoplugin.moc"
diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp
index ed21f40bf..7171e539f 100644
--- a/kontact/plugins/korganizer/todosummarywidget.cpp
+++ b/kontact/plugins/korganizer/todosummarywidget.cpp
@@ -253,7 +253,7 @@ bool TodoSummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
   if ( obj->inherits( "KURLLabel" ) ) {
     KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) );
     if ( e->type() == TQEvent::Enter )
-      emit message( i18n( "Edit To-do: \"%1\"" ).tqarg( label->text() ) );
+      emit message( i18n( "Edit To-do: \"%1\"" ).arg( label->text() ) );
     if ( e->type() == TQEvent::Leave )
       emit message( TQString() );
   }
diff --git a/kontact/plugins/kpilot/summarywidget.cpp b/kontact/plugins/kpilot/summarywidget.cpp
index ff6d41852..d2180a634 100644
--- a/kontact/plugins/kpilot/summarywidget.cpp
+++ b/kontact/plugins/kpilot/summarywidget.cpp
@@ -101,7 +101,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
   mConduitsTextLabel->setAlignment( AlignAuto | AlignTop | ExpandTabs );
   mLayout->addWidget( mConduitsTextLabel, row, 0 );
   mConduitsLabel = new TQLabel( i18n( "No information available" ), this );
-  mConduitsLabel->setAlignment( mConduitsLabel->tqalignment() | TQt::WordBreak );
+  mConduitsLabel->setAlignment( mConduitsLabel->alignment() | TQt::WordBreak );
   mLayout->addMultiCellWidget( mConduitsLabel, row, row, 1, 3 );
 
   // widgets shown if kpilotDaemon is not running
@@ -202,7 +202,7 @@ void SummaryWidget::showSyncLog( const TQString &filename )
 
   TQFile f(filename);
   if ( !f.open( IO_ReadOnly ) ) {
-    KMessageBox::error( this, i18n( "Unable to open Hotsync log %1." ).tqarg( filename ) );
+    KMessageBox::error( this, i18n( "Unable to open Hotsync log %1." ).arg( filename ) );
     return;
   }
 
diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp
index 9b5c27efe..1b8475080 100644
--- a/kontact/plugins/specialdates/sdsummarywidget.cpp
+++ b/kontact/plugins/specialdates/sdsummarywidget.cpp
@@ -595,7 +595,7 @@ bool SDSummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
   if ( obj->inherits( "KURLLabel" ) ) {
     KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) );
     if ( e->type() == TQEvent::Enter )
-      emit message( i18n( "Mail to:\"%1\"" ).tqarg( label->text() ) );
+      emit message( i18n( "Mail to:\"%1\"" ).arg( label->text() ) );
     if ( e->type() == TQEvent::Leave )
       emit message( TQString() );
   }
diff --git a/kontact/plugins/summary/dropwidget.cpp b/kontact/plugins/summary/dropwidget.cpp
index 63c1d3ceb..4b5373b34 100644
--- a/kontact/plugins/summary/dropwidget.cpp
+++ b/kontact/plugins/summary/dropwidget.cpp
@@ -36,9 +36,9 @@ void DropWidget::dragEnterEvent( TQDragEnterEvent *event )
 
 void DropWidget::dropEvent( TQDropEvent *event )
 {
-  int tqalignment = ( event->pos().x() < (width() / 2) ? TQt::AlignLeft : TQt::AlignRight );
-  tqalignment |= ( event->pos().y() < (height() / 2) ? TQt::AlignTop : TQt::AlignBottom );
-  emit summaryWidgetDropped( this, event->source(), tqalignment );
+  int alignment = ( event->pos().x() < (width() / 2) ? TQt::AlignLeft : TQt::AlignRight );
+  alignment |= ( event->pos().y() < (height() / 2) ? TQt::AlignTop : TQt::AlignBottom );
+  emit summaryWidgetDropped( this, event->source(), alignment );
 }
 
 #include "dropwidget.moc"
diff --git a/kontact/plugins/summary/dropwidget.h b/kontact/plugins/summary/dropwidget.h
index e2d11c9ee..c4fe2c8b2 100644
--- a/kontact/plugins/summary/dropwidget.h
+++ b/kontact/plugins/summary/dropwidget.h
@@ -33,7 +33,7 @@ class DropWidget : public TQWidget
     DropWidget( TQWidget *parent, const char *name = 0 );
 
   signals:
-    void summaryWidgetDropped( TQWidget *target, TQWidget *widget, int tqalignment );
+    void summaryWidgetDropped( TQWidget *target, TQWidget *widget, int alignment );
 
   protected:
     virtual void dragEnterEvent( TQDragEnterEvent* );
diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp
index 076692948..bf0197cb9 100644
--- a/kontact/plugins/summary/kcmkontactsummary.cpp
+++ b/kontact/plugins/summary/kcmkontactsummary.cpp
@@ -120,7 +120,7 @@ void KCMKontactSummary::load()
 {
   KTrader::OfferList offers = KTrader::self()->query(
       TQString::fromLatin1( "Kontact/Plugin" ),
-      TQString( "[X-KDE-KontactPluginVersion] == %1" ).tqarg( KONTACT_PLUGIN_VERSION ) );
+      TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) );
 
   TQStringList activeSummaries;
 
diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp
index 9caeeb6d6..97bb4c53f 100644
--- a/kontact/plugins/summary/summaryview_part.cpp
+++ b/kontact/plugins/summary/summaryview_part.cpp
@@ -136,8 +136,8 @@ void SummaryViewPart::updateWidgets()
   KPIM::IdentityManager idm( true, this );
   const KPIM::Identity &id = idm.defaultIdentity();
 
-  TQString currentUser = i18n( "Summary for %1" ).tqarg( id.fullName() );
-  mUsernameLabel->setText( TQString::fromLatin1( "<b>%1</b>" ).tqarg( currentUser ) );
+  TQString currentUser = i18n( "Summary for %1" ).arg( id.fullName() );
+  mUsernameLabel->setText( TQString::fromLatin1( "<b>%1</b>" ).arg( currentUser ) );
 
   mSummaries.clear();
 
@@ -177,7 +177,7 @@ void SummaryViewPart::updateWidgets()
         mSummaries.insert( plugin->identifier(), summary );
 
         connect( summary, TQT_SIGNAL( message( const TQString& ) ),
-                 BroadcastStatus::instance(), TQT_SLOT( seStatusMsg( const TQString& ) ) );
+                 BroadcastStatus::instance(), TQT_SLOT( setStatusMsg( const TQString& ) ) );
         connect( summary, TQT_SIGNAL( summaryWidgetDropped( TQWidget*, TQWidget*, int ) ),
                  this, TQT_SLOT( summaryWidgetMoved( TQWidget*, TQWidget*, int ) ) );
 
@@ -241,7 +241,7 @@ void SummaryViewPart::updateWidgets()
   mRightColumn->addStretch();
 }
 
-void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, int tqalignment )
+void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, int alignment )
 {
   if ( target == widget )
     return;
@@ -266,17 +266,17 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in
   if ( target == mFrame ) {
     int pos = 0;
 
-    if ( tqalignment & TQt::AlignTop )
+    if ( alignment & TQt::AlignTop )
       pos = 0;
 
-    if ( tqalignment & TQt::AlignLeft ) {
-      if ( tqalignment & TQt::AlignBottom )
+    if ( alignment & TQt::AlignLeft ) {
+      if ( alignment & TQt::AlignBottom )
         pos = mLeftColumnSummaries.count();
 
       mLeftColumn->insertWidget( pos, widget );
       mLeftColumnSummaries.insert( mLeftColumnSummaries.at( pos ), widgetName( widget ) );
     } else {
-      if ( tqalignment & TQt::AlignBottom )
+      if ( alignment & TQt::AlignBottom )
         pos = mRightColumnSummaries.count();
 
       mRightColumn->insertWidget( pos, widget );
@@ -288,7 +288,7 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in
 
   int targetPos = mLeftColumn->findWidget( target );
   if ( targetPos != -1 ) {
-    if ( tqalignment == TQt::AlignBottom )
+    if ( alignment == TQt::AlignBottom )
       targetPos++;
 
     mLeftColumn->insertWidget( targetPos, widget );
@@ -296,7 +296,7 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in
   } else {
     targetPos = mRightColumn->findWidget( target );
 
-    if ( tqalignment == TQt::AlignBottom )
+    if ( alignment == TQt::AlignBottom )
       targetPos++;
 
     mRightColumn->insertWidget( targetPos, widget );
@@ -317,7 +317,7 @@ void SummaryViewPart::slotAdjustPalette()
 void SummaryViewPart::setDate( const TQDate& newDate )
 {
   TQString date( "<b>%1</b>" );
-  date = date.tqarg( KGlobal::locale()->formatDate( newDate ) );
+  date = date.arg( KGlobal::locale()->formatDate( newDate ) );
   mDateLabel->setText( date );
 }
 
diff --git a/kontact/plugins/summary/summaryview_part.h b/kontact/plugins/summary/summaryview_part.h
index 5a99b947d..28a591dde 100644
--- a/kontact/plugins/summary/summaryview_part.h
+++ b/kontact/plugins/summary/summaryview_part.h
@@ -76,7 +76,7 @@ class SummaryViewPart : public KParts::ReadOnlyPart
   protected slots:
     void slotConfigure();
     void updateWidgets();
-    void summaryWidgetMoved( TQWidget *target, TQWidget *widget, int tqalignment );
+    void summaryWidgetMoved( TQWidget *target, TQWidget *widget, int alignment );
 
   private:
     void initGUI( Kontact::Core *core );
diff --git a/kontact/plugins/weather/summarywidget.cpp b/kontact/plugins/weather/summarywidget.cpp
index a0ff4341c..bf7624e4b 100644
--- a/kontact/plugins/weather/summarywidget.cpp
+++ b/kontact/plugins/weather/summarywidget.cpp
@@ -101,7 +101,7 @@ void SummaryWidget::updateView()
   for ( it = dataList.begin(); it != dataList.end(); ++it ) {
     TQString cover;
     for ( uint i = 0; i < (*it).cover().count(); ++i )
-      cover += TQString( "- %1\n" ).tqarg( (*it).cover()[ i ] );
+      cover += TQString( "- %1\n" ).arg( (*it).cover()[ i ] );
 
     TQImage img;
     img = (*it).icon();
@@ -121,7 +121,7 @@ void SummaryWidget::updateView()
               this, TQT_SLOT( showReport( const TQString& ) ) );
 
     TQLabel* label = new TQLabel( this );
-    label->setText( TQString( "%1 (%2)" ).tqarg( (*it).name() ).tqarg( (*it).temperature() ) );
+    label->setText( TQString( "%1 (%2)" ).arg( (*it).name() ).arg( (*it).temperature() ) );
     TQFont font = label->font();
     font.setBold( true );
     label->setFont( font );
@@ -133,12 +133,12 @@ void SummaryWidget::updateView()
     labelText = TQString( "<b>%1:</b> %2<br>"
                          "<b>%3:</b> %4<br>"
                          "<b>%5:</b> %6" )
-                         .tqarg( i18n( "Last updated on" ) )
-                         .tqarg( (*it).date() )
-                         .tqarg( i18n( "Wind Speed" ) )
-                         .tqarg( (*it).windSpeed() )
-                         .tqarg( i18n( "Rel. Humidity" ) )
-                         .tqarg( (*it).relativeHumidity() );
+                         .arg( i18n( "Last updated on" ) )
+                         .arg( (*it).date() )
+                         .arg( i18n( "Wind Speed" ) )
+                         .arg( (*it).windSpeed() )
+                         .arg( i18n( "Rel. Humidity" ) )
+                         .arg( (*it).relativeHumidity() );
 
     TQToolTip::add( label, labelText.replace( " ", "&nbsp;" ) );