certmanager/l

diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp

index f6885b3..e89070f 100644

--- a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp

+++ b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp

@@ -374,7 +374,7 @@

   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 )

certmanager/l

diff --git a/certmanager/lib/backends/chiasmus/obtainkeysjob.h b/certmanager/lib/backends/chiasmus/obtainkeysjob.h

index 10ed5d5..da19257 100644

--- a/certmanager/lib/backends/chiasmus/obtainkeysjob.h

+++ b/certmanager/lib/backends/chiasmus/obtainkeysjob.h

@@ -56,7 +56,7 @@

      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

certmanager/l

diff --git a/certmanager/lib/cryptplugwrapper.h b/certmanager/lib/cryptplugwrapper.h

index 39fd680..a8ea111 100644

--- a/certmanager/lib/cryptplugwrapper.h

+++ b/certmanager/lib/cryptplugwrapper.h

@@ -813,7 +813,7 @@

     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 );

certmanager/l

diff --git a/certmanager/lib/kleo/cryptobackend.h b/certmanager/lib/kleo/cryptobackend.h

index 6cb690d..215c4e3 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;

@@ -53,10 +54,6 @@

   class RefreshKeysJob;

   class SpecialJob;

 }

-

-class TQString;

-class TQVariant;

-template <typename T_Key, typename T_Value> class TQMap;

 namespace Kleo {

@@ -114,7 +111,7 @@

     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;

   };

 }

kmail/kmcommands.cpp

diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp

index a618501..3194cee 100644

--- a/kmail/kmcommands.cpp

+++ b/kmail/kmcommands.cpp

@@ -3239,7 +3239,7 @@

   if ( !chiasmus )

     return;

-  const STD_NAMESPACE_PREFIX auto_ptr<Kleo::SpecialJob> listjob( chiasmus->specialJob( "x-obtain-keys", TQMap<TQString,TQVariant>() ) );

