4 files changed, 6 insertions, 9 deletions

diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
index f6885b3c4..e89070f39 100644
--- a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
+++ b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
@@ -374,7 +374,7 @@ public:
   DecryptVerifyJob * decryptVerifyJob( bool ) const { return 0; }
   RefreshKeysJob * refreshKeysJob() const { return 0; }
 
-  SpecialJob * specialJob( const char * type, const TQMap<TQString,TQVariant> & args ) const {
+  SpecialJob * specialJob( const char * type, const TQStringVariantMap & args ) const {
     if ( tqstricmp( type, "x-obtain-keys" ) == 0 && args.size() == 0 )
       return new ObtainKeysJob();
     if ( tqstricmp( type, "x-encrypt" ) == 0 && args.size() == 0 )
diff --git a/certmanager/lib/backends/chiasmus/obtainkeysjob.h b/certmanager/lib/backends/chiasmus/obtainkeysjob.h
index 10ed5d5fc..da19257b7 100644
--- a/certmanager/lib/backends/chiasmus/obtainkeysjob.h
+++ b/certmanager/lib/backends/chiasmus/obtainkeysjob.h
@@ -56,7 +56,7 @@ namespace Kleo {
      To use, create an ObtainKeysJob instance like this:
      <code>
      Kleo::SpecialJob * job =
-        protocol->specialJob("x-obtain-keys", TQMap<TQString,TQVariant>());
+        protocol->specialJob("x-obtain-keys", TQStringVariantMap());
      </code>
 
      The resulting TQVariant will contain a TQStringList containing the
diff --git a/certmanager/lib/cryptplugwrapper.h b/certmanager/lib/cryptplugwrapper.h
index 39fd680a4..a8ea1112c 100644
--- a/certmanager/lib/cryptplugwrapper.h
+++ b/certmanager/lib/cryptplugwrapper.h
@@ -813,7 +813,7 @@ public:
     Kleo::DecryptVerifyJob * decryptVerifyJob( bool textmode=false ) const;
     Kleo::RefreshKeysJob * refreshKeysJob() const;
 
-    Kleo::SpecialJob * specialJob( const char *, const TQMap<TQString,TQVariant> & ) const { return 0; }
+    Kleo::SpecialJob * specialJob( const char *, const TQStringVariantMap & ) const { return 0; }
 
     GpgME::ImportResult importCertificate( const char* data, size_t length );
 
diff --git a/certmanager/lib/kleo/cryptobackend.h b/certmanager/lib/kleo/cryptobackend.h
index 6cb690d04..215c4e3c6 100644
--- a/certmanager/lib/kleo/cryptobackend.h
+++ b/certmanager/lib/kleo/cryptobackend.h
@@ -2,7 +2,7 @@
     kleo/cryptobackend.h
 
     This file is part of libkleopatra, the KDE keymanagement library
-    Copyright (c) 2004,2005 Klarälvdalens Datakonsult AB
+    Copyright (c) 2004,2005 Klar�lvdalens Datakonsult AB
 
     Libkleopatra is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
@@ -34,6 +34,7 @@
 #define __KLEO_CRYPTOBACKEND_H__
 
 #include <tqstring.h>
+#include <tqvariant.h>
 
 namespace Kleo {
   class CryptoConfig;
@@ -54,10 +55,6 @@ namespace Kleo {
   class SpecialJob;
 }
 
-class TQString;
-class TQVariant;
-template <typename T_Key, typename T_Value> class TQMap;
-
 namespace Kleo {
 
   class CryptoBackend {
@@ -114,7 +111,7 @@ namespace Kleo {
     virtual DecryptVerifyJob  * decryptVerifyJob( bool textmode=false ) const = 0;
     virtual RefreshKeysJob    * refreshKeysJob() const = 0;
 
-    virtual SpecialJob        * specialJob( const char * type, const TQMap<TQString,TQVariant> & args ) const = 0;
+    virtual SpecialJob        * specialJob( const char * type, const TQStringVariantMap & args ) const = 0;
   };
 
 }