7 files changed, 21 insertions, 21 deletions
diff --git a/certmanager/lib/tests/gnupgviewer.h b/certmanager/lib/tests/gnupgviewer.h
index 9a310d49..f9a0e962 100644
--- a/certmanager/lib/tests/gnupgviewer.h
+++ b/certmanager/lib/tests/gnupgviewer.h
@@ -43,7 +43,7 @@ class TDEProcess;
 class TQStringList;
 
 class GnuPGViewer : public TQTextEdit {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
   GnuPGViewer( TQWidget * parent=0, const char * name=0 );
diff --git a/certmanager/lib/tests/test_gnupgprocessbase.cpp b/certmanager/lib/tests/test_gnupgprocessbase.cpp
index 01e5d109..3fdc9938 100644
--- a/certmanager/lib/tests/test_gnupgprocessbase.cpp
+++ b/certmanager/lib/tests/test_gnupgprocessbase.cpp
@@ -62,14 +62,14 @@ void GnuPGViewer::setProcess( Kleo::GnuPGProcessBase * process ) {
   if ( !process )
     return;
   mProcess = process;
-  connect( mProcess, TQT_SIGNAL(processExited(TDEProcess*)),
-	   TQT_SLOT(slotProcessExited(TDEProcess*)) );
-  connect( mProcess, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
-	   TQT_SLOT(slotStdout(TDEProcess*,char*,int)) );
-  connect( mProcess, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
-	   TQT_SLOT(slotStderr(TDEProcess*,char*,int)) );
-  connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)),
-	   TQT_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
+  connect( mProcess, TQ_SIGNAL(processExited(TDEProcess*)),
+	   TQ_SLOT(slotProcessExited(TDEProcess*)) );
+  connect( mProcess, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)),
+	   TQ_SLOT(slotStdout(TDEProcess*,char*,int)) );
+  connect( mProcess, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)),
+	   TQ_SLOT(slotStderr(TDEProcess*,char*,int)) );
+  connect( mProcess, TQ_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)),
+	   TQ_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
 }
 
 static TQStringList split( char * buffer, int buflen, TQString & old ) {
diff --git a/certmanager/lib/tests/test_jobs.cpp b/certmanager/lib/tests/test_jobs.cpp
index ba26bfb5..661e07da 100644
--- a/certmanager/lib/tests/test_jobs.cpp
+++ b/certmanager/lib/tests/test_jobs.cpp
@@ -61,8 +61,8 @@ static void testSign()
 
   std::vector<GpgME::Key> signingKeys;
 
-  std::auto_ptr<Kleo::KeyListJob> listJob( proto->keyListJob( false, false, true ) ); // use validating keylisting
-  if ( listJob.get() ) {
+  std::unique_ptr<Kleo::KeyListJob> listJob( proto->keyListJob( false, false, true ) ); // use validating keylisting
+  if ( listJob ) {
       // ##### Adjust this to your own identity
       listJob->exec( "faure@kde.org", true /*secret*/, signingKeys );
       assert( !signingKeys.empty() );
diff --git a/certmanager/lib/tests/test_keygen.cpp b/certmanager/lib/tests/test_keygen.cpp
index b678e29d..ef8f8878 100644
--- a/certmanager/lib/tests/test_keygen.cpp
+++ b/certmanager/lib/tests/test_keygen.cpp
@@ -96,7 +96,7 @@ KeyGenerator::KeyGenerator( TQWidget * parent, const char * name, WFlags )
   glay->setRowStretch( row, 1 );
   glay->setColStretch( 1, 1 );
 
-  connect( this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(slotStartKeyGeneration()) );
+  connect( this, TQ_SIGNAL(user1Clicked()), TQ_SLOT(slotStartKeyGeneration()) );
 }
 
 KeyGenerator::~KeyGenerator() {}
@@ -118,8 +118,8 @@ void KeyGenerator::slotStartKeyGeneration() {
   Kleo::KeyGenerationJob * job = proto->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&)) );
 
   const GpgME::Error err = job->start( params );
   if ( err )
diff --git a/certmanager/lib/tests/test_keygen.h b/certmanager/lib/tests/test_keygen.h
index 4bf2acaa..952b4d53 100644
--- a/certmanager/lib/tests/test_keygen.h
+++ b/certmanager/lib/tests/test_keygen.h
@@ -44,7 +44,7 @@ namespace GpgME {
 class TQLineEdit;
 
 class KeyGenerator : public KDialogBase {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
   KeyGenerator( TQWidget * parent=0, const char * name=0, WFlags f=0 );
diff --git a/certmanager/lib/tests/test_keylister.cpp b/certmanager/lib/tests/test_keylister.cpp
index 0e357b59..38b9085b 100644
--- a/certmanager/lib/tests/test_keylister.cpp
+++ b/certmanager/lib/tests/test_keylister.cpp
@@ -115,10 +115,10 @@ void CertListView::slotStart() {
   kdDebug() << "CertListView::slotStart()" << endl;
   Kleo::KeyListJob * job = Kleo::CryptoBackendFactory::instance()->smime()->keyListJob( false );
   assert( job );
-  TQObject::connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)),
-		    this, TQT_SLOT(slotAddKey(const GpgME::Key&)) );
-  TQObject::connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)),
-		    this, TQT_SLOT(slotResult(const GpgME::KeyListResult&)) );
+  TQObject::connect( job, TQ_SIGNAL(nextKey(const GpgME::Key&)),
+		    this, TQ_SLOT(slotAddKey(const GpgME::Key&)) );
+  TQObject::connect( job, TQ_SIGNAL(result(const GpgME::KeyListResult&)),
+		    this, TQ_SLOT(slotResult(const GpgME::KeyListResult&)) );
 #if 0
   TQStringList l;
   l << "Marc";
@@ -138,7 +138,7 @@ int main( int argc, char** argv ) {
   app.setMainWidget( clv );
   clv->show();
 
-  TQTimer::singleShot( 5000, clv, TQT_SLOT(slotStart()) );
+  TQTimer::singleShot( 5000, clv, TQ_SLOT(slotStart()) );
 
   return app.exec();
 }
diff --git a/certmanager/lib/tests/test_keylister.h b/certmanager/lib/tests/test_keylister.h
index 58eeac4a..1d6b1611 100644
--- a/certmanager/lib/tests/test_keylister.h
+++ b/certmanager/lib/tests/test_keylister.h
@@ -40,7 +40,7 @@ namespace GpgME {
 }
 
 class CertListView : public Kleo::KeyListView {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
   CertListView( TQWidget * parent=0, const char * name=0, WFlags f=0 );