Rename old tq methods that no longer need a unique name

26 files changed, 100 insertions, 100 deletions

diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
index f27dad3b6..472f7e642 100644
--- a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
+++ b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
@@ -224,9 +224,9 @@ namespace {
         return TQVariant( data.defaults.boolean.value, int() );
     case ArgType_String:
       if ( isList() )
-        return TQStringList( TQString::tqfromLatin1( data.defaults.string ) );
+        return TQStringList( TQString::fromLatin1( data.defaults.string ) );
       else
-        return TQString::tqfromLatin1( data.defaults.string );
+        return TQString::fromLatin1( data.defaults.string );
     case ArgType_Int:
       if ( isList() )
         return TQValueList<TQVariant>() << data.defaults.integer;
@@ -240,15 +240,15 @@ namespace {
     case ArgType_Path:
     case ArgType_DirPath:
       if ( isList() )
-        return TQValueList<TQVariant>() << TQString::tqfromLatin1( data.defaults.path );
+        return TQValueList<TQVariant>() << TQString::fromLatin1( data.defaults.path );
       else
-        return TQString::tqfromLatin1( data.defaults.path );
+        return TQString::fromLatin1( data.defaults.path );
     case ArgType_URL:
     case ArgType_LDAPURL:
       if ( isList() )
-        return TQValueList<TQVariant>() << TQString::tqfromLatin1( data.defaults.url );
+        return TQValueList<TQVariant>() << TQString::fromLatin1( data.defaults.url );
       else
-        return TQString::tqfromLatin1( data.defaults.url );
+        return TQString::fromLatin1( data.defaults.url );
     }
   }
 
diff --git a/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp b/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp
index ab413080c..57811c6e5 100644
--- a/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp
+++ b/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp
@@ -113,7 +113,7 @@ int Kleo::GnuPGProcessBase::commSetupDoneP() {
   if ( d->useStatusFD ) {
     ::close( d->statusFD[1] ); // close the input end of the pipe, we're the reader
     d->statnot = new TQSocketNotifier( d->statusFD[0], TQSocketNotifier::Read, this );
-    connect( d->statnot, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChildtqStatus(int)) );
+    connect( d->statnot, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChildStatus(int)) );
   }
   return KProcess::commSetupDoneP();
 }
@@ -124,12 +124,12 @@ int Kleo::GnuPGProcessBase::commSetupDoneC() {
   return KProcess::commSetupDoneC();
 }
 