+  const STD_NAMESPACE_PREFIX auto_ptr<Kleo::SpecialJob> listjob( chiasmus->specialJob( "x-obtain-keys", TQStringVariantMap() ) );

   if ( !listjob.get() ) {

     const TQString msg = i18n( "Chiasmus backend does not offer the "

                               "\"x-obtain-keys\" function. Please report this bug." );

@@ -3280,7 +3280,7 @@

   GlobalSettings::setChiasmusDecryptionKey( selectorDlg.key() );

   assert( !GlobalSettings::chiasmusDecryptionKey().isEmpty() );

-  Kleo::SpecialJob * job = chiasmus->specialJob( "x-decrypt", TQMap<TQString,TQVariant>() );

+  Kleo::SpecialJob * job = chiasmus->specialJob( "x-decrypt", TQStringVariantMap() );

   if ( !job ) {

     const TQString msg = i18n( "Chiasmus backend does not offer the "

                               "\"x-decrypt\" function. Please report this bug." );

kmail/kmcomposewin.cpp

diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp

index 2add2b3..bcdbe4a 100644

--- a/kmail/kmcomposewin.cpp

+++ b/kmail/kmcomposewin.cpp

@@ -5311,7 +5311,7 @@

     return;

   }

-  STD_NAMESPACE_PREFIX auto_ptr<Kleo::SpecialJob> job( chiasmus->specialJob( "x-obtain-keys", TQMap<TQString,TQVariant>() ) );

+  STD_NAMESPACE_PREFIX auto_ptr<Kleo::SpecialJob> job( chiasmus->specialJob( "x-obtain-keys", TQStringVariantMap() ) );

   if ( !job.get() ) {

     const TQString msg = i18n( "Chiasmus backend does not offer the "

                               "\"x-obtain-keys\" function. Please report this bug." );

kmail/messagecomposer.cpp

diff --git a/kmail/messagecomposer.cpp b/kmail/messagecomposer.cpp

index 9b5763d..60ceed9 100644

--- a/kmail/messagecomposer.cpp

+++ b/kmail/messagecomposer.cpp

@@ -552,7 +552,7 @@

                                            const TQByteArray& body,

                                            TQByteArray& resultData )

 {

-  std::auto_ptr<Kleo::SpecialJob> job( chiasmus->specialJob( "x-encrypt", TQMap<TQString,TQVariant>() ) );

+  std::auto_ptr<Kleo::SpecialJob> job( chiasmus->specialJob( "x-encrypt", TQStringVariantMap() ) );

   if ( !job.get() ) {

     const TQString msg = i18n( "Chiasmus backend does not offer the "

                               "\"x-encrypt\" function. Please report this bug." );

kmail/objecttreeparser.cpp

diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp

index 2b736d2..71858bd 100644

--- a/kmail/objecttreeparser.cpp

+++ b/kmail/objecttreeparser.cpp

@@ -1853,7 +1853,7 @@

   if ( !chiasmus )

     return false;

-  const STD_NAMESPACE_PREFIX auto_ptr<Kleo::SpecialJob> listjob( chiasmus->specialJob( "x-obtain-keys", TQMap<TQString,TQVariant>() ) );

+  const STD_NAMESPACE_PREFIX auto_ptr<Kleo::SpecialJob> listjob( chiasmus->specialJob( "x-obtain-keys", TQStringVariantMap() ) );

   if ( !listjob.get() ) {

     errorText = i18n( "Chiasmus backend does not offer the "

                       "\"x-obtain-keys\" function. Please report this bug." );

@@ -1892,7 +1892,7 @@

   GlobalSettings::setChiasmusDecryptionKey( selectorDlg.key() );

   assert( !GlobalSettings::chiasmusDecryptionKey().isEmpty() );

-  const STD_NAMESPACE_PREFIX auto_ptr<Kleo::SpecialJob> job( chiasmus->specialJob( "x-decrypt", TQMap<TQString,TQVariant>() ) );

+  const STD_NAMESPACE_PREFIX auto_ptr<Kleo::SpecialJob> job( chiasmus->specialJob( "x-decrypt", TQStringVariantMap() ) );

   if ( !job.get() ) {

     errorText = i18n( "Chiasmus backend does not offer the "

                       "\"x-decrypt\" function. Please report this bug." );

libemailfunctions/idmapper.cpp

diff --git a/libemailfunctions/idmapper.cpp b/libemailfunctions/idmapper.cpp

index 296b3af..34bcf6c 100644

--- a/libemailfunctions/idmapper.cpp

+++ b/libemailfunctions/idmapper.cpp

@@ -95,7 +95,7 @@

   TQString content;

-  TQMap<TQString, TQVariant>::Iterator it;

+  TQStringVariantMap::Iterator it;

   for ( it = mIdMap.begin(); it != mIdMap.end(); ++it ) {

     TQString fingerprint( "" );

     if ( mFingerprintMap.contains( it.key() ) )

@@ -122,7 +122,7 @@

 void IdMapper::removeRemoteId( const TQString &remoteId )

 {

-  TQMap<TQString, TQVariant>::Iterator it;

+  TQStringVariantMap::Iterator it;

   for ( it = mIdMap.begin(); it != mIdMap.end(); ++it )

     if ( it.data().toString() == remoteId ) {

       mIdMap.remove( it );

@@ -133,7 +133,7 @@

 TQString IdMapper::remoteId( const TQString &localId ) const

 {

-  TQMap<TQString, TQVariant>::ConstIterator it;

+  TQStringVariantMap::ConstIterator it;

   it = mIdMap.find( localId );

   if ( it != mIdMap.end() )

@@ -144,7 +144,7 @@

 TQString IdMapper::localId( const TQString &remoteId ) const

 {

-  TQMap<TQString, TQVariant>::ConstIterator it;

+  TQStringVariantMap::ConstIterator it;

   for ( it = mIdMap.begin(); it != mIdMap.end(); ++it )

     if ( it.data().toString() == remoteId )

       return it.key();

@@ -156,7 +156,7 @@

 {

   TQString content;

-  TQMap<TQString, TQVariant>::ConstIterator it;

+  TQStringVariantMap::ConstIterator it;

   for ( it = mIdMap.begin(); it != mIdMap.end(); ++it ) {

     TQString fp;

     if ( mFingerprintMap.contains( it.key() ) )

@@ -183,7 +183,7 @@

 TQMap<TQString, TQString> IdMapper::remoteIdMap() const

 {

   TQMap<TQString, TQString> reverseMap;

-  TQMap<TQString, TQVariant>::ConstIterator it;

+  TQStringVariantMap::ConstIterator it;

   for ( it = mIdMap.begin(); it != mIdMap.end(); ++it ) {

     reverseMap.insert( it.data().toString(), it.key() );

   }

libemailfunctions/idmapper.h

diff --git a/libemailfunctions/idmapper.h b/libemailfunctions/idmapper.h

index 7c6c98c..50075ae 100644

--- a/libemailfunctions/idmapper.h

+++ b/libemailfunctions/idmapper.h

@@ -147,7 +147,7 @@

     TQString filename();

   private:

-    TQMap<TQString, TQVariant> mIdMap;

+    TQStringVariantMap mIdMap;

     TQMap<TQString, TQString> mFingerprintMap;

     TQString mPath;

tderesources/blogging/API_Blogger.cpp

diff --git a/tderesources/blogging/API_Blogger.cpp b/tderesources/blogging/API_Blogger.cpp

index 984cc37..ead54dc 100644

--- a/tderesources/blogging/API_Blogger.cpp

+++ b/tderesources/blogging/API_Blogger.cpp

@@ -159,7 +159,7 @@

     TQValueList<TQVariant>::ConstIterator end = posts.end();

     for ( ; it != end; ++it ) {

       kdDebug () << "MIDDLE: " << ( *it ).typeName() << endl;

-      const TQMap<TQString, TQVariant> postInfo = ( *it ).toMap();

+      const TQStringVariantMap postInfo = ( *it ).toMap();

       const TQString nickname = postInfo[ "nickname" ].toString();

       const TQString userid = postInfo[ "userid" ].toString();

       const TQString email = postInfo[ "email" ].toString();

@@ -188,7 +188,7 @@

     TQValueList<TQVariant>::ConstIterator end = posts.end();

     for ( ; it != end; ++it ) {

       kdDebug () << "MIDDLE: " << ( *it ).typeName() << endl;

-      const TQMap<TQString, TQVariant> postInfo = ( *it ).toMap();

+      const TQStringVariantMap postInfo = ( *it ).toMap();

       const TQString id( postInfo[ "blogid" ].toString() );

       const TQString name( postInfo[ "blogName" ].toString() );

@@ -230,7 +230,7 @@

     for ( ; it != end; ++it ) {

       BlogPosting posting;

       kdDebug () << "MIDDLE: " << ( *it ).typeName() << endl;

-      const TQMap<TQString, TQVariant> postInfo = ( *it ).toMap();

+      const TQStringVariantMap postInfo = ( *it ).toMap();

       if ( readPostingFromMap( &posting, postInfo ) ) {

** Diff limit reached (max: 250 lines) **