Remove additional unneeded tq method conversions

10 files changed, 38 insertions, 38 deletions

diff --git a/certmanager/lib/ui/backendconfigwidget.cpp b/certmanager/lib/ui/backendconfigwidget.cpp
index 1207ed0f0..33582e290 100644
--- a/certmanager/lib/ui/backendconfigwidget.cpp
+++ b/certmanager/lib/ui/backendconfigwidget.cpp
@@ -150,7 +150,7 @@ private:
     // second one is implementation name (gpg, gpgsm...)
     const TQString impName = protocol ? protocol->displayName() : i18n( "failed" );
     return i18n( "Items in Kleo::BackendConfigWidget listview (1: protocol; 2: implementation name)",
-                 "%1 (%2)" ).tqarg( protoName, impName );
+                 "%1 (%2)" ).arg( protoName, impName );
   }
 
   const CryptoBackend::Protocol* mProtocol; // can be 0
diff --git a/certmanager/lib/ui/cryptoconfigmodule.cpp b/certmanager/lib/ui/cryptoconfigmodule.cpp
index c7604e84e..d1f6f0aca 100644
--- a/certmanager/lib/ui/cryptoconfigmodule.cpp
+++ b/certmanager/lib/ui/cryptoconfigmodule.cpp
@@ -134,7 +134,7 @@ Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidg
                                "properly. It did not return any components. "
                                "Try running \"%1\" on the command line for more "
                                "information.")
-          .tqarg( components.empty() ? "gpgconf --list-components" : "gpgconf --list-options gpg" );
+          .arg( components.empty() ? "gpgconf --list-components" : "gpgconf --list-options gpg" );
       TQLabel * label = new TQLabel( msg, vbox );
       label->setAlignment( TQt::WordBreak );
       label->setMinimumHeight( fontMetrics().lineSpacing() * 5 );
@@ -356,7 +356,7 @@ TQString Kleo::CryptoConfigEntryGUI::description() const
 {
   TQString descr = mEntry->description();
   if ( descr.isEmpty() ) // shouldn't happen
-    descr = TQString( "<%1>" ).tqarg( mName );
+    descr = TQString( "<%1>" ).arg( mName );
   return descr;
 }
 
