rename the following methods:

tqparent parent
tqmask mask


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

19 files changed, 48 insertions, 48 deletions

diff --git a/libkdenetwork/gpgmepp/encryptionresult.cpp b/libkdenetwork/gpgmepp/encryptionresult.cpp
index cad520baa..f827ca839 100644
--- a/libkdenetwork/gpgmepp/encryptionresult.cpp
+++ b/libkdenetwork/gpgmepp/encryptionresult.cpp
@@ -94,8 +94,8 @@ std::vector<GpgME::InvalidRecipient> GpgME::EncryptionResult::invalidEncryptionK
 
 
 
-GpgME::InvalidRecipient::InvalidRecipient( EncryptionResult::Private * tqparent, unsigned int i )
-  : d( tqparent ), idx( i )
+GpgME::InvalidRecipient::InvalidRecipient( EncryptionResult::Private * parent, unsigned int i )
+  : d( parent ), idx( i )
 {
   if ( d )
     d->ref();
diff --git a/libkdenetwork/gpgmepp/encryptionresult.h b/libkdenetwork/gpgmepp/encryptionresult.h
index 0624779d2..7267afc01 100644
--- a/libkdenetwork/gpgmepp/encryptionresult.h
+++ b/libkdenetwork/gpgmepp/encryptionresult.h
@@ -59,7 +59,7 @@ namespace GpgME {
 
   class KDE_EXPORT InvalidRecipient {
     friend class EncryptionResult;
-    InvalidRecipient( EncryptionResult::Private * tqparent, unsigned int index );
+    InvalidRecipient( EncryptionResult::Private * parent, unsigned int index );
   public:
     InvalidRecipient();
     InvalidRecipient( const InvalidRecipient & other );
diff --git a/libkdenetwork/gpgmepp/importresult.cpp b/libkdenetwork/gpgmepp/importresult.cpp
index 7acd35e4c..3b4b713c7 100644
--- a/libkdenetwork/gpgmepp/importresult.cpp
+++ b/libkdenetwork/gpgmepp/importresult.cpp
@@ -140,8 +140,8 @@ std::vector<GpgME::Import> GpgME::ImportResult::imports() const {
 
 
 
-GpgME::Import::Import( ImportResult::Private * tqparent, unsigned int i )
-  : d( tqparent ), idx( i )
+GpgME::Import::Import( ImportResult::Private * parent, unsigned int i )
+  : d( parent ), idx( i )
 {
   if ( d )
     d->ref();
diff --git a/libkdenetwork/gpgmepp/importresult.h b/libkdenetwork/gpgmepp/importresult.h
index eae58a5dc..9a79b7b30 100644
--- a/libkdenetwork/gpgmepp/importresult.h
+++ b/libkdenetwork/gpgmepp/importresult.h
@@ -70,7 +70,7 @@ namespace GpgME {
 
   class KDE_EXPORT Import {
     friend class ImportResult;
-    Import( ImportResult::Private * tqparent, unsigned int idx );
+    Import( ImportResult::Private * parent, unsigned int idx );
   public:
     Import();
     Import( const Import & other );
diff --git a/libkdenetwork/gpgmepp/key.cpp b/libkdenetwork/gpgmepp/key.cpp
index d24a1d644..13cd0a7ee 100644
--- a/libkdenetwork/gpgmepp/key.cpp
+++ b/libkdenetwork/gpgmepp/key.cpp
@@ -348,7 +348,7 @@ namespace GpgME {
     return !d || !d->key || !d->subkey;
   }
 
-  Key Subkey::tqparent() const {
+  Key Subkey::parent() const {
     return Key( d->key, true );
   }
 
@@ -496,7 +496,7 @@ namespace GpgME {
     return !d || !d->key || !d->uid;
   }
 
-  Key UserID::tqparent() const {
+  Key UserID::parent() const {
     return Key( d->key, true );
   }
 
@@ -669,7 +669,7 @@ namespace GpgME {
     return !d || !d->key || !d->uid || !d->sig;
   }
 
-  UserID UserID::Signature::tqparent() const {
+  UserID UserID::Signature::parent() const {
     return UserID( d->key, d->uid );
   }
 
@@ -911,7 +911,7 @@ namespace GpgME {
     return !d || !d->key || !d->uid || !d->sig || !d->nota;
   }
 
-  UserID::Signature UserID::Signature::Notation::tqparent() const {
+  UserID::Signature UserID::Signature::Notation::parent() const {
     return Signature( d->key, d->uid, d->sig );
   }
 
diff --git a/libkdenetwork/gpgmepp/key.h b/libkdenetwork/gpgmepp/key.h
index 9760e6429..e143b47e0 100644
--- a/libkdenetwork/gpgmepp/key.h
+++ b/libkdenetwork/gpgmepp/key.h
@@ -123,7 +123,7 @@ namespace GpgME {
 
     bool isNull() const;
 
-    Key tqparent() const;
+    Key parent() const;
 
     const char * keyID() const;
     const char * fingerprint() const;
@@ -171,7 +171,7 @@ namespace GpgME {
 
     bool isNull() const;
 
-    Key tqparent() const;
+    Key parent() const;
 
     unsigned int numSignatures() const;
     Signature signature( unsigned int index ) const;
@@ -213,7 +213,7 @@ namespace GpgME {
 
     bool isNull() const;
 
-    UserID tqparent() const;
+    UserID parent() const;
 
     const char * signerKeyID() const;
 
@@ -270,7 +270,7 @@ namespace GpgME {
 
     bool isNull() const;
 
-    Signature tqparent() const;
+    Signature parent() const;
 
     const char * name() const;
     const char * value() const;
diff --git a/libkdenetwork/gpgmepp/signingresult.cpp b/libkdenetwork/gpgmepp/signingresult.cpp
index 6dab4d71d..6996eef7a 100644
--- a/libkdenetwork/gpgmepp/signingresult.cpp
+++ b/libkdenetwork/gpgmepp/signingresult.cpp
@@ -116,8 +116,8 @@ std::vector<GpgME::InvalidSigningKey> GpgME::SigningResult::invalidSigningKeys()
 
 
 
-GpgME::InvalidSigningKey::InvalidSigningKey( SigningResult::Private * tqparent, unsigned int i )
-  : d( tqparent ), idx( i )
+GpgME::InvalidSigningKey::InvalidSigningKey( SigningResult::Private * parent, unsigned int i )
+  : d( parent ), idx( i )
 {
   if ( d )
     d->ref();
@@ -165,8 +165,8 @@ GpgME::Error GpgME::InvalidSigningKey::reason() const {
 
 
 
-GpgME::CreatedSignature::CreatedSignature( SigningResult::Private * tqparent, unsigned int i )
-  : d( tqparent ), idx( i )
+GpgME::CreatedSignature::CreatedSignature( SigningResult::Private * parent, unsigned int i )
+  : d( parent ), idx( i )
 {
   if ( d )
     d->ref();
diff --git a/libkdenetwork/gpgmepp/signingresult.h b/libkdenetwork/gpgmepp/signingresult.h
index facf8979b..202d09b41 100644
--- a/libkdenetwork/gpgmepp/signingresult.h
+++ b/libkdenetwork/gpgmepp/signingresult.h
@@ -64,7 +64,7 @@ namespace GpgME {
 
   class KDE_EXPORT InvalidSigningKey {
     friend class SigningResult;
-    InvalidSigningKey( SigningResult::Private * tqparent, unsigned int index );
+    InvalidSigningKey( SigningResult::Private * parent, unsigned int index );
   public:
     InvalidSigningKey();
     InvalidSigningKey( const InvalidSigningKey & other );
@@ -86,7 +86,7 @@ namespace GpgME {
 
   class KDE_EXPORT CreatedSignature {
     friend class SigningResult;
-    CreatedSignature( SigningResult::Private * tqparent, unsigned int index );
+    CreatedSignature( SigningResult::Private * parent, unsigned int index );
   public:
     class Notation;
 
diff --git a/libkdenetwork/gpgmepp/verificationresult.cpp b/libkdenetwork/gpgmepp/verificationresult.cpp
index e4f905d83..757514d8c 100644
--- a/libkdenetwork/gpgmepp/verificationresult.cpp
+++ b/libkdenetwork/gpgmepp/verificationresult.cpp
@@ -121,8 +121,8 @@ std::vector<GpgME::Signature> GpgME::VerificationResult::signatures() const {
 
 
 
-GpgME::Signature::Signature( VerificationResult::Private * tqparent, unsigned int i )
-  : d( tqparent ), idx( i )
+GpgME::Signature::Signature( VerificationResult::Private * parent, unsigned int i )
+  : d( parent ), idx( i )
 {
   if ( d )
     d->ref();
@@ -253,8 +253,8 @@ std::vector<GpgME::Signature::Notation> GpgME::Signature::notations() const {
 }
 
 
-GpgME::Signature::Notation::Notation( VerificationResult::Private * tqparent, unsigned int sindex, unsigned int nindex )
-  : d( tqparent ), sidx( sindex ), nidx( nindex )
+GpgME::Signature::Notation::Notation( VerificationResult::Private * parent, unsigned int sindex, unsigned int nindex )
+  : d( parent ), sidx( sindex ), nidx( nindex )
 {
   if ( d )
     d->ref();
diff --git a/libkdenetwork/gpgmepp/verificationresult.h b/libkdenetwork/gpgmepp/verificationresult.h
index c5c14aab9..edcd02787 100644
--- a/libkdenetwork/gpgmepp/verificationresult.h
+++ b/libkdenetwork/gpgmepp/verificationresult.h
@@ -59,7 +59,7 @@ namespace GpgME {
 
   class KDE_EXPORT Signature {
     friend class VerificationResult;
-    Signature( VerificationResult::Private * tqparent, unsigned int index );
+    Signature( VerificationResult::Private * parent, unsigned int index );
   public:
     class Notation;
 
@@ -118,7 +118,7 @@ namespace GpgME {
 
   class KDE_EXPORT Signature::Notation {
     friend class Signature;
-    Notation( VerificationResult::Private * tqparent, unsigned int sindex, unsigned int nindex );
+    Notation( VerificationResult::Private * parent, unsigned int sindex, unsigned int nindex );
   public:
     Notation();
     Notation( const Notation & other );
diff --git a/libkdenetwork/libgpgme-copy/assuan/assuan-pipe-connect.c b/libkdenetwork/libgpgme-copy/assuan/assuan-pipe-connect.c
index a4dc17add..8ee9c748b 100644
--- a/libkdenetwork/libgpgme-copy/assuan/assuan-pipe-connect.c
+++ b/libkdenetwork/libgpgme-copy/assuan/assuan-pipe-connect.c
@@ -86,7 +86,7 @@ fix_signals (void)
       if (act.sa_handler == SIG_DFL)
 	{
 	  act.sa_handler = SIG_IGN;
-	  sigemptyset (&act.sa_tqmask);
+	  sigemptyset (&act.sa_mask);
 	  act.sa_flags = 0;
 	  sigaction (SIGPIPE, &act, NULL);
         }
@@ -337,7 +337,7 @@ pipe_connect_unix (assuan_context_t *ctx,
           unsetenv ("_assuan_connection_fd");
 
           execv (name, (char *const *) argv); 
-          /* oops - use the pipe to tell the tqparent about it */
+          /* oops - use the pipe to tell the parent about it */
           snprintf (errbuf, sizeof(errbuf)-1,
                     "ERR %d can't exec `%s': %.50s\n",
                     _assuan_error (ASSUAN_Problem_Starting_Server),
@@ -519,7 +519,7 @@ socketpair_connect (assuan_context_t *ctx,
             }
 
           execv (name, (char *const *) argv); 
-          /* oops - use the pipe to tell the tqparent about it */
+          /* oops - use the pipe to tell the parent about it */
           snprintf (errbuf, sizeof(errbuf)-1,
                     "ERR %d can't exec `%s': %.50s\n",
                     _assuan_error (ASSUAN_Problem_Starting_Server),
@@ -865,7 +865,7 @@ assuan_pipe_connect2 (assuan_context_t *ctx,
    If NAME as well as ARGV are NULL, no exec is done but the same
    process is continued.  However all file descriptors are closed and
    some special environment variables are set. To let the caller
-   detect whether the child or the tqparent continues, the child returns
+   detect whether the child or the parent continues, the child returns
    a CTX of NULL. */
 assuan_error_t
 assuan_pipe_connect_ext (assuan_context_t *ctx,
diff --git a/libkdenetwork/libgpgme-copy/gpgme/ChangeLog b/libkdenetwork/libgpgme-copy/gpgme/ChangeLog
index 4f1038fb3..85fd28d30 100644
--- a/libkdenetwork/libgpgme-copy/gpgme/ChangeLog
+++ b/libkdenetwork/libgpgme-copy/gpgme/ChangeLog
@@ -2648,11 +2648,11 @@
 
 2002-11-25  Marcus Brinkmann  <marcus@g10code.de>
 
-	* rungpg.c (_gpgme_gpg_spawn): Do not set tqparent fds to -1.
+	* rungpg.c (_gpgme_gpg_spawn): Do not set parent fds to -1.
 	* posix-io.c (_gpgme_io_spawn): Call _gpgme_io_close instead close
-	for tqparent fds.
+	for parent fds.
 	* w32-io.c (_gpgme_io_spawn): Call _gpgme_io_close instead
-	CloseHandle for tqparent fds.
+	CloseHandle for parent fds.
 
 2002-11-22  Marcus Brinkmann  <marcus@g10code.de>
 
@@ -4634,7 +4634,7 @@
 
 2001-11-23  Marcus Brinkmann  <marcus@g10code.de>
 
-	* engine-gpgsm.c (_gpgme_gpgsm_new): Set CLOEXEC flag for tqparent
+	* engine-gpgsm.c (_gpgme_gpgsm_new): Set CLOEXEC flag for parent
 	ends of the pipe.
 
 2001-11-22  Marcus Brinkmann  <marcus@g10code.de>
diff --git a/libkdenetwork/libgpgme-copy/gpgme/io.h b/libkdenetwork/libgpgme-copy/gpgme/io.h
index 33dc5d9a1..47b748f8b 100644
--- a/libkdenetwork/libgpgme-copy/gpgme/io.h
+++ b/libkdenetwork/libgpgme-copy/gpgme/io.h
@@ -50,7 +50,7 @@ int _gpgme_io_set_close_notify (int fd, void (*handler) (int, void *),
 int _gpgme_io_set_nonblocking (int fd);
 
 /* Spawn the executable PATH with ARGV as arguments, after forking
-   close all fds in FD_PARENT_LIST in the tqparent and close or dup all
+   close all fds in FD_PARENT_LIST in the parent and close or dup all
    fds in FD_CHILD_LIST in the child.  */
 int _gpgme_io_spawn (const char *path, char **argv,
 		     struct spawn_fd_item_s *fd_child_list,
diff --git a/libkdenetwork/libgpgme-copy/gpgme/memrchr.c b/libkdenetwork/libgpgme-copy/gpgme/memrchr.c
index 83d661695..4f91ef2bd 100644
--- a/libkdenetwork/libgpgme-copy/gpgme/memrchr.c
+++ b/libkdenetwork/libgpgme-copy/gpgme/memrchr.c
@@ -70,7 +70,7 @@ __memrchr (s, c_in, n)
 {
   const unsigned char *char_ptr;
   const unsigned long int *longword_ptr;
-  unsigned long int longword, magic_bits, chartqmask;
+  unsigned long int longword, magic_bits, charmask;
   unsigned reg_char c;
 
   c = (unsigned char) c_in;
@@ -109,10 +109,10 @@ __memrchr (s, c_in, n)
 #endif
 
   /* Set up a longword, each of whose bytes is C.  */
-  chartqmask = c | (c << 8);
-  chartqmask |= chartqmask << 16;
+  charmask = c | (c << 8);
+  charmask |= charmask << 16;
 #if LONG_MAX > LONG_MAX_32_BITS
-  chartqmask |= chartqmask << 32;
+  charmask |= charmask << 32;
 #endif
 
   /* Instead of the traditional loop which tests each character,
@@ -154,7 +154,7 @@ __memrchr (s, c_in, n)
 	 each of whose bytes is C.  This turns each byte that is C
 	 into a zero.  */
 
-      longword = *--longword_ptr ^ chartqmask;
+      longword = *--longword_ptr ^ charmask;
 
       /* Add MAGIC_BITS to LONGWORD.  */
       if ((((longword + magic_bits)
diff --git a/libkdenetwork/libgpgme-copy/gpgme/posix-io.c b/libkdenetwork/libgpgme-copy/gpgme/posix-io.c
index 3c9fa4b13..7f3b80e70 100644
--- a/libkdenetwork/libgpgme-copy/gpgme/posix-io.c
+++ b/libkdenetwork/libgpgme-copy/gpgme/posix-io.c
@@ -50,7 +50,7 @@ _gpgme_io_subsystem_init (void)
   if (act.sa_handler == SIG_DFL)
     {
       act.sa_handler = SIG_IGN;
-      sigemptyset (&act.sa_tqmask);
+      sigemptyset (&act.sa_mask);
       act.sa_flags = 0;
       sigaction (SIGPIPE, &act, NULL);
     }
@@ -299,7 +299,7 @@ _gpgme_io_spawn (const char *path, char **argv,
   if (status)
     return -1;
 
-  /* .dup_to is not used in the tqparent list.  */
+  /* .dup_to is not used in the parent list.  */
   for (i = 0; fd_parent_list[i].fd != -1; i++)
     _gpgme_io_close (fd_parent_list[i].fd);
 
diff --git a/libkdenetwork/libgpgme-copy/gpgme/priv-io.h b/libkdenetwork/libgpgme-copy/gpgme/priv-io.h
index 1d05ba03f..9a908570f 100644
--- a/libkdenetwork/libgpgme-copy/gpgme/priv-io.h
+++ b/libkdenetwork/libgpgme-copy/gpgme/priv-io.h
@@ -52,7 +52,7 @@ int _gpgme_io_set_close_notify (int fd, void (*handler) (int, void *),
 int _gpgme_io_set_nonblocking (int fd);
 
 /* Spawn the executable PATH with ARGV as arguments, after forking
-   close all fds in FD_PARENT_LIST in the tqparent and close or dup all
+   close all fds in FD_PARENT_LIST in the parent and close or dup all
    fds in FD_CHILD_LIST in the child.  */
 int _gpgme_io_spawn (const char *path, char **argv,
 		     struct spawn_fd_item_s *fd_child_list,
diff --git a/libkdenetwork/libgpgme-copy/gpgme/rungpg.c b/libkdenetwork/libgpgme-copy/gpgme/rungpg.c
index 1a25dac00..d09cdf3b6 100644
--- a/libkdenetwork/libgpgme-copy/gpgme/rungpg.c
+++ b/libkdenetwork/libgpgme-copy/gpgme/rungpg.c
@@ -1269,7 +1269,7 @@ start (engine_gpg_t gpg)
   fd_child_list[n].fd = -1;
   fd_child_list[n].dup_to = -1;
 
-  /* Build the fd list for the tqparent.  */
+  /* Build the fd list for the parent.  */
   n = 0;
   if (gpg->status.fd[1] != -1)
     {
diff --git a/libkdenetwork/qgpgme/eventloopinteractor.cpp b/libkdenetwork/qgpgme/eventloopinteractor.cpp
index a773860e1..fdf25af04 100644
--- a/libkdenetwork/qgpgme/eventloopinteractor.cpp
+++ b/libkdenetwork/qgpgme/eventloopinteractor.cpp
@@ -32,10 +32,10 @@
 
 using namespace GpgME;
 
-QGpgME::EventLoopInteractor::EventLoopInteractor( TQObject * tqparent, const char * name )
- : TQObject( tqparent, name ), GpgME::EventLoopInteractor()
+QGpgME::EventLoopInteractor::EventLoopInteractor( TQObject * parent, const char * name )
+ : TQObject( parent, name ), GpgME::EventLoopInteractor()
 {
-  if ( !tqparent )
+  if ( !parent )
     if ( tqApp ) {
       connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(deleteLater()) );
       connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SIGNAL(aboutToDestroy()) );
diff --git a/libkdenetwork/qgpgme/eventloopinteractor.h b/libkdenetwork/qgpgme/eventloopinteractor.h
index e1d514f5c..2a36993a0 100644
--- a/libkdenetwork/qgpgme/eventloopinteractor.h
+++ b/libkdenetwork/qgpgme/eventloopinteractor.h
@@ -39,7 +39,7 @@ namespace QGpgME {
     Q_OBJECT
   TQ_OBJECT
   protected:
-    EventLoopInteractor( TQObject * tqparent, const char * name=0 );
+    EventLoopInteractor( TQObject * parent, const char * name=0 );
   public:
     virtual ~EventLoopInteractor();