1 files changed, 19 insertions, 19 deletions

diff --git a/certmanager/certificatewizardimpl.cpp b/certmanager/certificatewizardimpl.cpp
index e1d47f99..a52c2e52 100644
--- a/certmanager/certificatewizardimpl.cpp
+++ b/certmanager/certificatewizardimpl.cpp
@@ -112,7 +112,7 @@ static bool availForMod( const TQLineEdit * le ) {
  *  name 'name' and widget flags set to 'f'
  *
  *  The wizard will by default be modeless, unless you set 'modal' to
- *  TRUE to construct a modal wizard.
+ *  true to construct a modal wizard.
  */
 CertificateWizardImpl::CertificateWizardImpl( TQWidget* parent,  const char* name, bool modal, WFlags fl )
     : CertificateWizard( parent, name, modal, fl )
@@ -126,16 +126,16 @@ CertificateWizardImpl::CertificateWizardImpl( TQWidget* parent,  const char* nam
     // Allow to select remote URLs
     storeUR->setMode( KFile::File );
     storeUR->setFilter( "application/pkcs10" );
-    connect( storeUR, TQT_SIGNAL( urlSelected( const TQString& ) ),
-             this, TQT_SLOT( slotURLSelected( const TQString& ) ) );
+    connect( storeUR, TQ_SIGNAL( urlSelected( const TQString& ) ),
+             this, TQ_SLOT( slotURLSelected( const TQString& ) ) );
 
     const TDEConfigGroup config( TDEGlobal::config(), "CertificateCreationWizard" );
     caEmailED->setText( config.readEntry( "CAEmailAddress" ) );
 
-    connect( this, TQT_SIGNAL( helpClicked() ),
-	     this, TQT_SLOT( slotHelpClicked() ) );
-    connect( insertAddressButton, TQT_SIGNAL( clicked() ),
-	     this, TQT_SLOT( slotSetValuesFromWhoAmI() ) );
+    connect( this, TQ_SIGNAL( helpClicked() ),
+	     this, TQ_SLOT( slotHelpClicked() ) );
+    connect( insertAddressButton, TQ_SIGNAL( clicked() ),
+	     this, TQ_SLOT( slotSetValuesFromWhoAmI() ) );
 
     for ( unsigned int i = 0 ; i < numKeyLengths ; ++i )
       keyLengthCB->insertItem( i18n("%n bit", "%n bits", keyLengths[i] ) );
@@ -246,8 +246,8 @@ void CertificateWizardImpl::slotGenerateCertificate()
       Kleo::CryptoBackendFactory::instance()->smime()->keyGenerationJob();
     assert( job );
 
-    connect( job, TQT_SIGNAL(result(const GpgME::KeyGenerationResult&,const TQByteArray&)),
-	     TQT_SLOT(slotResult(const GpgME::KeyGenerationResult&,const TQByteArray&)) );
+    connect( job, TQ_SIGNAL(result(const GpgME::KeyGenerationResult&,const TQByteArray&)),
+	     TQ_SLOT(slotResult(const GpgME::KeyGenerationResult&,const TQByteArray&)) );
 
     certificateTE->setText( certParms );
 
@@ -290,7 +290,7 @@ void CertificateWizardImpl::slotResult( const GpgME::KeyGenerationResult & res,
 
 void CertificateWizardImpl::slotHelpClicked()
 {
-  kapp->invokeHelp( "newcert" );
+  tdeApp->invokeHelp( "newcert" );
 }
 
 void CertificateWizardImpl::slotSetValuesFromWhoAmI()
@@ -362,10 +362,10 @@ void CertificateWizardImpl::createPersonalDataPage()
     if ( config.entryIsImmutable( attr ) )
       le->setEnabled( false );
 
-    _attrPairList.append(tqMakePair(key, le));
+    _attrPairList.append(qMakePair(key, le));
 
-    connect( le, TQT_SIGNAL(textChanged(const TQString&)),
-	     TQT_SLOT(slotEnablePersonalDataPageExit()) );
+    connect( le, TQ_SIGNAL(textChanged(const TQString&)),
+	     TQ_SLOT(slotEnablePersonalDataPageExit()) );
   }
 
   // enable button only if administrator wants to allow it
@@ -441,16 +441,16 @@ void CertificateWizardImpl::sendCertificate( const TQString& email, const TQByte
   TQCString dummy;
   // OK, so kmail (or kontact) is running. Now ensure the object we want is available.
   // [that's not the case when kontact was already running, but kmail not loaded into it... in theory.]
-  if ( !kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) {
-    DCOPRef ref( dcopService, dcopService ); // talk to the KUniqueApplication or its kontact wrapper
+  if ( !tdeApp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) {
+    DCOPRef ref( dcopService, dcopService ); // talk to the TDEUniqueApplication or its kontact wrapper
     DCOPReply reply = ref.call( "load()" );
     if ( reply.isValid() && (bool)reply ) {
-      Q_ASSERT( kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) );
+      Q_ASSERT( tdeApp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) );
     } else
       kdWarning() << "Error loading " << dcopService << endl;
   }
 
-  DCOPClient* dcopClient = kapp->dcopClient();
+  DCOPClient* dcopClient = tdeApp->dcopClient();
   TQByteArray data;
   TQDataStream arg( data, IO_WriteOnly );
   arg << email;
@@ -490,8 +490,8 @@ void CertificateWizardImpl::accept()
 
     TDEIO::Job* uploadJob = TDEIOext::put( _keyData, url, -1, overwrite, false /*resume*/ );
     uploadJob->setWindow( this );
-    connect( uploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
-             this, TQT_SLOT( slotUploadResult( TDEIO::Job* ) ) );
+    connect( uploadJob, TQ_SIGNAL( result( TDEIO::Job* ) ),
+             this, TQ_SLOT( slotUploadResult( TDEIO::Job* ) ) );
     // Can't press finish again during the upload
     setFinishEnabled( finishPage, false );
   }