diff --git a/certmanager/lib/ui/kdhorizontalline.cpp b/certmanager/lib/ui/kdhorizontalline.cpp
index 07dc7ef89..c901a2fd1 100644
--- a/certmanager/lib/ui/kdhorizontalline.cpp
+++ b/certmanager/lib/ui/kdhorizontalline.cpp
@@ -134,11 +134,11 @@ void KDHorizontalLine::paintEvent( TQPaintEvent * e ) {
     const int h = fm.height();
     const int tw = fm.width( mTitle, mLenVisible ) + fm.width(TQChar(' '));
     int x;
-    if ( mAlign & AlignHCenter )		// center tqalignment
+    if ( mAlign & AlignHCenter )		// center alignment
       x = frameRect().width()/2 - tw/2;
-    else if ( mAlign & AlignRight )	// right tqalignment
+    else if ( mAlign & AlignRight )	// right alignment
       x = frameRect().width() - tw;
-    else if ( mAlign & AlignLeft )       // left tqalignment
+    else if ( mAlign & AlignLeft )       // left alignment
       x = 0;
     else { // auto align
       if( TQApplication::reverseLayout() )
diff --git a/certmanager/lib/ui/kdhorizontalline.h b/certmanager/lib/ui/kdhorizontalline.h
index c62a18ddf..530b89081 100644
--- a/certmanager/lib/ui/kdhorizontalline.h
+++ b/certmanager/lib/ui/kdhorizontalline.h
@@ -55,7 +55,7 @@ public:
 
   TQString title() const { return mTitle; }
 
-  /*! \reimp to hard-code the frame tqshape */
+  /*! \reimp to hard-code the frame shape */
   void setFrameStyle( int style );
 
   TQSize sizeHint() const;
diff --git a/certmanager/lib/ui/keylistview.cpp b/certmanager/lib/ui/keylistview.cpp
index 075833b21..100334f20 100644
--- a/certmanager/lib/ui/keylistview.cpp
+++ b/certmanager/lib/ui/keylistview.cpp
@@ -173,7 +173,7 @@ Kleo::KeyListView::KeyListView( const ColumnStrategy * columnStrategy, const Dis
 
 Kleo::KeyListView::~KeyListView() {
   d->updateTimer->stop();
-  // need to clear here, since in ~TQListView, our tqchildren won't have
+  // need to clear here, since in ~TQListView, our children won't have
   // a valid listView() pointing to us anymore, and their dtors try to
   // unregister from us.
   clear();
@@ -395,7 +395,7 @@ Kleo::KeyListViewItem::KeyListViewItem( KeyListViewItem * parent, KeyListViewIte
 }
 
 Kleo::KeyListViewItem::~KeyListViewItem() {
-  // delete the tqchildren first... When tqchildren are deleted in the
+  // delete the children first... When children are deleted in the
   // TQLVI dtor, they don't have listView() anymore, thus they don't
   // call deregister( this ), leading to stale entries in the
   // itemMap...
@@ -428,7 +428,7 @@ void Kleo::KeyListViewItem::setKey( const GpgME::Key & key ) {
     if ( const TQPixmap * pix = cs->pixmap( key, i ) )
       setPixmap( i, *pix );
   }
-  tqrepaint();
+  repaint();
 }
 
 TQString Kleo::KeyListViewItem::toolTip( int col ) const {
@@ -444,10 +444,10 @@ int Kleo::KeyListViewItem::compare( TQListViewItem * item, int col, bool ascendi
   return listView()->columnStrategy()->compare( this->key(), that->key(), col );
 }
 
-void Kleo::KeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) {
+void Kleo::KeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) {
   const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ;
   if ( !ds ) {
-    TQListViewItem::paintCell( p, cg, column, width, tqalignment );
+    TQListViewItem::paintCell( p, cg, column, width, alignment );
     return;
   }
   const TQColor fg = ds->keyForeground( key(), cg.text() );
@@ -459,7 +459,7 @@ void Kleo::KeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, i
   _cg.setColor( TQColorGroup::Text, fg );
   _cg.setColor( TQColorGroup::Base, bg );
 
-  TQListViewItem::paintCell( p, _cg, column, width, tqalignment );
+  TQListViewItem::paintCell( p, _cg, column, width, alignment );
 }
 
 void Kleo::KeyListViewItem::insertItem( TQListViewItem * qlvi ) {
@@ -536,10 +536,10 @@ int Kleo::SubkeyKeyListViewItem::compare( TQListViewItem * item, int col, bool a
   return listView()->columnStrategy()->subkeyCompare( this->subkey(), that->subkey(), col );
 }
 
-void Kleo::SubkeyKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) {
+void Kleo::SubkeyKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) {
   const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ;
   if ( !ds ) {
-    TQListViewItem::paintCell( p, cg, column, width, tqalignment );
+    TQListViewItem::paintCell( p, cg, column, width, alignment );
     return;
   }
   const TQColor fg = ds->subkeyForeground( subkey(), cg.text() );
@@ -551,7 +551,7 @@ void Kleo::SubkeyKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup &
   _cg.setColor( TQColorGroup::Text, fg );
   _cg.setColor( TQColorGroup::Base, bg );
 
-  TQListViewItem::paintCell( p, _cg, column, width, tqalignment );
+  TQListViewItem::paintCell( p, _cg, column, width, alignment );
 }
 
 
@@ -615,10 +615,10 @@ int Kleo::UserIDKeyListViewItem::compare( TQListViewItem * item, int col, bool a
 }
 
 
-void Kleo::UserIDKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) {
+void Kleo::UserIDKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) {
   const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ;
   if ( !ds ) {
-    TQListViewItem::paintCell( p, cg, column, width, tqalignment );
+    TQListViewItem::paintCell( p, cg, column, width, alignment );
     return;
   }
   const TQColor fg = ds->useridForeground( userID(), cg.text() );
@@ -630,7 +630,7 @@ void Kleo::UserIDKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup &
   _cg.setColor( TQColorGroup::Text, fg );
   _cg.setColor( TQColorGroup::Base, bg );
 
-  TQListViewItem::paintCell( p, _cg, column, width, tqalignment );
+  TQListViewItem::paintCell( p, _cg, column, width, alignment );
 }
 
 
@@ -693,10 +693,10 @@ int Kleo::SignatureKeyListViewItem::compare( TQListViewItem * item, int col, boo
   return listView()->columnStrategy()->signatureCompare( this->signature(), that->signature(), col );
 }
 
-void Kleo::SignatureKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) {
+void Kleo::SignatureKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) {
   const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ;
   if ( !ds ) {
-    TQListViewItem::paintCell( p, cg, column, width, tqalignment );
+    TQListViewItem::paintCell( p, cg, column, width, alignment );
     return;
   }
   const TQColor fg = ds->signatureForeground( signature(), cg.text() );
@@ -708,7 +708,7 @@ void Kleo::SignatureKeyListViewItem::paintCell( TQPainter * p, const TQColorGrou
   _cg.setColor( TQColorGroup::Text, fg );
   _cg.setColor( TQColorGroup::Base, bg );
 
-  TQListViewItem::paintCell( p, _cg, column, width, tqalignment );
+  TQListViewItem::paintCell( p, _cg, column, width, alignment );
 }
 
 
diff --git a/certmanager/lib/ui/keylistview.h b/certmanager/lib/ui/keylistview.h
index 38ad0f5ab..ada8354e2 100644
--- a/certmanager/lib/ui/keylistview.h
+++ b/certmanager/lib/ui/keylistview.h
@@ -91,7 +91,7 @@ namespace Kleo {
     /*! \reimp */
     int rtti() const { return RTTI; }
     /*! \reimp */
-    void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment );
+    void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment );
     /*! \reimp */
     void insertItem( TQListViewItem * item );
     /*! \reimp */
@@ -127,7 +127,7 @@ namespace Kleo {
     /*! \reimp */
     int rtti() const { return RTTI; }
     /*! \reimp */
-    void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment );
+    void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment );
 
   private:
     GpgME::Subkey mSubkey;
@@ -159,7 +159,7 @@ namespace Kleo {
     /*! \reimp */
     int rtti() const { return RTTI; }
     /*! \reimp */
-    void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment );
+    void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment );
 
   private:
     GpgME::UserID mUserID;
