12 files changed, 16 insertions, 16 deletions
diff --git a/certmanager/lib/kleo/cryptobackendfactory.cpp b/certmanager/lib/kleo/cryptobackendfactory.cpp
index 88ba036de..9b56e89b3 100644
--- a/certmanager/lib/kleo/cryptobackendfactory.cpp
+++ b/certmanager/lib/kleo/cryptobackendfactory.cpp
@@ -66,7 +66,7 @@ static const char * availableProtocols[] = {
 static const unsigned int numAvailableProtocols = sizeof availableProtocols / sizeof *availableProtocols;
 
 Kleo::CryptoBackendFactory::CryptoBackendFactory()
-  : TQObject( qApp, "CryptoBackendFactory::instance()" ),
+  : TQObject( tqApp, "CryptoBackendFactory::instance()" ),
     mConfigObject( 0 ),
     mAvailableProtocols( availableProtocols, availableProtocols + numAvailableProtocols )
 {
diff --git a/certmanager/lib/kleo/dn.cpp b/certmanager/lib/kleo/dn.cpp
index 61693aff2..a9333ebb2 100644
--- a/certmanager/lib/kleo/dn.cpp
+++ b/certmanager/lib/kleo/dn.cpp
@@ -272,7 +272,7 @@ static TQString dn_escape( const TQString & s ) {
     TQString result;
     for ( unsigned int i = 0, end = s.length() ; i != end ; ++i ) {
         const TQChar ch = s[i];
-        switch ( ch.unicode() ) {
+        switch ( ch.tqunicode() ) {
         case ',':
         case '+':
         case '"':
diff --git a/certmanager/lib/kleo/downloadjob.h b/certmanager/lib/kleo/downloadjob.h
index bac195d99..45a4bf9c9 100644
--- a/certmanager/lib/kleo/downloadjob.h
+++ b/certmanager/lib/kleo/downloadjob.h
@@ -68,7 +68,7 @@ namespace Kleo {
     /**
        Starts the download operation. \a fingerprints is a list of
        fingerprints used to specify the list of keys downloaded. Empty
-       patterns are ignored. If \a fingerprints is empty, contains
+       patterns are ignored. If \a fingerprints is empty, tqcontains
        only empty strings or anything other than fingerprints, the
        result is undefined.
     */
diff --git a/certmanager/lib/kleo/exportjob.h b/certmanager/lib/kleo/exportjob.h
index 363006e60..193ea863b 100644
--- a/certmanager/lib/kleo/exportjob.h
+++ b/certmanager/lib/kleo/exportjob.h
@@ -68,7 +68,7 @@ namespace Kleo {
     /**
        Starts the export operation. \a patterns is a list of patterns
        used to restrict the list of keys exported. Empty patterns are
-       ignored. If \a patterns is empty or contains only empty
+       ignored. If \a patterns is empty or tqcontains only empty
        strings, all available keys are exported.
     */
     virtual GpgME::Error start( const TQStringList & patterns ) = 0;
diff --git a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp
index c9a9ffcec..4d33761f4 100644
--- a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp
+++ b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp
@@ -75,7 +75,7 @@ Kleo::HierarchicalKeyListJob::~HierarchicalKeyListJob() {
 GpgME::Error Kleo::HierarchicalKeyListJob::start( const TQStringList & patterns, bool secretOnly ) {
   if ( secretOnly || patterns.empty() )
     return gpg_err_make( GPG_ERR_SOURCE_GPGME, GPG_ERR_UNSUPPORTED_OPERATION );
-  qCopy( patterns.begin(), patterns.end(),
+  tqCopy( patterns.begin(), patterns.end(),
 	 std::inserter( mNextSet, mNextSet.begin() ) );
   const GpgME::Error err = startAJob();
   if ( err )
diff --git a/certmanager/lib/kleo/importjob.h b/certmanager/lib/kleo/importjob.h
index 9c446457f..275c9b6c0 100644
--- a/certmanager/lib/kleo/importjob.h
+++ b/certmanager/lib/kleo/importjob.h
@@ -67,7 +67,7 @@ namespace Kleo {
     ~ImportJob();
 
     /**
-       Starts the importing operation. \a keyData contains the data to
+       Starts the importing operation. \a keyData tqcontains the data to
        import from.
     */
     virtual GpgME::Error start( const TQByteArray & keyData ) = 0;
diff --git a/certmanager/lib/kleo/job.cpp b/certmanager/lib/kleo/job.cpp
index dedbebfc2..ac5dbac2f 100644
--- a/certmanager/lib/kleo/job.cpp
+++ b/certmanager/lib/kleo/job.cpp
@@ -62,8 +62,8 @@
 Kleo::Job::Job( TQObject * parent, const char * name )
   : TQObject( parent, name )
 {
-  if ( qApp )
-    connect( qApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(slotCancel()) );
+  if ( tqApp )
+    connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(slotCancel()) );
 }
 
 Kleo::Job::~Job() {
diff --git a/certmanager/lib/kleo/keyfiltermanager.cpp b/certmanager/lib/kleo/keyfiltermanager.cpp
index 53493ab80..51caf5d28 100644
--- a/certmanager/lib/kleo/keyfiltermanager.cpp
+++ b/certmanager/lib/kleo/keyfiltermanager.cpp
@@ -72,8 +72,8 @@ Kleo::KeyFilterManager::KeyFilterManager( TQObject * parent, const char * name )
   mSelf = this;
   d = new Private();
   // ### DF: doesn't a KStaticDeleter work more reliably?
-  if ( qApp )
-    connect( qApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(deleteLater()) );
+  if ( tqApp )
+    connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(deleteLater()) );
   reload();
 }
 
diff --git a/certmanager/lib/kleo/keylistjob.h b/certmanager/lib/kleo/keylistjob.h
index ed6571847..667ddadc3 100644
--- a/certmanager/lib/kleo/keylistjob.h
+++ b/certmanager/lib/kleo/keylistjob.h
@@ -73,7 +73,7 @@ namespace Kleo {
      /**
        Starts the keylist operation. \a pattern is a list of patterns
        used to restrict the list of keys returned. Empty patterns are
-       ignored. If \a pattern is empty or contains only empty strings,
+       ignored. If \a pattern is empty or tqcontains only empty strings,
        all keys are returned (however, the backend is free to truncate
        the result and should do so; when this happens, it will be
        reported by the reult object).
diff --git a/certmanager/lib/kleo/refreshkeysjob.h b/certmanager/lib/kleo/refreshkeysjob.h
index 29467a1cd..6249116d0 100644
--- a/certmanager/lib/kleo/refreshkeysjob.h
+++ b/certmanager/lib/kleo/refreshkeysjob.h
@@ -70,7 +70,7 @@ namespace Kleo {
      /**
        Starts the keylist operation. \a pattern is a list of patterns
        used to restrict the list of keys returned. Empty patterns are
-       ignored. If \a pattern is empty or contains only empty strings,
+       ignored. If \a pattern is empty or tqcontains only empty strings,
        all keys are returned (however, the backend is free to truncate
        the result and should do so; when this happens, it will be
        reported by the reult object).
diff --git a/certmanager/lib/kleo/verifydetachedjob.h b/certmanager/lib/kleo/verifydetachedjob.h
index 58ff64732..c88c3461d 100644
--- a/certmanager/lib/kleo/verifydetachedjob.h
+++ b/certmanager/lib/kleo/verifydetachedjob.h
@@ -67,8 +67,8 @@ namespace Kleo {
     ~VerifyDetachedJob();
 
     /**
-       Starts the verification operation. \a signature contains the
-       signature data, while \a signedData contains the data over
+       Starts the verification operation. \a signature tqcontains the
+       signature data, while \a signedData tqcontains the data over
        which the signature was made.
     */
     virtual GpgME::Error start( const TQByteArray & signature,
diff --git a/certmanager/lib/kleo/verifyopaquejob.h b/certmanager/lib/kleo/verifyopaquejob.h
index 58c452b7c..ba7f40d8a 100644
--- a/certmanager/lib/kleo/verifyopaquejob.h
+++ b/certmanager/lib/kleo/verifyopaquejob.h
@@ -67,8 +67,8 @@ namespace Kleo {
     ~VerifyOpaqueJob();
 
     /**
-       Starts the verification operation. \a signature contains the
-       signature data, while \a signedData contains the data over
+       Starts the verification operation. \a signature tqcontains the
+       signature data, while \a signedData tqcontains the data over
        which the signature was made.
     */
     virtual GpgME::Error start( const TQByteArray & signedData ) = 0;