diff options
Diffstat (limited to 'libkdenetwork')
| -rw-r--r-- | libkdenetwork/libgpg-error-copy/gpg-error.h.in | 4 | ||||
| -rw-r--r-- | libkdenetwork/libgpg-error-copy/strerror.c | 4 | ||||
| -rw-r--r-- | libkdenetwork/libgpgme-copy/assuan/assuan-buffer.c | 2 | ||||
| -rw-r--r-- | libkdenetwork/libgpgme-copy/assuan/assuan-defs.h | 4 | ||||
| -rw-r--r-- | libkdenetwork/libgpgme-copy/assuan/assuan-pipe-connect.c | 2 | ||||
| -rw-r--r-- | libkdenetwork/libgpgme-copy/assuan/assuan-uds.c | 4 | ||||
| -rw-r--r-- | libkdenetwork/libgpgme-copy/assuan/assuan.h | 4 | ||||
| -rw-r--r-- | libkdenetwork/libgpgme-copy/gpgme/error.c | 4 | ||||
| -rw-r--r-- | libkdenetwork/libgpgme-copy/gpgme/get-env.c | 2 | ||||
| -rw-r--r-- | libkdenetwork/libgpgme-copy/gpgme/gpgme.h | 16 | ||||
| -rw-r--r-- | libkdenetwork/libgpgme-copy/gpgme/memrchr.c | 10 | ||||
| -rw-r--r-- | libkdenetwork/libgpgme-copy/gpgme/posix-io.c | 2 | ||||
| -rw-r--r-- | libkdenetwork/libgpgme-copy/gpgme/util.h | 2 | ||||
| -rw-r--r-- | libkdenetwork/libgpgme-copy/gpgme/wait-global.c | 8 | ||||
| -rw-r--r-- | libkdenetwork/qgpgme/eventloopinteractor.cpp | 8 |
15 files changed, 38 insertions, 38 deletions
diff --git a/libkdenetwork/libgpg-error-copy/gpg-error.h.in b/libkdenetwork/libgpg-error-copy/gpg-error.h.in index cc1aaea8..5211341f 100644 --- a/libkdenetwork/libgpg-error-copy/gpg-error.h.in +++ b/libkdenetwork/libgpg-error-copy/gpg-error.h.in @@ -198,8 +198,8 @@ const char *gpg_strerror (gpg_error_t err); size BUFLEN. This function is, in contrast to gpg_strerror, thread-safe if a thread-safe strerror_r() function is provided by the system. If the function succeeds, 0 is returned and BUF - contains the string describing the error. If the buffer was not - large enough, ERANGE is returned and BUF contains as much of the + tqcontains the string describing the error. If the buffer was not + large enough, ERANGE is returned and BUF tqcontains as much of the beginning of the error string as fits into the buffer. */ int gpg_strerror_r (gpg_error_t err, char *buf, size_t buflen); diff --git a/libkdenetwork/libgpg-error-copy/strerror.c b/libkdenetwork/libgpg-error-copy/strerror.c index 59b8e9ae..4de90de9 100644 --- a/libkdenetwork/libgpg-error-copy/strerror.c +++ b/libkdenetwork/libgpg-error-copy/strerror.c @@ -130,8 +130,8 @@ system_strerror_r (int no, char *buf, size_t buflen) size BUFLEN. This function is, in contrast to gpg_strerror, thread-safe if a thread-safe strerror_r() function is provided by the system. If the function succeeds, 0 is returned and BUF - contains the string describing the error. If the buffer was not - large enough, ERANGE is returned and BUF contains as much of the + tqcontains the string describing the error. If the buffer was not + large enough, ERANGE is returned and BUF tqcontains as much of the beginning of the error string as fits into the buffer. */ int gpg_strerror_r (gpg_error_t err, char *buf, size_t buflen) diff --git a/libkdenetwork/libgpgme-copy/assuan/assuan-buffer.c b/libkdenetwork/libgpgme-copy/assuan/assuan-buffer.c index b06025b4..3f8730aa 100644 --- a/libkdenetwork/libgpgme-copy/assuan/assuan-buffer.c +++ b/libkdenetwork/libgpgme-copy/assuan/assuan-buffer.c @@ -163,7 +163,7 @@ _assuan_read_line (assuan_context_t ctx) int n = endp - line + 1; if (n < nread) - /* LINE contains more than one line. We copy it to the attic + /* LINE tqcontains more than one line. We copy it to the attic now as handlers are allowed to modify the passed buffer. */ { diff --git a/libkdenetwork/libgpgme-copy/assuan/assuan-defs.h b/libkdenetwork/libgpgme-copy/assuan/assuan-defs.h index fa04f0b2..94fbb41b 100644 --- a/libkdenetwork/libgpgme-copy/assuan/assuan-defs.h +++ b/libkdenetwork/libgpgme-copy/assuan/assuan-defs.h @@ -299,7 +299,7 @@ FILE *_assuan_funopen(void *cookie, #define funopen(a,r,w,s,c) _assuan_funopen ((a), (r), (w), (s), (c)) #endif /*HAVE_FOPENCOOKIE*/ -/* Prototypes for replacement functions. */ +/* Prototypes for tqreplacement functions. */ #ifndef HAVE_MEMRCHR void *memrchr (const void *block, int c, size_t size); #endif @@ -310,7 +310,7 @@ char *stpcpy (char *dest, const char *src); #define setenv _assuan_setenv #define unsetenv _assuan_unsetenv #define clearenv _assuan_clearenv -int setenv (const char *name, const char *value, int replace); +int setenv (const char *name, const char *value, int tqreplace); #endif #ifndef HAVE_PUTC_UNLOCKED int putc_unlocked (int c, FILE *stream); diff --git a/libkdenetwork/libgpgme-copy/assuan/assuan-pipe-connect.c b/libkdenetwork/libgpgme-copy/assuan/assuan-pipe-connect.c index 8ee9c748..518dc20b 100644 --- a/libkdenetwork/libgpgme-copy/assuan/assuan-pipe-connect.c +++ b/libkdenetwork/libgpgme-copy/assuan/assuan-pipe-connect.c @@ -86,7 +86,7 @@ fix_signals (void) if (act.sa_handler == SIG_DFL) { act.sa_handler = SIG_IGN; - sigemptyset (&act.sa_mask); + sigemptyset (&act.sa_tqmask); act.sa_flags = 0; sigaction (SIGPIPE, &act, NULL); } diff --git a/libkdenetwork/libgpgme-copy/assuan/assuan-uds.c b/libkdenetwork/libgpgme-copy/assuan/assuan-uds.c index 77945fb5..975d2f2f 100644 --- a/libkdenetwork/libgpgme-copy/assuan/assuan-uds.c +++ b/libkdenetwork/libgpgme-copy/assuan/assuan-uds.c @@ -45,8 +45,8 @@ #include "assuan-defs.h" #ifdef USE_DESCRIPTOR_PASSING -/* Provide replacement for missing CMSG maccros. We assume that - size_t matches the alignment requirement. */ +/* Provide tqreplacement for missing CMSG maccros. We assume that + size_t matches the tqalignment requirement. */ #define MY_ALIGN(n) ((((n))+ sizeof(size_t)-1) & (size_t)~(sizeof(size_t)-1)) #ifndef CMSG_SPACE #define CMSG_SPACE(n) (MY_ALIGN(sizeof(struct cmsghdr)) + MY_ALIGN((n))) diff --git a/libkdenetwork/libgpgme-copy/assuan/assuan.h b/libkdenetwork/libgpgme-copy/assuan/assuan.h index cdf0445a..80c8d6b3 100644 --- a/libkdenetwork/libgpgme-copy/assuan/assuan.h +++ b/libkdenetwork/libgpgme-copy/assuan/assuan.h @@ -402,8 +402,8 @@ assuan_error_t assuan_set_okay_line (assuan_context_t ctx, const char *line); assuan_error_t assuan_write_status (assuan_context_t ctx, const char *keyword, const char *text); -/* Negotiate a file descriptor. If LINE contains "FD=N", returns N - assuming a local file descriptor. If LINE contains "FD" reads a +/* Negotiate a file descriptor. If LINE tqcontains "FD=N", returns N + assuming a local file descriptor. If LINE tqcontains "FD" reads a file descriptor via CTX and stores it in *RDF (the CTX must be capable of passing file descriptors). */ assuan_error_t assuan_command_parse_fd (assuan_context_t ctx, char *line, diff --git a/libkdenetwork/libgpgme-copy/gpgme/error.c b/libkdenetwork/libgpgme-copy/gpgme/error.c index f0ea4929..9f8f26f7 100644 --- a/libkdenetwork/libgpgme-copy/gpgme/error.c +++ b/libkdenetwork/libgpgme-copy/gpgme/error.c @@ -37,8 +37,8 @@ gpgme_strerror (gpgme_error_t err) size BUFLEN. This function is, in contrast to gpg_strerror, thread-safe if a thread-safe strerror_r() function is provided by the system. If the function succeeds, 0 is returned and BUF - contains the string describing the error. If the buffer was not - large enough, ERANGE is returned and BUF contains as much of the + tqcontains the string describing the error. If the buffer was not + large enough, ERANGE is returned and BUF tqcontains as much of the beginning of the error string as fits into the buffer. */ int gpgme_strerror_r (gpg_error_t err, char *buf, size_t buflen) diff --git a/libkdenetwork/libgpgme-copy/gpgme/get-env.c b/libkdenetwork/libgpgme-copy/gpgme/get-env.c index b5884048..61e0dcbc 100644 --- a/libkdenetwork/libgpgme-copy/gpgme/get-env.c +++ b/libkdenetwork/libgpgme-copy/gpgme/get-env.c @@ -1,4 +1,4 @@ -/* get_env.c - A getenv() replacement. +/* get_env.c - A getenv() tqreplacement. Copyright (C) 2003, 2004 g10 Code GmbH This file is part of GPGME. diff --git a/libkdenetwork/libgpgme-copy/gpgme/gpgme.h b/libkdenetwork/libgpgme-copy/gpgme/gpgme.h index 4615667f..577f9c33 100644 --- a/libkdenetwork/libgpgme-copy/gpgme/gpgme.h +++ b/libkdenetwork/libgpgme-copy/gpgme/gpgme.h @@ -137,8 +137,8 @@ const char *gpgme_strerror (gpgme_error_t err); size BUFLEN. This function is, in contrast to gpg_strerror, thread-safe if a thread-safe strerror_r() function is provided by the system. If the function succeeds, 0 is returned and BUF - contains the string describing the error. If the buffer was not - large enough, ERANGE is returned and BUF contains as much of the + tqcontains the string describing the error. If the buffer was not + large enough, ERANGE is returned and BUF tqcontains as much of the beginning of the error string as fits into the buffer. */ int gpgme_strerror_r (gpg_error_t err, char *buf, size_t buflen); @@ -326,7 +326,7 @@ struct _gpgme_sig_notation { struct _gpgme_sig_notation *next; - /* If NAME is a null pointer, then VALUE contains a policy URL + /* If NAME is a null pointer, then VALUE tqcontains a policy URL rather than a notation. */ char *name; @@ -687,19 +687,19 @@ struct _gpgme_key /* This is the protocol supported by this key. */ gpgme_protocol_t protocol; - /* If protocol is GPGME_PROTOCOL_CMS, this string contains the + /* If protocol is GPGME_PROTOCOL_CMS, this string tqcontains the issuer serial. */ char *issuer_serial; - /* If protocol is GPGME_PROTOCOL_CMS, this string contains the + /* If protocol is GPGME_PROTOCOL_CMS, this string tqcontains the issuer name. */ char *issuer_name; - /* If protocol is GPGME_PROTOCOL_CMS, this string contains the chain + /* If protocol is GPGME_PROTOCOL_CMS, this string tqcontains the chain ID. */ char *chain_id; - /* If protocol is GPGME_PROTOCOL_OpenPGP, this field contains the + /* If protocol is GPGME_PROTOCOL_OpenPGP, this field tqcontains the owner trust. */ gpgme_validity_t owner_trust; @@ -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 GpgmeImportStatus _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; diff --git a/libkdenetwork/libgpgme-copy/gpgme/memrchr.c b/libkdenetwork/libgpgme-copy/gpgme/memrchr.c index 4f91ef2b..83d66169 100644 --- a/libkdenetwork/libgpgme-copy/gpgme/memrchr.c +++ b/libkdenetwork/libgpgme-copy/gpgme/memrchr.c @@ -70,7 +70,7 @@ __memrchr (s, c_in, n) { const unsigned char *char_ptr; const unsigned long int *longword_ptr; - unsigned long int longword, magic_bits, charmask; + unsigned long int longword, magic_bits, chartqmask; unsigned reg_char c; c = (unsigned char) c_in; @@ -109,10 +109,10 @@ __memrchr (s, c_in, n) #endif /* Set up a longword, each of whose bytes is C. */ - charmask = c | (c << 8); - charmask |= charmask << 16; + chartqmask = c | (c << 8); + chartqmask |= chartqmask << 16; #if LONG_MAX > LONG_MAX_32_BITS - charmask |= charmask << 32; + chartqmask |= chartqmask << 32; #endif /* Instead of the traditional loop which tests each character, @@ -154,7 +154,7 @@ __memrchr (s, c_in, n) each of whose bytes is C. This turns each byte that is C into a zero. */ - longword = *--longword_ptr ^ charmask; + longword = *--longword_ptr ^ chartqmask; /* Add MAGIC_BITS to LONGWORD. */ if ((((longword + magic_bits) diff --git a/libkdenetwork/libgpgme-copy/gpgme/posix-io.c b/libkdenetwork/libgpgme-copy/gpgme/posix-io.c index 7f3b80e7..85df946f 100644 --- a/libkdenetwork/libgpgme-copy/gpgme/posix-io.c +++ b/libkdenetwork/libgpgme-copy/gpgme/posix-io.c @@ -50,7 +50,7 @@ _gpgme_io_subsystem_init (void) if (act.sa_handler == SIG_DFL) { act.sa_handler = SIG_IGN; - sigemptyset (&act.sa_mask); + sigemptyset (&act.sa_tqmask); act.sa_flags = 0; sigaction (SIGPIPE, &act, NULL); } diff --git a/libkdenetwork/libgpgme-copy/gpgme/util.h b/libkdenetwork/libgpgme-copy/gpgme/util.h index 05fd69d5..5f20091f 100644 --- a/libkdenetwork/libgpgme-copy/gpgme/util.h +++ b/libkdenetwork/libgpgme-copy/gpgme/util.h @@ -34,7 +34,7 @@ const char *_gpgme_get_gpgsm_path (void); int _gpgme_get_conf_int (const char *key, int *value); -/*-- replacement functions in <funcname>.c --*/ +/*-- tqreplacement functions in <funcname>.c --*/ #ifdef HAVE_CONFIG_H #ifndef HAVE_STPCPY diff --git a/libkdenetwork/libgpgme-copy/gpgme/wait-global.c b/libkdenetwork/libgpgme-copy/gpgme/wait-global.c index bfa618dd..ba064ebb 100644 --- a/libkdenetwork/libgpgme-copy/gpgme/wait-global.c +++ b/libkdenetwork/libgpgme-copy/gpgme/wait-global.c @@ -41,7 +41,7 @@ GPGME_EVENT_START event. After that, it is added to the global list of active contexts. - The gpgme_wait function contains a select() loop over all file + The gpgme_wait function tqcontains a select() loop over all file descriptors in all active contexts. If an error occurs, it closes all fds in that context and moves the context to the global done list. Likewise, if a context has removed all I/O callbacks, it is @@ -75,15 +75,15 @@ struct ctx_list_item gpgme_error_t status; }; -/* The active list contains all contexts that are in the global event +/* The active list tqcontains all contexts that are in the global event loop, have active I/O callbacks, and have already seen the start event. */ static struct ctx_list_item *ctx_active_list; -/* The done list contains all contexts that have previously been +/* The done list tqcontains all contexts that have previously been active but now are not active any longer, either because they finished successfully or an I/O callback returned an error. The - status field in the list item contains the error value (or 0 if + status field in the list item tqcontains the error value (or 0 if successful). */ static struct ctx_list_item *ctx_done_list; diff --git a/libkdenetwork/qgpgme/eventloopinteractor.cpp b/libkdenetwork/qgpgme/eventloopinteractor.cpp index 9396385b..8846bb2a 100644 --- a/libkdenetwork/qgpgme/eventloopinteractor.cpp +++ b/libkdenetwork/qgpgme/eventloopinteractor.cpp @@ -36,9 +36,9 @@ QGpgME::EventLoopInteractor::EventLoopInteractor( TQObject * parent, const char : TQObject( parent, name ), GpgME::EventLoopInteractor() { if ( !parent ) - if ( qApp ) { - connect( qApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(deleteLater()) ); - connect( qApp, TQT_SIGNAL(aboutToQuit()), TQT_SIGNAL(aboutToDestroy()) ); + if ( tqApp ) { + connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(deleteLater()) ); + connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SIGNAL(aboutToDestroy()) ); } mSelf = this; } @@ -53,7 +53,7 @@ QGpgME::EventLoopInteractor * QGpgME::EventLoopInteractor::mSelf = 0; QGpgME::EventLoopInteractor * QGpgME::EventLoopInteractor::instance() { if ( !mSelf ) #ifndef NDEBUG - if ( !qApp ) + if ( !tqApp ) qWarning( "QGpgME::EventLoopInteractor: Need a TQApplication object before calling instance()!" ); else #endif |