@@ -191,7 +191,7 @@ namespace Kleo {
     /*! \reimp */
     int rtti() const { return RTTI; }
     /*! \reimp */
-    void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment );
+    void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment );
 
   private:
     GpgME::UserID::Signature mSignature;
diff --git a/certmanager/lib/ui/keyrequester.cpp b/certmanager/lib/ui/keyrequester.cpp
index 3c1e264cd..c3bcf0244 100644
--- a/certmanager/lib/ui/keyrequester.cpp
+++ b/certmanager/lib/ui/keyrequester.cpp
@@ -231,7 +231,7 @@ static void showKeyListError( TQWidget * parent, const GpgME::Error & err ) {
   const TQString msg = i18n( "<qt><p>An error occurred while fetching "
 			    "the keys from the backend:</p>"
 			    "<p><b>%1</b></p></qt>" )
-    .tqarg( TQString::fromLocal8Bit( err.asString() ) );
+    .arg( TQString::fromLocal8Bit( err.asString() ) );
 
   KMessageBox::error( parent, msg, i18n( "Key Listing Failed" ) );
 }
diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp
index b05d9ea28..d88d80b3f 100644
--- a/certmanager/lib/ui/keyselectiondialog.cpp
+++ b/certmanager/lib/ui/keyselectiondialog.cpp
@@ -248,7 +248,7 @@ namespace {
 		   "Created: %2\n"
 		   "Expiry: %3\n"
 		   "Fingerprint: %4" )
-	.tqarg( uid ? TQString::fromUtf8( uid ) : i18n("unknown"),
+	.arg( uid ? TQString::fromUtf8( uid ) : i18n("unknown"),
 	      creation, expiry,
 	      fpr ? TQString::fromLatin1( fpr ) : i18n("unknown") );
     else
@@ -257,10 +257,10 @@ namespace {
 		   "Expiry: %3\n"
 		   "Fingerprint: %4\n"
 		   "Issuer: %5" )
-	.tqarg( uid ? Kleo::DN( uid ).prettyDN() : i18n("unknown"),
+	.arg( uid ? Kleo::DN( uid ).prettyDN() : i18n("unknown"),
 	      creation, expiry,
 	      fpr ? TQString::fromLatin1( fpr ) : i18n("unknown") )
-	.tqarg( issuer ? Kleo::DN( issuer ).prettyDN() : i18n("unknown") );
+	.arg( issuer ? Kleo::DN( issuer ).prettyDN() : i18n("unknown") );
   }
 
   const TQPixmap * ColumnStrategy::pixmap( const GpgME::Key & key, int col ) const {
@@ -374,11 +374,11 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection
       KActiveLabel *textLabel = new KActiveLabel( text, page );
       disconnect( textLabel, TQT_SIGNAL(linkClicked(const TQString&)), textLabel, TQT_SLOT(openLink(const TQString&)) );
       connect( textLabel, TQT_SIGNAL(linkClicked(const TQString&)), TQT_SLOT(slotStartCertificateManager(const TQString&)) );
-      textLabel->setAlignment( textLabel->tqalignment() | TQt::WordBreak );
+      textLabel->setAlignment( textLabel->alignment() | TQt::WordBreak );
       mTopLayout->addWidget( textLabel );
     } else {
       KActiveLabel *textLabel = new KActiveLabel( text, page );
-      textLabel->setAlignment( textLabel->tqalignment() | TQt::WordBreak );
+      textLabel->setAlignment( textLabel->alignment() | TQt::WordBreak );
       mTopLayout->addWidget( textLabel );
     }
   }
