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

1 files changed, 31 insertions, 31 deletions

diff --git a/libkpgp/kpgpui.cpp b/libkpgp/kpgpui.cpp
index c9288b01b..ea1262515 100644
--- a/libkpgp/kpgpui.cpp
+++ b/libkpgp/kpgpui.cpp
@@ -24,10 +24,10 @@
 #include <tqwhatsthis.h>
 #include <tqtooltip.h>
 #include <tqapplication.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqdatetime.h>
 #include <tqpixmap.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtimer.h>
 #include <tqpopupmenu.h>
 #include <tqregexp.h>
@@ -76,7 +76,7 @@ PassphraseDialog::PassphraseDialog( TQWidget *parent,
   if (keyID.isNull())
     label = new TQLabel(i18n("Please enter your OpenPGP passphrase:"),rightArea);
   else
-    label = new TQLabel(i18n("Please enter the OpenPGP passphrase for\n\"%1\":").tqarg(keyID),
+    label = new TQLabel(i18n("Please enter the OpenPGP passphrase for\n\"%1\":").arg(keyID),
                        rightArea);
   lineedit = new KPasswordEdit( rightArea );
   lineedit->setEchoMode(TQLineEdit::Password);
@@ -115,7 +115,7 @@ Config::Config( TQWidget *parent, const char *name, bool encrypt )
   TQVBoxLayout *topLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
 
   group = new TQVGroupBox( i18n("Warning"), this );
-  group->tqlayout()->setSpacing( KDialog::spacingHint() );
+  group->layout()->setSpacing( KDialog::spacingHint() );
   // (mmutz) work around TQt label bug in 3.0.0 (and possibly later):
   // 1. Don't use rich text: No <qt><b>...</b></qt>
   label = new TQLabel( i18n("Please check if encryption really "
@@ -126,13 +126,13 @@ Config::Config( TQWidget *parent, const char *name, bool encrypt )
   labelFont.setBold( true );
   label->setFont( labelFont );
   // 3. and activate wordwarp:
-  label->tqsetAlignment( AlignLeft|WordBreak );
+  label->setAlignment( AlignLeft|WordBreak );
   // end; to remove the workaround, add <qt><b>..</b></qt> around the
-  // text and remove lines TQFont... -> label->tqsetAlignment(...).
+  // text and remove lines TQFont... -> label->setAlignment(...).
   topLayout->addWidget( group );
 
   group = new TQVGroupBox( i18n("Encryption Tool"), this );
-  group->tqlayout()->setSpacing( KDialog::spacingHint() );
+  group->layout()->setSpacing( KDialog::spacingHint() );
 
   TQHBox * hbox = new TQHBox( group );
   label = new TQLabel( i18n("Select encryption tool to &use:"), hbox );
@@ -153,7 +153,7 @@ Config::Config( TQWidget *parent, const char *name, bool encrypt )
   topLayout->addWidget( group );
 
   mpOptionsGroupBox = new TQVGroupBox( i18n("Options"), this );
-  mpOptionsGroupBox->tqlayout()->setSpacing( KDialog::spacingHint() );
+  mpOptionsGroupBox->layout()->setSpacing( KDialog::spacingHint() );
   storePass = new TQCheckBox( i18n("&Keep passphrase in memory"),
                              mpOptionsGroupBox );
   connect( storePass, TQT_SIGNAL( toggled( bool ) ),
@@ -461,7 +461,7 @@ void KeySelectionDialog::initKeylist( const KeyList& keyList,
 
     childItem = new TQListViewItem( primaryUserID, "",
                                    i18n( "Fingerprint: %1" )
-                                   .tqarg( beautifyFingerprint( (*it)->primaryFingerprint() ) ) );
+                                   .arg( beautifyFingerprint( (*it)->primaryFingerprint() ) ) );
     if( primaryUserID->isSelected() && mListView->isMultiSelection() ) {
       mListView->setSelected( childItem, true );
     }
@@ -543,15 +543,15 @@ TQString KeySelectionDialog::keyInfo( const Kpgp::Key *key ) const
   if( remark.isEmpty() ) {
     return " " + i18n("creation date and status of an OpenPGP key",
                       "Creation date: %1, Status: %2")
-                     .tqarg( KGlobal::locale()->formatDate( dt.date(), true ) )
-                     .tqarg( status );
+                     .arg( KGlobal::locale()->formatDate( dt.date(), true ) )
+                     .arg( status );
   }
   else {
     return " " + i18n("creation date, status and remark of an OpenPGP key",
                       "Creation date: %1, Status: %2 (%3)")
-                     .tqarg( KGlobal::locale()->formatDate( dt.date(), true ) )
-                     .tqarg( status )
-                     .tqarg( remark );
+                     .arg( KGlobal::locale()->formatDate( dt.date(), true ) )
+                     .arg( status )
+                     .arg( remark );
   }
 }
 
@@ -1014,7 +1014,7 @@ bool KeySelectionDialog::checkKeys( const TQValueList<TQListViewItem*>& keys ) c
        ++it ) {
     kdDebug(5100) << "Checking key 0x" << getKeyId( *it ) << "...\n";
     pProgressDlg->setLabel( i18n("Checking key 0x%1...")
-                            .tqarg( TQString( getKeyId( *it ) ) ) );
+                            .arg( TQString( getKeyId( *it ) ) ) );
     kapp->processEvents();
     keysAllowed = keysAllowed && ( -1 != keyAdmissibility( *it, AllowExpensiveTrustCheck ) );
     pProgressDlg->progressBar()->advance( 1 );
@@ -1176,7 +1176,7 @@ KeyRequester::KeyRequester( TQWidget * parent, bool multipleKeys,
   // the button to unset any key:
   mEraseButton = new TQPushButton( this );
   mEraseButton->setAutoDefault( false );
-  mEraseButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum,
+  mEraseButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum,
 					    TQSizePolicy::Minimum ) );
   mEraseButton->setPixmap( SmallIcon( "clear_left" ) );
   TQToolTip::add( mEraseButton, i18n("Clear") );
@@ -1192,7 +1192,7 @@ KeyRequester::KeyRequester( TQWidget * parent, bool multipleKeys,
   connect( mEraseButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEraseButtonClicked()) );
   connect( mDialogButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDialogButtonClicked()) );
 
-  tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
+  setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
 			      TQSizePolicy::Fixed ) );
 }
 
