4 files changed, 9 insertions, 9 deletions
diff --git a/certmanager/lib/tests/gnupgviewer.h b/certmanager/lib/tests/gnupgviewer.h
index a8bbb074f..bc589ec48 100644
--- a/certmanager/lib/tests/gnupgviewer.h
+++ b/certmanager/lib/tests/gnupgviewer.h
@@ -33,7 +33,7 @@
 #ifndef __KLEO_TESTS_GNUPGVIEWER_H__
 #define __KLEO_TESTS_GNUPGVIEWER_H__
 
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <tqstring.h>
 
 namespace Kleo {
@@ -54,12 +54,12 @@ public:
 private slots:
   void slotStdout( KProcess *, char *, int );
   void slotStderr( KProcess *, char *, int );
-  void sloStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
+  void slotqStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
   void slotProcessExited( KProcess * );
 
 private:
   Kleo::GnuPGProcessBase * mProcess;
-  TQString mLastStdout, mLastStderr, mLasStatus;
+  TQString mLastStdout, mLastStderr, mLastqStatus;
 };
 
 #endif // __KLEO_TESTS_GNUPGVIEWER_H__
diff --git a/certmanager/lib/tests/test_gnupgprocessbase.cpp b/certmanager/lib/tests/test_gnupgprocessbase.cpp
index 6e6bf7c80..de3a4ff06 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(sloStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
+	   TQT_SLOT(slotqStatus(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::sloStatus( Kleo::GnuPGProcessBase *, const TQString & type, const TQStringList & args ) {
+void GnuPGViewer::slotqStatus( 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->exiStatus() ) );
+    append( TQString( "<b>Process exit: return code %1</b>" ).arg ( proc->exitqStatus() ) );
   else
     append( "<b>Process exit: killed</b>" );
 }
diff --git a/certmanager/lib/tests/test_keygen.cpp b/certmanager/lib/tests/test_keygen.cpp
index a707b000d..8acef90f0 100644
--- a/certmanager/lib/tests/test_keygen.cpp
+++ b/certmanager/lib/tests/test_keygen.cpp
@@ -52,7 +52,7 @@
 #include <tqmessagebox.h>
 #include <tqstringlist.h>
 #include <tqtimer.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqlabel.h>
 
@@ -137,7 +137,7 @@ void KeyGenerator::slotResult( const GpgME::KeyGenerationResult & res, const TQB
   if ( res.error() )
     showError( res.error() );
   else
-    KMessageBox::information( this, TQString("Key generated successfully, %1 bytes long").arg( keyData.size() ),
+    KMessageBox::information( this, TQString("Key generated successfully, %1 bytes long").tqarg( keyData.size() ),
 			      "Key Generation Finished" );
 }
   
diff --git a/certmanager/lib/tests/test_keylister.cpp b/certmanager/lib/tests/test_keylister.cpp
index 363ec26a9..ca31b39ab 100644
--- a/certmanager/lib/tests/test_keylister.cpp
+++ b/certmanager/lib/tests/test_keylister.cpp
@@ -104,7 +104,7 @@ void CertListView::slotResult( const GpgME::KeyListResult & result ) {
     TQMessageBox::information( this, "Key Listing Result", "KeyListResult is null!" );
   else if ( result.error() )
     TQMessageBox::critical( this, "Key Listing Result",
-			   TQString("KeyListResult Error: %1").arg( result.error().asString() ) );
+			   TQString("KeyListResult Error: %1").tqarg( result.error().asString() ) );
   else if ( result.isTruncated() )
     TQMessageBox::information( this, "Key Listing Result", "KeyListResult is truncated!" );
   else