Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

8 files changed, 33 insertions, 33 deletions

diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
index aad0701ae..2804cca1f 100644
--- a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
+++ b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
@@ -224,9 +224,9 @@ namespace {
         return TQVariant( data.defaults.boolean.value, int() );
     case ArgType_String:
       if ( isList() )
-        return TQStringList( TQString::fromLatin1( data.defaults.string ) );
+        return TQStringList( TQString::tqfromLatin1( data.defaults.string ) );
       else
-        return TQString::fromLatin1( data.defaults.string );
+        return TQString::tqfromLatin1( data.defaults.string );
     case ArgType_Int:
       if ( isList() )
         return TQValueList<TQVariant>() << data.defaults.integer;
@@ -240,15 +240,15 @@ namespace {
     case ArgType_Path:
     case ArgType_DirPath:
       if ( isList() )
-        return TQValueList<TQVariant>() << TQString::fromLatin1( data.defaults.path );
+        return TQValueList<TQVariant>() << TQString::tqfromLatin1( data.defaults.path );
       else
-        return TQString::fromLatin1( data.defaults.path );
+        return TQString::tqfromLatin1( data.defaults.path );
     case ArgType_URL:
     case ArgType_LDAPURL:
       if ( isList() )
-        return TQValueList<TQVariant>() << TQString::fromLatin1( data.defaults.url );
+        return TQValueList<TQVariant>() << TQString::tqfromLatin1( data.defaults.url );
       else
-        return TQString::fromLatin1( data.defaults.url );
+        return TQString::tqfromLatin1( data.defaults.url );
     }
   }
 
diff --git a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
index ae45d6833..6dc5c5e3a 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
@@ -357,15 +357,15 @@ static TQString gpgconf_escape( const TQString& str )
   // Escape special chars (including ':' and '%')
   TQString enc = KURL::encode_string( str, 106 ); // and convert to utf8 first (to get %12%34 for one special char)
   // Also encode commas, for lists.
-  enc.replace( ',', "%2c" );
+  enc.tqreplace( ',', "%2c" );
   return enc;
 }
 
 static TQString urlpart_encode( const TQString& str )
 {
   TQString enc( str );
-  enc.replace( '%', "%25" ); // first!
-  enc.replace( ':', "%3a" );
+  enc.tqreplace( '%', "%25" ); // first!
+  enc.tqreplace( ':', "%3a" );
   //kdDebug() << "  urlpart_encode: " << str << " -> " << enc << endl;
   return enc;
 }