@@ -1480,21 +1480,21 @@ KeyApprovalDialog::KeyApprovalDialog( const TQStringList& addresses,
   // calculate the optimal width for the dialog
   int dialogWidth = marginHint()
                   + sv->frameWidth()
-                  + bigvbox->tqsizeHint().width()
-                  + sv->verticalScrollBar()->tqsizeHint().width()
+                  + bigvbox->sizeHint().width()
+                  + sv->verticalScrollBar()->sizeHint().width()
                   + sv->frameWidth()
                   + marginHint()
                   + 2;
   // calculate the optimal height for the dialog
   int dialogHeight = marginHint()
-                   + label->tqsizeHint().height()
+                   + label->sizeHint().height()
                    + topLayout->spacing()
                    + sv->frameWidth()
-                   + bigvbox->tqsizeHint().height()
-                   + sv->horizontalScrollBar()->tqsizeHint().height()
+                   + bigvbox->sizeHint().height()
+                   + sv->horizontalScrollBar()->sizeHint().height()
                    + sv->frameWidth()
                    + topLayout->spacing()
-                   + actionButton( KDialogBase::Cancel )->tqsizeHint().height()
+                   + actionButton( KDialogBase::Cancel )->sizeHint().height()
                    + marginHint()
                    + 2;
   // don't make the dialog too large
@@ -1543,7 +1543,7 @@ KeyApprovalDialog::slotChangeEncryptionKey( int nr )
                                          "Select the key(s) which should "
                                          "be used to encrypt the message "
                                          "for\n%1")
-                                    .tqarg( mAddressLabels[nr-1]->text() ),
+                                    .arg( mAddressLabels[nr-1]->text() ),
                                     keyIds,
                                     mAddressLabels[nr-1]->text(),
                                     mAllowedKeys );
@@ -1630,26 +1630,26 @@ CipherTextDialog::CipherTextDialog( const TQCString & text,
   mEditBox->setReadOnly(true);
   topLayout->addWidget( mEditBox, 10 );
 
-  TQString tqunicodeText;
+  TQString unicodeText;
   if (charset.isEmpty())
-    tqunicodeText = TQString::fromLocal8Bit(text.data());
+    unicodeText = TQString::fromLocal8Bit(text.data());
   else {
     bool ok=true;
     TQTextCodec *codec = KGlobal::charsets()->codecForName(charset, ok);
     if(!ok)
-      tqunicodeText = TQString::fromLocal8Bit(text.data());
+      unicodeText = TQString::fromLocal8Bit(text.data());
     else
-      tqunicodeText = codec->toUnicode(text.data(), text.length());
+      unicodeText = codec->toUnicode(text.data(), text.length());
   }
 
-  mEditBox->setText(tqunicodeText);
+  mEditBox->setText(unicodeText);
 
   setMinimumSize();
 }
 
 void CipherTextDialog::setMinimumSize()
 {
-  // this seems to force a tqlayout of the entire document, so we get a
+  // this seems to force a layout of the entire document, so we get a
   // a proper contentsWidth(). Is there a better way?
   for ( int i = 0; i < mEditBox->paragraphs(); i++ )
       (void) mEditBox->paragraphRect( i );
@@ -1670,7 +1670,7 @@ void CipherTextDialog::setMinimumSize()
       gc.readBoolEntry("XineramaPlacementEnabled", true)) {
     maxWidth = TQApplication::desktop()->screenGeometry(TQApplication::desktop()->screenNumber(parentWidget())).width()-100;
   } else {
-    maxWidth = TQApplication::desktop()->tqgeometry().width()-100;
+    maxWidth = TQApplication::desktop()->geometry().width()-100;
   }
 #endif