summaryrefslogtreecommitdiffstats
path: root/libtdenetwork
diff options
context:
space:
mode:
Diffstat (limited to 'libtdenetwork')
-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
-rw-r--r--libtdenetwork/libgpgme-copy/assuan/assuan.h4
-rw-r--r--libtdenetwork/libgpgme-copy/gpgme/ChangeLog6
-rw-r--r--libtdenetwork/libgpgme-copy/gpgme/engine-gpgsm.c4
-rw-r--r--libtdenetwork/libgpgme-copy/gpgme/gpgme.h2
8 files changed, 15 insertions, 15 deletions
diff --git a/libtdenetwork/gpgmepp/importresult.cpp b/libtdenetwork/gpgmepp/importresult.cpp
index 3b4b713c..d23c195e 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 61675a29..020ed0c4 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 13cd0a7e..cf70aaf0 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 15d09371..f05d372d 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;
diff --git a/libtdenetwork/libgpgme-copy/assuan/assuan.h b/libtdenetwork/libgpgme-copy/assuan/assuan.h
index 8d0a3960..cdf0445a 100644
--- a/libtdenetwork/libgpgme-copy/assuan/assuan.h
+++ b/libtdenetwork/libgpgme-copy/assuan/assuan.h
@@ -283,9 +283,9 @@ extern "C"
#define ASSUAN_Inquire_Error 121
#define ASSUAN_Invalid_Option 122
#define ASSUAN_Invalid_Index 123
-#define ASSUAN_Unexpected_tqStatus 124
+#define ASSUAN_Unexpected_Status 124
#define ASSUAN_Unexpected_Data 125
-#define ASSUAN_Invalid_tqStatus 126
+#define ASSUAN_Invalid_Status 126
#define ASSUAN_Locale_Problem 127
#endif
#define ASSUAN_Not_Confirmed 128
diff --git a/libtdenetwork/libgpgme-copy/gpgme/ChangeLog b/libtdenetwork/libgpgme-copy/gpgme/ChangeLog
index 85fd28d3..cb239393 100644
--- a/libtdenetwork/libgpgme-copy/gpgme/ChangeLog
+++ b/libtdenetwork/libgpgme-copy/gpgme/ChangeLog
@@ -1596,7 +1596,7 @@
(GpgmeSigNotation): Rename to gpgme_sig_notation_t.
(GpgmeSignature): Rename to gpgme_signature_t.
(GpgmeVerifyResult): Rename to gpgme_verify_result_t.
- (GpgmeImporttqStatus): Rename to gpgme_import_status_t.
+ (GpgmeImportStatus): Rename to gpgme_import_status_t.
(GpgmeImportResult): Rename to gpgme_import_result_t.
(GpgmeGenKeyResult): Rename to gpgme_genkey_result_t.
(GpgmeKeyListResult): Rename to gpgme_keylist_result_t.
@@ -1901,7 +1901,7 @@
GPGME_Unsupported_Algorithm, GPGME_Sig_Expired,
GPGME_Bad_Signature, GPGME_No_Public_Key added as new error codes.
(struct _gpgme_import_status): New structure.
- (GpgmeImporttqStatus): New type.
+ (GpgmeImportStatus): New type.
(struct _gpgme_op_import_result): New structure.
(GpgmeImportResult): New type.
(gpgme_op_import_result): New function.
@@ -2030,7 +2030,7 @@
(do_subsystem_inits): Do not call _gpgme_key_cache_init.
* mkstatus: Strip trailing comma.
- * gpgme.h (GpgmetqStatus): Pretty print.
+ * gpgme.h (GpgmeStatus): Pretty print.
* gpgme.h (GpgmeError): Rename GPGME_No_Passphrase to
GPGME_Bad_Passphrase.
diff --git a/libtdenetwork/libgpgme-copy/gpgme/engine-gpgsm.c b/libtdenetwork/libgpgme-copy/gpgme/engine-gpgsm.c
index 7ad8dc6f..1d536440 100644
--- a/libtdenetwork/libgpgme-copy/gpgme/engine-gpgsm.c
+++ b/libtdenetwork/libgpgme-copy/gpgme/engine-gpgsm.c
@@ -202,9 +202,9 @@ map_assuan_error (gpg_error_t err)
case ASSUAN_Inquire_Unknown:
case ASSUAN_Inquire_Error:
case ASSUAN_Invalid_Option:
- case ASSUAN_Unexpected_tqStatus:
+ case ASSUAN_Unexpected_Status:
case ASSUAN_Unexpected_Data:
- case ASSUAN_Invalid_tqStatus:
+ case ASSUAN_Invalid_Status:
return gpg_error (GPG_ERR_ASSUAN);
case ASSUAN_Invalid_Response:
diff --git a/libtdenetwork/libgpgme-copy/gpgme/gpgme.h b/libtdenetwork/libgpgme-copy/gpgme/gpgme.h
index f6f31ae2..e2d53c75 100644
--- a/libtdenetwork/libgpgme-copy/gpgme/gpgme.h
+++ b/libtdenetwork/libgpgme-copy/gpgme/gpgme.h
@@ -1694,7 +1694,7 @@ typedef gpgme_encrypt_result_t GpgmeEncryptResult _GPGME_DEPRECATED;
typedef gpgme_sig_notation_t GpgmeSigNotation _GPGME_DEPRECATED;
typedef gpgme_signature_t GpgmeSignature _GPGME_DEPRECATED;
typedef gpgme_verify_result_t GpgmeVerifyResult _GPGME_DEPRECATED;
-typedef gpgme_import_status_t GpgmeImportqStatus _GPGME_DEPRECATED;
+typedef gpgme_import_status_t GpgmeImporStatus _GPGME_DEPRECATED;
typedef gpgme_import_result_t GpgmeImportResult _GPGME_DEPRECATED;
typedef gpgme_genkey_result_t GpgmeGenKeyResult _GPGME_DEPRECATED;
typedef gpgme_trust_item_t GpgmeTrustItem _GPGME_DEPRECATED;