-void Kleo::GnuPGProcessBase::slotChildtqStatus( int fd ) {
-  if ( !childtqStatus(fd) )
-    closetqStatus();
+void Kleo::GnuPGProcessBase::slotChildStatus( int fd ) {
+  if ( !childStatus(fd) )
+    closeStatus();
 }
 
-bool Kleo::GnuPGProcessBase::closetqStatus() {
+bool Kleo::GnuPGProcessBase::closeStatus() {
   if ( !d->useStatusFD )
     return false;
   d->useStatusFD = false;
@@ -138,7 +138,7 @@ bool Kleo::GnuPGProcessBase::closetqStatus() {
   return true;
 }
 
-int Kleo::GnuPGProcessBase::childtqStatus( int fd ) {
+int Kleo::GnuPGProcessBase::childStatus( int fd ) {
   char buf[1024];
   const int len = ::read( fd, buf, sizeof(buf)-1 );
   if ( len > 0 ) {
diff --git a/certmanager/lib/backends/qgpgme/gnupgprocessbase.h b/certmanager/lib/backends/qgpgme/gnupgprocessbase.h
index b6643144a..c012b3075 100644
--- a/certmanager/lib/backends/qgpgme/gnupgprocessbase.h
+++ b/certmanager/lib/backends/qgpgme/gnupgprocessbase.h
@@ -57,7 +57,7 @@ namespace Kleo {
     /*! reimplementation */
     bool start( RunMode runmode, Communication comm );
 
-    bool closetqStatus();
+    bool closeStatus();
 
   signals:
     void status( Kleo::GnuPGProcessBase * proc, const TQString & type, const TQStringList & args );
@@ -70,11 +70,11 @@ namespace Kleo {
     /*! reimplementation */
     int commSetupDoneC();
 
-    int childtqStatus( int fd );
+    int childStatus( int fd );
 
 
   private slots:
-    void slotChildtqStatus( int fd );
+    void slotChildStatus( int fd );
 
   private:
     void parseStatusOutput();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
index 51f8f68c8..c2493ebe4 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
@@ -809,7 +809,7 @@ TQString QGpgMECryptoConfigEntry::toString( bool escape ) const
   if ( !isList() ) // non-list non-string
   {
     if ( mArgType == ArgType_None ) {
-      return mValue.toBool() ? TQString::tqfromLatin1( "1" ) : TQString();
+      return mValue.toBool() ? TQString::fromLatin1( "1" ) : TQString();
     } else { // some int
       Q_ASSERT( mArgType == ArgType_Int || mArgType == ArgType_UInt );
       return mValue.toString(); // int to string conversion
diff --git a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
index de673faf1..95789725d 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
@@ -114,7 +114,7 @@ static const Map & makeMap() { // return a reference to a static to avoid copyin
   static Map map;
   for ( unsigned int i = 0 ; i < sizeof tokens / sizeof *tokens ; ++i ) {
     assert( tokens[i].token );
-    const TQString token = TQString::tqfromLatin1( tokens[i].token ).lower();
+    const TQString token = TQString::fromLatin1( tokens[i].token ).lower();
     for ( unsigned int j = 0 ; j < tokens[i].numDesc ; ++j ) {
       const Desc & desc = tokens[i].desc[j];
       assert( desc.display );
diff --git a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp
index fdcdadbae..781e0513f 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp
@@ -112,7 +112,7 @@ GpgME::Error Kleo::QGpgMERefreshKeysJob::startAProcess() {
   connect( mProcess, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),
 	   TQT_SLOT(slotStderr(KProcess*,char*,int)) );
   connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)),
-	   TQT_SLOT(slotqStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
+	   TQT_SLOT(sloStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
 
   if ( !mProcess->start( KProcess::NotifyOnExit, KProcess::Stderr ) ) {
     mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ); // what else?
@@ -129,7 +129,7 @@ void Kleo::QGpgMERefreshKeysJob::slotCancel() {
   mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_CANCELED );
 }
 
-void Kleo::QGpgMERefreshKeysJob::slotqStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) {
+void Kleo::QGpgMERefreshKeysJob::sloStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) {
   if ( proc != mProcess )
     return;
   TQStringList::const_iterator it = args.begin();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h
index f94957b3f..be4c9f796 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h
@@ -63,7 +63,7 @@ namespace Kleo {
     /*! \reimp from Job */
     void slotCancel();
 
-    void slotqStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
+    void sloStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
     void slotStderr( KProcess *, char *, int );
     void slotProcessExited( KProcess * );
 
diff --git a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
index e4875824c..8f2fd20d2 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
@@ -95,7 +95,7 @@ GpgME::Error Kleo::QGpgMESecretKeyExportJob::start( const TQStringList & pattern
   connect( mProcess, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),
 	   TQT_SLOT(slotStderr(KProcess*,char*,int)) );
   connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)),
-	   TQT_SLOT(slotqStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
+	   TQT_SLOT(sloStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
 
   if ( !mProcess->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) {
     mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ); // what else?
@@ -112,7 +112,7 @@ void Kleo::QGpgMESecretKeyExportJob::slotCancel() {
   mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_CANCELED );
 }
 
-void Kleo::QGpgMESecretKeyExportJob::slotqStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) {
+void Kleo::QGpgMESecretKeyExportJob::sloStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) {
   if ( proc != mProcess )
     return;
   TQStringList::const_iterator it = args.begin();
diff --git a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h
index aae3fd222..0c775a015 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h
@@ -68,7 +68,7 @@ namespace Kleo {
     /*! \reimp from Job */
     void slotCancel();
 
-    void slotqStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
+    void sloStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
     void slotStdout( KProcess *, char *, int );
     void slotStderr( KProcess *, char *, int );
     void slotProcessExited( KProcess * );
diff --git a/certmanager/lib/cryptplug.cpp b/certmanager/lib/cryptplug.cpp
index 53865edf4..77a914514 100644
--- a/certmanager/lib/cryptplug.cpp
+++ b/certmanager/lib/cryptplug.cpp
@@ -789,7 +789,7 @@ sig_status_to_string( gpgme_sig_stat_t status )
 // gpgme 0.3 version below, too!
 static
 void obtain_signature_information( gpgme_ctx_t ctx,
-                                   gpgme_sig_stat_t & overalltqStatus,
+                                   gpgme_sig_stat_t & overallStatus,
                                    struct CryptPlug::SignatureMetaData* sigmeta,
                                    char** attrOrder,
                                    const char* unknownAttrsHandling,
@@ -952,11 +952,11 @@ void obtain_signature_information( gpgme_ctx_t ctx,
     storeNewCharPtr( &this_info.status_text, sig_status );
   }
   sigmeta->extended_info_count = sig_idx;
-  overalltqStatus = intersect_stati( result->signatures );
-  sigmeta->status_code = overalltqStatus;
-  storeNewCharPtr( &sigmeta->status, sig_status_to_string( overalltqStatus ) );
+  overallStatus = intersect_stati( result->signatures );
+  sigmeta->status_code = overallStatus;
+  storeNewCharPtr( &sigmeta->status, sig_status_to_string( overallStatus ) );
   if ( signatureFound )
-    *signatureFound = ( overalltqStatus != GPGME_SIG_STAT_NONE );
+    *signatureFound = ( overallStatus != GPGME_SIG_STAT_NONE );
 }
 
 bool CryptPlug::checkMessageSignature( char** cleartext,
diff --git a/certmanager/lib/cryptplugwrapper.cpp b/certmanager/lib/cryptplugwrapper.cpp
index 4ffc59c91..3bce3d136 100644
--- a/certmanager/lib/cryptplugwrapper.cpp
+++ b/certmanager/lib/cryptplugwrapper.cpp
@@ -424,7 +424,7 @@ CryptPlugWrapper::CryptPlugWrapper( const TQString& name,
     _libName( libName ),
     _updateURL( update ),
     _active(  active  ),
-    _initqStatus( IniStatus_undef ),
+    _iniStatus( IniStatus_undef ),
     _cp( 0 ),
     _config( 0 ),
     _cryptoConfig( 0 )
@@ -492,15 +492,15 @@ TQString CryptPlugWrapper::displayName() const
     return i18n("(Unknown Protocol)");
 }
 
-bool CryptPlugWrapper::initialize( InitqStatus* initqStatus, TQString* errorMsg )
+bool CryptPlugWrapper::initialize( IniStatus* iniStatus, TQString* errorMsg )
 {
     if ( _cp )
       return true;
 
-    _initqStatus = IniStatus_undef;
+    _iniStatus = IniStatus_undef;
     /* make sure we have a lib name */
     if ( _libName.isEmpty() ) {
-      _initqStatus = IniStatus_NoLibName;
+      _iniStatus = IniStatus_NoLibName;
       kdDebug(5150) << "No library name was given.\n" << endl;
     } else {
       if ( _libName.contains( "smime" ) ) {
@@ -515,12 +515,12 @@ bool CryptPlugWrapper::initialize( InitqStatus* initqStatus, TQString* errorMsg
       }
 
       if ( !_cp ) {
-	_initqStatus = IniStatus_LoadError;
+	_iniStatus = IniStatus_LoadError;
 	kdDebug(5150) << "Couldn't create '" << _libName.latin1() << "'" << endl;
       } else {
 	/* now call the init function */
 	if( !_cp->initialize() ) {
-	  _initqStatus = IniStatus_InitError;
+	  _iniStatus = IniStatus_InitError;
 	  kdDebug(5150) << "Error while executing function 'initialize' on plugin " << _libName << endl;
 	  _lastError = i18n("Error while initializing plugin \"%1\"").tqarg( _libName );
 	  if ( errorMsg )
@@ -528,13 +528,13 @@ bool CryptPlugWrapper::initialize( InitqStatus* initqStatus, TQString* errorMsg
 	  delete _cp; _cp = 0;
 	  delete _config; _config = 0;
 	} else {
-	  _initqStatus  = IniStatus_Ok;
+	  _iniStatus  = IniStatus_Ok;
 	}
       }
     }
-    if( initqStatus )
-        *initqStatus = _initqStatus;
-    return _initqStatus == IniStatus_Ok;
+    if( iniStatus )
+        *iniStatus = _iniStatus;
+    return _iniStatus == IniStatus_Ok;
 }
 
 
@@ -547,11 +547,11 @@ void CryptPlugWrapper::deinitialize()
 }
 
 
-CryptPlugWrapper::InitqStatus CryptPlugWrapper::initqStatus( TQString* errorMsg ) const
+CryptPlugWrapper::IniStatus CryptPlugWrapper::iniStatus( TQString* errorMsg ) const
 {
     if( errorMsg )
         *errorMsg = _lastError;
-    return _initqStatus;
+    return _iniStatus;
 }
 
 
diff --git a/certmanager/lib/cryptplugwrapper.h b/certmanager/lib/cryptplugwrapper.h
index 2275f3756..bf1976700 100644
--- a/certmanager/lib/cryptplugwrapper.h
+++ b/certmanager/lib/cryptplugwrapper.h
@@ -462,7 +462,7 @@ public:
         If initialize was not called before return value will be
         \c CryptPlugInit_undef.
 
-        \sa initqStatus, initialize
+        \sa iniStatus, initialize
     */
     typedef enum {
         IniStatus_undef         = 0,
@@ -471,7 +471,7 @@ public:
         IniStatus_NoLibName     = 2,
         IniStatus_LoadError     = 0x1000,
         IniStatus_InitError     = 0x2000
-    } InitqStatus;
+    } IniStatus;
 
     /*! \ingroup groupSignAct
         \brief Flags used to compose the SigStatusFlags value.
@@ -543,7 +543,7 @@ public:
                        or not.
 
         \sa ~CryptPlugWrapper, setActive, active, initialize, deinitialize
-        \sa initqStatus
+        \sa iniStatus
     */
     CryptPlugWrapper( const TQString& name=TQString(),
                       const TQString& libName=TQString(),
@@ -582,7 +582,7 @@ public:
               structures - if just prevents the normal functions from
               being called erroneously. When deactivated only the following
               functions are operational: constructor , destructor ,
-              setActive , active, setLibName , libName , initqStatus;
+              setActive , active, setLibName , libName , iniStatus;
               calling other functions will be ignored and their return
               values will be undefined.
 
@@ -590,7 +590,7 @@ public:
                        or not.
 
         \sa active, CryptPlugWrapper(), ~CryptPlugWrapper
-        \sa deinitialize, initialize, initqStatus
+        \sa deinitialize, initialize, iniStatus
     */
     void setActive( bool active );
 
@@ -613,7 +613,7 @@ public:
         This name may be set in the constructor or by calling setLibName().
 
         \note Setting/changing the library name may only be done when
-              the initqStatus() is <b>not</b> \c IniStatus_Ok.
+              the iniStatus() is <b>not</b> \c IniStatus_Ok.
               If you want to change the name of the library after
               successfully having called initialize() please make
               sure to unload it by calling the deinitialize() function.
@@ -626,7 +626,7 @@ public:
                 above 'note'.
 
         \sa libName, CryptPlugWrapper(), ~CryptPlugWrapper
-        \sa deinitialize, initialize, initqStatus
+        \sa deinitialize, initialize, iniStatus
     */
     bool setLibName( const TQString& libName );
 
@@ -666,13 +666,13 @@ private:
         undefined in this case, this rule does not apply to the functions
         \c setActive() and \c setLibName().
 
-        \param initqStatus will receive the resulting InitqStatus if not NULL
+        \param iniStatus will receive the resulting IniStatus if not NULL
         \param errorMsg will receive the system error message if not NULL
 
-        \sa initqStatus, deinitialize, CryptPlugWrapper(), ~CryptPlugWrapper
+        \sa iniStatus, deinitialize, CryptPlugWrapper(), ~CryptPlugWrapper
         \sa setActive, active
     */
-    bool initialize( InitqStatus* initqStatus, TQString* errorMsg );
+    bool initialize( IniStatus* iniStatus, TQString* errorMsg );
 
 public:
     /*! \ingroup groupGeneral
@@ -681,10 +681,10 @@ public:
         After this function has been called, no other plugin functions
         should be called; the behavior is undefined in this case.
 
-        \note Deinitializing sets the internal initqStatus value back
+        \note Deinitializing sets the internal iniStatus value back
               to \c IniStatus_undef.
 
-        \sa initqStatus, initialize, CryptPlugWrapper, ~CryptPlugWrapper
+        \sa iniStatus, initialize, CryptPlugWrapper, ~CryptPlugWrapper
         \sa setActive, active
     */
     void deinitialize();
@@ -693,7 +693,7 @@ public:
         \brief Returns this CRYPTPLUG wrapper's initialization state.
 
         \param errorMsg receives the last system error message, this value
-        should be ignored if InitqStatus value equals \c IniStatus_Ok.
+        should be ignored if IniStatus value equals \c IniStatus_Ok.
 
         \return  whether the relative library was loaded and initialized
                  correctly
@@ -701,7 +701,7 @@ public:
         \sa initialize, deinitialize, CryptPlugWrapper(), ~CryptPlugWrapper
         \sa setActive, active
     */
-    InitqStatus initqStatus( TQString* errorMsg ) const;
+    IniStatus iniStatus( TQString* errorMsg ) const;
 
 
     /*! \ingroup groupGeneral
@@ -714,7 +714,7 @@ public:
         however.
 
         \note In case this function cannot be executed the system's error
-        message may be retrieved by calling initqStatus( TQString* ).
+        message may be retrieved by calling iniStatus( TQString* ).
 
         \return  whether the relative feature is implemented or not
     */
@@ -824,7 +824,7 @@ private:
     TQString    _libName;
     TQString    _updateURL;
     bool       _active;
-    InitqStatus _initqStatus;
+    IniStatus _iniStatus;
     TQString    _lastError;
     CryptPlug* _cp;
     // local parameters without representation in cryptplug.h
diff --git a/certmanager/lib/tests/gnupgviewer.h b/certmanager/lib/tests/gnupgviewer.h
index bc589ec48..8f1a65229 100644
--- a/certmanager/lib/tests/gnupgviewer.h
+++ b/certmanager/lib/tests/gnupgviewer.h
@@ -54,12 +54,12 @@ public:
 private slots:
   void slotStdout( KProcess *, char *, int );
   void slotStderr( KProcess *, char *, int );
-  void slotqStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
+  void sloStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
   void slotProcessExited( KProcess * );
 
 private:
   Kleo::GnuPGProcessBase * mProcess;
-  TQString mLastStdout, mLastStderr, mLastqStatus;
+  TQString mLastStdout, mLastStderr, mLasStatus;
 };
 
 #endif // __KLEO_TESTS_GNUPGVIEWER_H__
diff --git a/certmanager/lib/tests/test_gnupgprocessbase.cpp b/certmanager/lib/tests/test_gnupgprocessbase.cpp
index de3a4ff06..6e6bf7c80 100644
--- a/certmanager/lib/tests/test_gnupgprocessbase.cpp
+++ b/certmanager/lib/tests/test_gnupgprocessbase.cpp
@@ -69,7 +69,7 @@ void GnuPGViewer::setProcess( Kleo::GnuPGProcessBase * process ) {
   connect( mProcess, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),
 	   TQT_SLOT(slotStderr(KProcess*,char*,int)) );
   connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)),
-	   TQT_SLOT(slotqStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
+	   TQT_SLOT(sloStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
 }
 
 static TQStringList split( char * buffer, int buflen, TQString & old ) {
@@ -102,14 +102,14 @@ void GnuPGViewer::slotStderr( KProcess *, char * buffer, int buflen ) {
   for ( TQStringList::const_iterator it = l.begin() ; it != l.end() ; ++it )
     append( "<b>stderr: " + escape( *it ) + "</b>" );
 }
-void GnuPGViewer::slotqStatus( Kleo::GnuPGProcessBase *, const TQString & type, const TQStringList & args ) {
+void GnuPGViewer::sloStatus( Kleo::GnuPGProcessBase *, const TQString & type, const TQStringList & args ) {
   append( "<b><font color=\"red\">status: " + escape( type + ' ' + args.join( " " ) ) + "</font></b>" );
 }
 void GnuPGViewer::slotProcessExited( KProcess * proc ) {
   if ( !proc )
     return;
   if ( proc->normalExit() )
-    append( TQString( "<b>Process exit: return code %1</b>" ).arg ( proc->exitqStatus() ) );
+    append( TQString( "<b>Process exit: return code %1</b>" ).arg ( proc->exiStatus() ) );
   else
     append( "<b>Process exit: killed</b>" );
 }
diff --git a/certmanager/lib/ui/adddirectoryservicedialog.ui b/certmanager/lib/ui/adddirectoryservicedialog.ui
index fc6f07a2e..30b89d2d8 100644
--- a/certmanager/lib/ui/adddirectoryservicedialog.ui
+++ b/certmanager/lib/ui/adddirectoryservicedialog.ui
@@ -75,7 +75,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>60</height>
@@ -136,7 +136,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>260</width>
                     <height>21</height>
diff --git a/certmanager/lib/ui/backendconfigwidget.cpp b/certmanager/lib/ui/backendconfigwidget.cpp
index 1052cff52..1207ed0f0 100644
--- a/certmanager/lib/ui/backendconfigwidget.cpp
+++ b/certmanager/lib/ui/backendconfigwidget.cpp
@@ -144,7 +144,7 @@ private:
     // First one is the generic name (find a nice one for OpenPGP, SMIME)
     const TQString protoName = qstricmp( protocolName, "openpgp" ) != 0
                               ? qstricmp( protocolName, "smime" ) != 0
-                              ? TQString::tqfromLatin1( protocolName )
+                              ? TQString::fromLatin1( protocolName )
                               : i18n( "S/MIME" )
                               : i18n( "OpenPGP" );
     // second one is implementation name (gpg, gpgsm...)
diff --git a/certmanager/lib/ui/cryptoconfigmodule.cpp b/certmanager/lib/ui/cryptoconfigmodule.cpp
index a16dcd22e..c7604e84e 100644
--- a/certmanager/lib/ui/cryptoconfigmodule.cpp
+++ b/certmanager/lib/ui/cryptoconfigmodule.cpp
@@ -122,10 +122,10 @@ Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidg
       dialogHeight = 500;
     else // small (800x600, 640x480) desktop
       dialogHeight = 400;
-    TQSize sz = scrollView->tqsizeHint();
+    TQSize sz = scrollView->sizeHint();
     scrollView->setMinimumSize( sz.width()
-                                + scrollView->tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent),
-                                TQMIN( compGUI->tqsizeHint().height(), dialogHeight ) );
+                                + scrollView->tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent),
+                                TQMIN( compGUI->sizeHint().height(), dialogHeight ) );
   }
   if ( mComponentGUIs.empty() ) {
       Q_ASSERT( face() == Plain );
@@ -136,7 +136,7 @@ Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidg
                                "information.")
           .tqarg( components.empty() ? "gpgconf --list-components" : "gpgconf --list-options gpg" );
       TQLabel * label = new TQLabel( msg, vbox );
-      label->tqsetAlignment( TQt::WordBreak );
+      label->setAlignment( TQt::WordBreak );
       label->setMinimumHeight( fontMetrics().lineSpacing() * 5 );
   }
 }
diff --git a/certmanager/lib/ui/directoryserviceswidget.cpp b/certmanager/lib/ui/directoryserviceswidget.cpp
index 4975e3818..7c576aa86 100644
--- a/certmanager/lib/ui/directoryserviceswidget.cpp
+++ b/certmanager/lib/ui/directoryserviceswidget.cpp
@@ -63,7 +63,7 @@ public:
 
   void setPassword( const TQString& pass ) {
     mPassword = pass;
-    setText( 4, pass.isEmpty() ? TQString() : TQString::tqfromLatin1( "******" ) );
+    setText( 4, pass.isEmpty() ? TQString() : TQString::fromLatin1( "******" ) );
   }
 
   const TQString& password() const { return mPassword; }
diff --git a/certmanager/lib/ui/directoryserviceswidgetbase.ui b/certmanager/lib/ui/directoryserviceswidgetbase.ui
index 59a014618..016712ebd 100644
--- a/certmanager/lib/ui/directoryserviceswidgetbase.ui
+++ b/certmanager/lib/ui/directoryserviceswidgetbase.ui
@@ -158,7 +158,7 @@ If you do not use a directory service, you can still use local certificates.
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>51</height>
@@ -187,7 +187,7 @@ If you do not use a directory service, you can still use local certificates.
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>47</width>
                             <height>20</height>
@@ -221,7 +221,7 @@ By clicking this button, you can select a new directory service to be used for r
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>47</width>
                             <height>20</height>
@@ -258,7 +258,7 @@ By clicking this button, you can remove the currently selected directory service
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>47</width>
                             <height>20</height>
@@ -277,7 +277,7 @@ By clicking this button, you can remove the currently selected directory service
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
index a4fc7d9a1..4cfcfb20a 100644
--- a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
+++ b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
@@ -115,7 +115,7 @@ Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget( DNAttributeMap
   // the up/down/left/right arrow cross:
 
   TQGridLayout * xlay = new TQGridLayout( 5, 3, 0, "xlay" );
-  xlay->tqsetAlignment( AlignCenter );
+  xlay->setAlignment( AlignCenter );
 
   static const struct {
     const char * icon;
diff --git a/certmanager/lib/ui/kdhorizontalline.cpp b/certmanager/lib/ui/kdhorizontalline.cpp
index d736399f8..07dc7ef89 100644
--- a/certmanager/lib/ui/kdhorizontalline.cpp
+++ b/certmanager/lib/ui/kdhorizontalline.cpp
@@ -97,7 +97,7 @@ void KDHorizontalLine::calculateFrame() {
     qDebug( "mLenVisible = %d (of %d)", mLenVisible, mTitle.length() );
     if ( mLenVisible ) { // but do we also have a visible label?
       TQRect r = rect();
-      const int va = tqstyle().tqstyleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this );
+      const int va = tqstyle().styleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this );
       if( va & AlignVCenter )
         r.setTop( fm.height() / 2 );		// frame rect should be
       else if( va & AlignTop )
@@ -115,11 +115,11 @@ TQSizePolicy KDHorizontalLine::sizePolicy() const {
   return TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed );
 }
 
-TQSize KDHorizontalLine::tqsizeHint() const {
-  return tqminimumSizeHint();
+TQSize KDHorizontalLine::sizeHint() const {
+  return minimumSizeHint();
 }
 
-TQSize KDHorizontalLine::tqminimumSizeHint() const {
+TQSize KDHorizontalLine::minimumSizeHint() const {
   const int w = fontMetrics().width( mTitle, mLenVisible ) +
                 fontMetrics().width( TQChar( ' ' ) );
   const int h = fontMetrics().height();
@@ -147,13 +147,13 @@ void KDHorizontalLine::paintEvent( TQPaintEvent * e ) {
         x = 0;
     }
     TQRect r( x, 0, tw, h );
-    int va = tqstyle().tqstyleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this );
+    int va = tqstyle().styleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this );
     if ( va & AlignTop )
       r.moveBy( 0, fm.descent() );
-    const TQColor pen( (TQRgb) tqstyle().tqstyleHint( TQStyle::SH_GroupBox_TextLabelColor, this ) );
-    if ( !tqstyle().tqstyleHint( TQStyle::SH_UnderlineAccelerator, this ) )
+    const TQColor pen( (TQRgb) tqstyle().styleHint( TQStyle::SH_GroupBox_TextLabelColor, this ) );
+    if ( !tqstyle().styleHint( TQStyle::SH_UnderlineAccelerator, this ) )
       va |= NoAccel;
-    tqstyle().drawItem( &paint, r, ShowPrefix | AlignHCenter | va, tqcolorGroup(),
+    tqstyle().drawItem( &paint, r, ShowPrefix | AlignHCenter | va, colorGroup(),
                       isEnabled(), 0, mTitle, -1, ownPalette() ? 0 : &pen );
     paint.setClipRegion( e->region().subtract( r ) ); // clip everything but title
   }
diff --git a/certmanager/lib/ui/kdhorizontalline.h b/certmanager/lib/ui/kdhorizontalline.h
index 466b54bca..c62a18ddf 100644
--- a/certmanager/lib/ui/kdhorizontalline.h
+++ b/certmanager/lib/ui/kdhorizontalline.h
@@ -58,8 +58,8 @@ public:
   /*! \reimp to hard-code the frame tqshape */
   void setFrameStyle( int style );
 
-  TQSize tqsizeHint() const;
-  TQSize tqminimumSizeHint() const;
+  TQSize sizeHint() const;
+  TQSize minimumSizeHint() const;
   TQSizePolicy sizePolicy() const;
 
   static int indentHint();
diff --git a/certmanager/lib/ui/keyapprovaldialog.cpp b/certmanager/lib/ui/keyapprovaldialog.cpp
index afad1fb8e..3933b0a5e 100644
--- a/certmanager/lib/ui/keyapprovaldialog.cpp
+++ b/certmanager/lib/ui/keyapprovaldialog.cpp
@@ -170,8 +170,8 @@ Kleo::KeyApprovalDialog::KeyApprovalDialog( const std::vector<Item> & recipients
   // calculate the optimal width for the dialog
   const int dialogWidth = marginHint()
                   + sv->frameWidth()
-                  + view->tqsizeHint().width()
-                  + sv->verticalScrollBar()->tqsizeHint().width()
+                  + view->sizeHint().width()
+                  + sv->verticalScrollBar()->sizeHint().width()
                   + sv->frameWidth()
                   + marginHint()
                   + 2;
@@ -180,11 +180,11 @@ Kleo::KeyApprovalDialog::KeyApprovalDialog( const std::vector<Item> & recipients
                    + fontMetrics().height()
                    + spacingHint()
                    + sv->frameWidth()
-                   + view->tqsizeHint().height()
-                   + sv->horizontalScrollBar()->tqsizeHint().height()
+                   + view->sizeHint().height()
+                   + sv->horizontalScrollBar()->sizeHint().height()
                    + sv->frameWidth()
                    + spacingHint()
-                   + actionButton( KDialogBase::Cancel )->tqsizeHint().height()
+                   + actionButton( KDialogBase::Cancel )->sizeHint().height()
                    + marginHint()
                    + 2;
 
diff --git a/certmanager/lib/ui/keylistview.cpp b/certmanager/lib/ui/keylistview.cpp
index 32d5be217..075833b21 100644
--- a/certmanager/lib/ui/keylistview.cpp
+++ b/certmanager/lib/ui/keylistview.cpp
@@ -81,8 +81,8 @@ namespace {
     if ( !item )
       return;
 
-    const TQRect tqitemRect = mKeyListView->tqitemRect( item );
-    if ( !tqitemRect.isValid() )
+    const TQRect itemRect = mKeyListView->itemRect( item );
+    if ( !itemRect.isValid() )
       return;
 
     const int col = mKeyListView->header()->sectionAt( p.x() );
@@ -93,8 +93,8 @@ namespace {
     if ( !headerRect.isValid() )
       return;
 
-    const TQRect cellRect( headerRect.left(), tqitemRect.top(),
-			  headerRect.width(), tqitemRect.height() );
+    const TQRect cellRect( headerRect.left(), itemRect.top(),
+			  headerRect.width(), itemRect.height() );
 
     TQString tipStr;
     if ( const Kleo::KeyListViewItem * klvi = Kleo::lvi_cast<Kleo::KeyListViewItem>( item ) )
diff --git a/certmanager/lib/ui/keyrequester.cpp b/certmanager/lib/ui/keyrequester.cpp
index ebde2c163..3c1e264cd 100644
--- a/certmanager/lib/ui/keyrequester.cpp
+++ b/certmanager/lib/ui/keyrequester.cpp
@@ -117,7 +117,7 @@ void Kleo::KeyRequester::init()
   // the button to unset any key:
   mEraseButton = new KPushButton( this );
   mEraseButton->setAutoDefault( false );
-  mEraseButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum,
+  mEraseButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum,
 					    TQSizePolicy::Minimum ) );
   mEraseButton->setIconSet( SmallIconSet( TQApplication::reverseLayout() ? "locationbar_erase" : "clear_left" ) );
   TQToolTip::add( mEraseButton, i18n("Clear") );
@@ -133,7 +133,7 @@ void Kleo::KeyRequester::init()
   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 ) );
 
   setAllowedKeys( mKeyUsage );
diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp
index f017f2024..b05d9ea28 100644
--- a/certmanager/lib/ui/keyselectiondialog.cpp
+++ b/certmanager/lib/ui/keyselectiondialog.cpp
@@ -250,7 +250,7 @@ namespace {
 		   "Fingerprint: %4" )
 	.tqarg( uid ? TQString::fromUtf8( uid ) : i18n("unknown"),
 	      creation, expiry,
-	      fpr ? TQString::tqfromLatin1( fpr ) : i18n("unknown") );
+	      fpr ? TQString::fromLatin1( fpr ) : i18n("unknown") );
     else
       return i18n( "S/MIME key for %1\n"
 		   "Created: %2\n"
@@ -259,7 +259,7 @@ namespace {
 		   "Issuer: %5" )
 	.tqarg( uid ? Kleo::DN( uid ).prettyDN() : i18n("unknown"),
 	      creation, expiry,
-	      fpr ? TQString::tqfromLatin1( fpr ) : i18n("unknown") )
+	      fpr ? TQString::fromLatin1( fpr ) : i18n("unknown") )
 	.tqarg( issuer ? Kleo::DN( issuer ).prettyDN() : i18n("unknown") );
   }
 
@@ -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->tqsetAlignment( textLabel->tqalignment() | TQt::WordBreak );
+      textLabel->setAlignment( textLabel->tqalignment() | TQt::WordBreak );
       mTopLayout->addWidget( textLabel );
     } else {
       KActiveLabel *textLabel = new KActiveLabel( text, page );
-      textLabel->tqsetAlignment( textLabel->tqalignment() | TQt::WordBreak );
+      textLabel->setAlignment( textLabel->tqalignment() | TQt::WordBreak );
       mTopLayout->addWidget( textLabel );
     }
   }