Initial conversion of kdepim to TQt

This will probably require some tweaking before it will build under Qt4,
however Qt3 builds are OK.  Any alterations this commit makes to kdepim
behaviour under Qt3 are unintentional and should be fixed.


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 files changed, 16 insertions, 16 deletions

diff --git a/libkdenetwork/libgpgme-copy/assuan/ChangeLog b/libkdenetwork/libgpgme-copy/assuan/ChangeLog
index a3b3f9281..b53ac7fd3 100644
--- a/libkdenetwork/libgpgme-copy/assuan/ChangeLog
+++ b/libkdenetwork/libgpgme-copy/assuan/ChangeLog
@@ -261,9 +261,9 @@
 	
 	* assuan.h [_ASSUAN_EXT_SYM_PREFIX]: New.
 	* assuan-io.c [_ASSUAN_NO_PTH]: New.
-	* assuan-pipe-connect.c (fix_signals) [_ASSUAN_NO_FIXED_SIGNALS]: New.
+	* assuan-pipe-connect.c (fix_Q_SIGNALS) [_ASSUAN_NO_FIXED_SIGNALS]: New.
 	(assuan_pipe_connect2) [_ASSUAN_USE_DOUBLE_FORK]: Use double fork.
-	(fix_signals) [_ASSUAN_USE_DOUBLE_FORK]: Do not wait..
+	(fix_Q_SIGNALS) [_ASSUAN_USE_DOUBLE_FORK]: Do not wait..
 	* assuan-logging.c, assuan-io.c: Include config.h
 	Replaced all usages of _WIN32 by the new HAVE_W32_SYSTEM because
 	there is nothing winning in this API.
@@ -271,7 +271,7 @@
 	error Not Imlemented.
 	* assuan-logging.c (_assuan_w32_strerror): New. 
 	* assuan-defs.h (w32_strerror): new.
-	* assuan-pipe-connect.c (assuan_pipe_connect2, fix_signals):
+	* assuan-pipe-connect.c (assuan_pipe_connect2, fix_Q_SIGNALS):
 	Factored signal code out to new function.
 	(build_w32_commandline, create_inheritable_pipe): New.  Taken
 	from gnupg 1.9.
