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

10 files changed, 26 insertions, 26 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 );