From 0e00c0a86a4c9d7e80c7b66d91940cc7dcb79f78 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 18 Dec 2011 18:34:45 -0600
Subject: Rename old tq methods that no longer need a unique name

---
 libtdenetwork/gpgmepp/importresult.cpp | 4 ++--
 libtdenetwork/gpgmepp/importresult.h   | 4 ++--
 libtdenetwork/gpgmepp/key.cpp          | 2 +-
 libtdenetwork/gpgmepp/key.h            | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'libtdenetwork/gpgmepp')

diff --git a/libtdenetwork/gpgmepp/importresult.cpp b/libtdenetwork/gpgmepp/importresult.cpp
index 3b4b713c7..d23c195e3 100644
--- a/libtdenetwork/gpgmepp/importresult.cpp
+++ b/libtdenetwork/gpgmepp/importresult.cpp
@@ -190,7 +190,7 @@ GpgME::Error GpgME::Import::error() const {
   return isNull() ? 0 : d->imports[idx]->result ;
 }
 
-GpgME::Import::tqStatus GpgME::Import::status() const {
+GpgME::Import::Status GpgME::Import::status() const {
   if ( isNull() )
     return Unknown;
   unsigned int s = d->imports[idx]->status;
@@ -200,5 +200,5 @@ GpgME::Import::tqStatus GpgME::Import::status() const {
   if ( s & GPGME_IMPORT_SIG )    result |= NewSignatures;
   if ( s & GPGME_IMPORT_SUBKEY ) result |= NewSubkeys;
   if ( s & GPGME_IMPORT_SECRET ) result |= ContainedSecretKey;
-  return static_cast<tqStatus>( result );
+  return static_cast<Status>( result );
 }
diff --git a/libtdenetwork/gpgmepp/importresult.h b/libtdenetwork/gpgmepp/importresult.h
index 61675a299..020ed0c4d 100644
--- a/libtdenetwork/gpgmepp/importresult.h
+++ b/libtdenetwork/gpgmepp/importresult.h
@@ -83,7 +83,7 @@ namespace GpgME {
     const char * fingerprint() const;
     Error error() const;
 
-    enum tqStatus {
+    enum Status {
       Unknown = 0x0,
       NewKey = 0x1,
       NewUserIDs = 0x2,
@@ -91,7 +91,7 @@ namespace GpgME {
       NewSubkeys = 0x8,
       ContainedSecretKey = 0x10
     };
-    tqStatus status() const;
+    Status status() const;
 
   private:
     ImportResult::Private * d;
diff --git a/libtdenetwork/gpgmepp/key.cpp b/libtdenetwork/gpgmepp/key.cpp
index 13cd0a7ee..cf70aaf03 100644
--- a/libtdenetwork/gpgmepp/key.cpp
+++ b/libtdenetwork/gpgmepp/key.cpp
@@ -733,7 +733,7 @@ namespace GpgME {
     return d->sig ? d->sig->sig_class : 0 ;
   }
 
-  UserID::Signature::tqStatus UserID::Signature::status() const {
+  UserID::Signature::Status UserID::Signature::status() const {
     if ( !d->sig )
       return GeneralError;
 
diff --git a/libtdenetwork/gpgmepp/key.h b/libtdenetwork/gpgmepp/key.h
index 15d09371e..f05d372db 100644
--- a/libtdenetwork/gpgmepp/key.h
+++ b/libtdenetwork/gpgmepp/key.h
@@ -235,9 +235,9 @@ namespace GpgME {
 
     unsigned int certClass() const;
 
-    enum tqStatus { NoError = 0, SigExpired, KeyExpired,
+    enum Status { NoError = 0, SigExpired, KeyExpired,
 		  BadSignature, NoPublicKey, GeneralError };
-    tqStatus status() const;
+    Status status() const;
     const char * statusAsString() const;
 
     const char * policyURL() const;
-- 
cgit v1.2.1