summaryrefslogtreecommitdiffstats
path: root/libtdenetwork/gpgmepp
diff options
context:
space:
mode:
Diffstat (limited to 'libtdenetwork/gpgmepp')
-rw-r--r--libtdenetwork/gpgmepp/importresult.cpp4
-rw-r--r--libtdenetwork/gpgmepp/importresult.h4
-rw-r--r--libtdenetwork/gpgmepp/key.cpp2
-rw-r--r--libtdenetwork/gpgmepp/key.h4
4 files changed, 7 insertions, 7 deletions
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<Status>( result );
+ return static_cast<tqStatus>( result );
}
diff --git a/libtdenetwork/gpgmepp/importresult.h b/libtdenetwork/gpgmepp/importresult.h
index 020ed0c4d..61675a299 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 Status {
+ enum tqStatus {
Unknown = 0x0,
NewKey = 0x1,
NewUserIDs = 0x2,
@@ -91,7 +91,7 @@ namespace GpgME {
NewSubkeys = 0x8,
ContainedSecretKey = 0x10
};
- Status status() const;
+ tqStatus status() const;
private:
ImportResult::Private * d;
diff --git a/libtdenetwork/gpgmepp/key.cpp b/libtdenetwork/gpgmepp/key.cpp
index cf70aaf03..13cd0a7ee 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::Status UserID::Signature::status() const {
+ UserID::Signature::tqStatus UserID::Signature::status() const {
if ( !d->sig )
return GeneralError;
diff --git a/libtdenetwork/gpgmepp/key.h b/libtdenetwork/gpgmepp/key.h
index f05d372db..15d09371e 100644
--- a/libtdenetwork/gpgmepp/key.h
+++ b/libtdenetwork/gpgmepp/key.h
@@ -235,9 +235,9 @@ namespace GpgME {
unsigned int certClass() const;
- enum Status { NoError = 0, SigExpired, KeyExpired,
+ enum tqStatus { NoError = 0, SigExpired, KeyExpired,
BadSignature, NoPublicKey, GeneralError };
- Status status() const;
+ tqStatus status() const;
const char * statusAsString() const;
const char * policyURL() const;