From 9cc13dcbb01a96c9e60a07ca63c61d24b374f50d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:59:50 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12. --- libtdenetwork/gpgmepp/importresult.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libtdenetwork/gpgmepp/importresult.cpp') diff --git a/libtdenetwork/gpgmepp/importresult.cpp b/libtdenetwork/gpgmepp/importresult.cpp index d23c195e3..3b4b713c7 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::Status GpgME::Import::status() const { +GpgME::Import::tqStatus GpgME::Import::status() const { if ( isNull() ) return Unknown; unsigned int s = d->imports[idx]->status; @@ -200,5 +200,5 @@ GpgME::Import::Status 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( result ); + return static_cast( result ); } -- cgit v1.2.1