diff --git a/libkdenetwork/libgpgme-copy/assuan/assuan-buffer.c b/libkdenetwork/libgpgme-copy/assuan/assuan-buffer.c
index 3f8730aab..7a1879877 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 tqcontains more than one line.  We copy it to the attic
+	/* LINE contains more than one line.  We copy it to the attic
 	   now as handlers are allowed to modify the passed
 	   buffer.  */
 	{
@@ -488,7 +488,7 @@ _assuan_cookie_write_flush (void *cookie)
  * data out @buffer may be passed as NULL (in which case @length must
  * also be 0); however when used by a client this flush operation does
  * also send the terminating "END" command to terminate the reponse on
- * a INQUIRE response.  However, when assuan_transact() is used, this
+ * a INTQUIRE response.  However, when assuan_transact() is used, this
  * function takes care of sending END itself.
  * 
  * Return value: 0 on success or an error code
diff --git a/libkdenetwork/libgpgme-copy/assuan/assuan-defs.h b/libkdenetwork/libgpgme-copy/assuan/assuan-defs.h
index 94fbb41ba..9ee417a92 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 tqreplacement functions.  */
+/* Prototypes for replacement functions.  */
 #ifndef HAVE_MEMRCHR
 void *memrchr (const void *block, int c, size_t size);
 #endif
diff --git a/libkdenetwork/libgpgme-copy/assuan/assuan-inquire.c b/libkdenetwork/libgpgme-copy/assuan/assuan-inquire.c
index d8c52d09a..897e0773b 100644
--- a/libkdenetwork/libgpgme-copy/assuan/assuan-inquire.c
+++ b/libkdenetwork/libgpgme-copy/assuan/assuan-inquire.c
@@ -141,7 +141,7 @@ assuan_inquire (assuan_context_t ctx, const char *keyword,
 {
   assuan_error_t rc;
   struct membuf mb;
-  char cmdbuf[LINELENGTH-10]; /* (10 = strlen ("INQUIRE ")+CR,LF) */
+  char cmdbuf[LINELENGTH-10]; /* (10 = strlen ("INTQUIRE ")+CR,LF) */
   unsigned char *line, *p;
   int linelen;
   int nodataexpected;
@@ -162,7 +162,7 @@ assuan_inquire (assuan_context_t ctx, const char *keyword,
   else
     init_membuf (&mb, maxlen? maxlen:1024, maxlen);
 
-  strcpy (stpcpy (cmdbuf, "INQUIRE "), keyword);
+  strcpy (stpcpy (cmdbuf, "INTQUIRE "), keyword);
   rc = assuan_write_line (ctx, cmdbuf);
   if (rc)
     goto leave;
diff --git a/libkdenetwork/libgpgme-copy/assuan/assuan-pipe-connect.c b/libkdenetwork/libgpgme-copy/assuan/assuan-pipe-connect.c
index 518dc20b1..ebae5ea38 100644
--- a/libkdenetwork/libgpgme-copy/assuan/assuan-pipe-connect.c
+++ b/libkdenetwork/libgpgme-copy/assuan/assuan-pipe-connect.c
@@ -325,7 +325,7 @@ pipe_connect_unix (assuan_context_t *ctx,
             }
           errno = 0;
 
-          /* We store our parents pid in the environment so that the
+          /* We store our tqparents pid in the environment so that the
              execed assuan server is able to read the actual pid of the
              client.  The server can't use getppid because it might have
              been double forked before the assuan server has been
@@ -337,7 +337,7 @@ pipe_connect_unix (assuan_context_t *ctx,
           unsetenv ("_assuan_connection_fd");
 
           execv (name, (char *const *) argv); 
-          /* oops - use the pipe to tell the parent about it */
+          /* oops - use the pipe to tell the tqparent about it */
           snprintf (errbuf, sizeof(errbuf)-1,
                     "ERR %d can't exec `%s': %.50s\n",
                     _assuan_error (ASSUAN_Problem_Starting_Server),
@@ -493,7 +493,7 @@ socketpair_connect (assuan_context_t *ctx,
             }
           errno = 0;
 
-          /* We store our parents pid in the environment so that the
+          /* We store our tqparents pid in the environment so that the
              execed assuan server is able to read the actual pid of the
              client.  The server can't use getppid becuase it might have
              been double forked before the assuan server has been
@@ -519,7 +519,7 @@ socketpair_connect (assuan_context_t *ctx,
             }
 
           execv (name, (char *const *) argv); 
-          /* oops - use the pipe to tell the parent about it */
+          /* oops - use the pipe to tell the tqparent about it */
           snprintf (errbuf, sizeof(errbuf)-1,
                     "ERR %d can't exec `%s': %.50s\n",
                     _assuan_error (ASSUAN_Problem_Starting_Server),
@@ -865,7 +865,7 @@ assuan_pipe_connect2 (assuan_context_t *ctx,
    If NAME as well as ARGV are NULL, no exec is done but the same
    process is continued.  However all file descriptors are closed and
    some special environment variables are set. To let the caller
-   detect whether the child or the parent continues, the child returns
+   detect whether the child or the tqparent continues, the child returns
    a CTX of NULL. */
 assuan_error_t
 assuan_pipe_connect_ext (assuan_context_t *ctx,
diff --git a/libkdenetwork/libgpgme-copy/assuan/assuan-uds.c b/libkdenetwork/libgpgme-copy/assuan/assuan-uds.c
index 975d2f2f3..e9e81016c 100644
--- a/libkdenetwork/libgpgme-copy/assuan/assuan-uds.c
+++ b/libkdenetwork/libgpgme-copy/assuan/assuan-uds.c
@@ -45,7 +45,7 @@
 #include "assuan-defs.h"
 
 #ifdef USE_DESCRIPTOR_PASSING
-/* Provide tqreplacement for missing CMSG maccros.  We assume that
+/* Provide replacement 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
diff --git a/libkdenetwork/libgpgme-copy/assuan/assuan.h b/libkdenetwork/libgpgme-copy/assuan/assuan.h
index 80c8d6b34..3ae24248b 100644
--- a/libkdenetwork/libgpgme-copy/assuan/assuan.h
+++ b/libkdenetwork/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_Status 124
+#define  ASSUAN_Unexpected_tqStatus 124
 #define  ASSUAN_Unexpected_Data 125
-#define  ASSUAN_Invalid_Status 126
+#define  ASSUAN_Invalid_tqStatus 126
 #define  ASSUAN_Locale_Problem 127
 #endif
 #define  ASSUAN_Not_Confirmed 128