@@ -809,7 +809,7 @@ TQString QGpgMECryptoConfigEntry::toString( bool escape ) const
   if ( !isList() ) // non-list non-string
   {
     if ( mArgType == ArgType_None ) {
-      return mValue.toBool() ? TQString::fromLatin1( "1" ) : TQString::null;
+      return mValue.toBool() ? TQString::tqfromLatin1( "1" ) : TQString::null;
     } else { // some int
       Q_ASSERT( mArgType == ArgType_Int || mArgType == ArgType_UInt );
       return mValue.toString(); // int to string conversion
diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.h b/certmanager/lib/backends/qgpgme/qgpgmejob.h
index 0681c165d..4a03d7d94 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmejob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmejob.h
@@ -63,10 +63,10 @@ class TQStringList;
 namespace Kleo {
 
   /** This is a hackish helper class to avoid code duplication in this
-      backend's Kleo::Job subclasses. It contains several workarounds
-      for moc/signal/slot shortcomings, most of which the author of
+      backend's Kleo::Job subclasses. It tqcontains several workarounds
+      for tqmoc/signal/slot shortcomings, most of which the author of
       this thinks are Qt bugs (lazy implementations), first and
-      foremost the inability of moc to handle inheritance from
+      foremost the inability of tqmoc to handle inheritance from
       multiple QObject-derived subclasses.
 
       To use it, inherit from the Job-subclass, then from this class,
@@ -140,7 +140,7 @@ namespace Kleo {
     QGpgME::QByteArrayDataProvider * mOutDataDataProvider;
   private:
     const char* * mPatterns;
-    // holds the entry - if any - in mPattern that was replaced with
+    // holds the entry - if any - in mPattern that was tqreplaced with
     // NULL to create a temporary end-of-array marker for gpgme:
     const char * mReplacedPattern;
     unsigned int mNumPatterns;
diff --git a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
index 6cb71dbad..89d9dda36 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
@@ -114,7 +114,7 @@ static const Map & makeMap() { // return a reference to a static to avoid copyin
   static Map map;
   for ( unsigned int i = 0 ; i < sizeof tokens / sizeof *tokens ; ++i ) {
     assert( tokens[i].token );
-    const TQString token = TQString::fromLatin1( tokens[i].token ).lower();
+    const TQString token = TQString::tqfromLatin1( tokens[i].token ).lower();
     for ( unsigned int j = 0 ; j < tokens[i].numDesc ; ++j ) {
       const Desc & desc = tokens[i].desc[j];
       assert( desc.display );
diff --git a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp
index 911afcd63..7517b2a8c 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp
@@ -112,7 +112,7 @@ GpgME::Error Kleo::QGpgMERefreshKeysJob::startAProcess() {
   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(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
+	   TQT_SLOT(sloStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
 
   if ( !mProcess->start( KProcess::NotifyOnExit, KProcess::Stderr ) ) {
     mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ); // what else?
@@ -129,7 +129,7 @@ void Kleo::QGpgMERefreshKeysJob::slotCancel() {
   mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_CANCELED );
 }
 
-void Kleo::QGpgMERefreshKeysJob::slotStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) {
+void Kleo::QGpgMERefreshKeysJob::sloStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) {
   if ( proc != mProcess )
     return;
   TQStringList::const_iterator it = args.begin();
@@ -139,18 +139,18 @@ void Kleo::QGpgMERefreshKeysJob::slotStatus( GnuPGProcessBase * proc, const TQSt
 
 
     if ( args.size() < 2 ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotStatus() not recognising ERROR with < 2 args!" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() not recognising ERROR with < 2 args!" << endl;
       return;
     }
     const int source = (*++it).toInt( &ok );
     if ( !ok ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotStatus() expected number for first ERROR arg, got something else" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() expected number for first ERROR arg, got something else" << endl;
       return;
     }
     ok = false;
     const int code = (*++it).toInt( &ok );
     if ( !ok ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotStatus() expected number for second ERROR arg, got something else" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() expected number for second ERROR arg, got something else" << endl;
       return;
     }
     mError = gpg_err_make( (gpg_err_source_t)source, (gpg_err_code_t)code );
@@ -160,20 +160,20 @@ void Kleo::QGpgMERefreshKeysJob::slotStatus( GnuPGProcessBase * proc, const TQSt
 
 
     if ( args.size() < 4 ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotStatus() not recognising PROGRESS with < 4 args!" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() not recognising PROGRESS with < 4 args!" << endl;
       return;
     }
     const TQString what = *++it;
     ++it; // don't use "type"...
     const int cur = (*++it).toInt( &ok );
     if ( !ok ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotStatus() expected number for \"cur\", got something else" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() expected number for \"cur\", got something else" << endl;
       return;
     }
     ok = false;
     const int total = (*++it).toInt( &ok );
     if ( !ok ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotStatus() expected number for \"total\", got something else" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() expected number for \"total\", got something else" << endl;
       return;
     }
     emit progress( QGpgMEProgressTokenMapper::instance()->map( what, 0, cur, total ), cur, total );
diff --git a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h
index 7ed476866..7246f0a3a 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h
@@ -62,7 +62,7 @@ namespace Kleo {
     /*! \reimp from Job */
     void slotCancel();
 
-    void slotStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
+    void sloStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
     void slotStderr( KProcess *, char *, int );
     void slotProcessExited( KProcess * );
 
diff --git a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
index aeb7b010e..d73b4cb10 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
@@ -95,7 +95,7 @@ GpgME::Error Kleo::QGpgMESecretKeyExportJob::start( const TQStringList & pattern
   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(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
+	   TQT_SLOT(sloStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) );
 
   if ( !mProcess->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) {
     mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ); // what else?
@@ -112,7 +112,7 @@ void Kleo::QGpgMESecretKeyExportJob::slotCancel() {
   mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_CANCELED );
 }
 
-void Kleo::QGpgMESecretKeyExportJob::slotStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) {
+void Kleo::QGpgMESecretKeyExportJob::sloStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) {
   if ( proc != mProcess )
     return;
   TQStringList::const_iterator it = args.begin();
@@ -122,18 +122,18 @@ void Kleo::QGpgMESecretKeyExportJob::slotStatus( GnuPGProcessBase * proc, const
 
 
     if ( args.size() < 2 ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotStatus() not recognising ERROR with < 2 args!" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() not recognising ERROR with < 2 args!" << endl;
       return;
     }
     const int source = (*++it).toInt( &ok );
     if ( !ok ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotStatus() expected number for first ERROR arg, got something else" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() expected number for first ERROR arg, got something else" << endl;
       return;
     }
     ok = false;
     const int code = (*++it).toInt( &ok );
     if ( !ok ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotStatus() expected number for second ERROR arg, got something else" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() expected number for second ERROR arg, got something else" << endl;
       return;
     }
     mError = gpg_err_make( (gpg_err_source_t)source, (gpg_err_code_t)code );
@@ -143,20 +143,20 @@ void Kleo::QGpgMESecretKeyExportJob::slotStatus( GnuPGProcessBase * proc, const
 
 
     if ( args.size() < 4 ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotStatus() not recognising PROGRESS with < 4 args!" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() not recognising PROGRESS with < 4 args!" << endl;
       return;
     }
     const TQString what = *++it;
     ++it; // don't use "type"...
     const int cur = (*++it).toInt( &ok );
     if ( !ok ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotStatus() expected number for \"cur\", got something else" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() expected number for \"cur\", got something else" << endl;
       return;
     }
     ok = false;
     const int total = (*++it).toInt( &ok );
     if ( !ok ) {
-      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotStatus() expected number for \"total\", got something else" << endl;
+      kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() expected number for \"total\", got something else" << endl;
       return;
     }
     emit progress( QGpgMEProgressTokenMapper::instance()->map( what, 0, cur, total ), cur, total );
diff --git a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h
index 50d42c3ce..cb65d549e 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h
+++ b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h
@@ -67,7 +67,7 @@ namespace Kleo {
     /*! \reimp from Job */
     void slotCancel();
 
-    void slotStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
+    void sloStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & );
     void slotStdout( KProcess *, char *, int );
     void slotStderr( KProcess *, char *, int );
     void slotProcessExited( KProcess * );