@@ -567,7 +567,7 @@ static void showKeyListError( TQWidget * parent, const GpgME::Error & err ) {
   const TQString msg = i18n( "<qt><p>An error occurred while fetching "
 			    "the keys from the backend:</p>"
 			    "<p><b>%1</b></p></qt>" )
-    .tqarg( TQString::fromLocal8Bit( err.asString() ) );
+    .arg( TQString::fromLocal8Bit( err.asString() ) );
 
   KMessageBox::error( parent, msg, i18n( "Key Listing Failed" ) );
 }
diff --git a/certmanager/lib/ui/messagebox.cpp b/certmanager/lib/ui/messagebox.cpp
index 2dfe083d5..5917fdee8 100644
--- a/certmanager/lib/ui/messagebox.cpp
+++ b/certmanager/lib/ui/messagebox.cpp
@@ -127,7 +127,7 @@ private:
 
         if ( const int err = file.status() )
             KMessageBox::error( this, i18n("Couldn't save to file \"%1\": %2")
-                                .tqarg( file.name(), TQString::fromLocal8Bit( strerror( err ) ) ),
+                                .arg( file.name(), TQString::fromLocal8Bit( strerror( err ) ) ),
                                 i18n("File Save Error") );
     }
     void slotUser2() {
@@ -159,7 +159,7 @@ void MessageBox::auditLog( TQWidget * parent, const Job * job, const TQString &
 
     if ( err.code() != GPG_ERR_NO_DATA ) {
         KMessageBox::information( parent, i18n("An error occurred while trying to retrieve the GnuPG Audit Log:\n%1")
-                                  .tqarg( TQString::fromLocal8Bit( err.asString() ) ),
+                                  .arg( TQString::fromLocal8Bit( err.asString() ) ),
                                   i18n("GnuPG Audit Log Error") );
         return;
     }
@@ -194,7 +194,7 @@ void MessageBox::auditLog( TQWidget * parent, const TQString & log ) {
 
 static TQString to_information_string( const SigningResult & result ) {
     return result.error()
-        ? i18n("Signing failed: %1").tqarg( TQString::fromLocal8Bit( result.error().asString() ) )
+        ? i18n("Signing failed: %1").arg( TQString::fromLocal8Bit( result.error().asString() ) )
         : i18n("Signing successful") ;
 }
 
@@ -204,7 +204,7 @@ static TQString to_error_string( const SigningResult & result ) {
 
 static TQString to_information_string( const EncryptionResult & result ) {
     return result.error()
-        ? i18n("Encryption failed: %1").tqarg( TQString::fromLocal8Bit( result.error().asString() ) )
+        ? i18n("Encryption failed: %1").arg( TQString::fromLocal8Bit( result.error().asString() ) )
         : i18n("Encryption successful") ;
 }
 
diff --git a/certmanager/lib/ui/progressdialog.cpp b/certmanager/lib/ui/progressdialog.cpp
index e0149b8f3..d6552922c 100644
--- a/certmanager/lib/ui/progressdialog.cpp
+++ b/certmanager/lib/ui/progressdialog.cpp
@@ -83,7 +83,7 @@ void Kleo::ProgressDialog::slotProgress( const TQString & what, int current, int
   else if ( what.isEmpty() )
     setLabelText( mBaseText );
   else
-    setLabelText( i18n( "%1: %2" ).tqarg( mBaseText, what ) );
+    setLabelText( i18n( "%1: %2" ).arg( mBaseText, what ) );
   setProgress( current, total );
 }