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

1 files changed, 10 insertions, 10 deletions

diff --git a/libkcal/versit/vobject.c b/libkcal/versit/vobject.c
index e6a194728..e52cecbef 100644
--- a/libkcal/versit/vobject.c
+++ b/libkcal/versit/vobject.c
@@ -21,7 +21,7 @@ ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR
 MODIFICATIONS.                                                                 
                                                                                
 IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT,              
-INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT         
+INDIRECT, SPECIAL OR CONSETQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT         
 OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH         
 DAMAGE.                                                                        
                                                                                
@@ -867,7 +867,7 @@ static struct PreDefProp propNames[] = {
     { VCPronunciationProp, 0, 0, 0 },
     { VCPSProp, 0, 0, 0 },
     { VCPublicKeyProp, 0, 0, 0 },
-    { VCQPProp, VCQuotedPrintableProp, 0, 0 },
+    { VCTQPProp, VCQuotedPrintableProp, 0, 0 },
     { VCQuickTimeProp, 0, 0, 0 },
     { VCQuotedPrintableProp, 0, 0, 0 },
     { VCRDateProp, 0, 0, 0 },
@@ -1106,7 +1106,7 @@ static int writeBase64(OFile *fp, unsigned char *s, long len)
     unsigned long trip;
     unsigned char b;
     char quad[5];
-#define MAXQUADS 16
+#define MAXTQUADS 16
 
     quad[4] = 0;
 
@@ -1133,8 +1133,8 @@ static int writeBase64(OFile *fp, unsigned char *s, long len)
 	/* now output 'quad' with appropriate whitespace and line ending */
 	appendsOFile(fp, (numQuads == 0 ? "    " : ""));
 	appendsOFile(fp, quad);
-	appendsOFile(fp, ((cur >= len)?"\n" :(numQuads==MAXQUADS-1?"\n" : "")));
-	numQuads = (numQuads + 1) % MAXQUADS;
+	appendsOFile(fp, ((cur >= len)?"\n" :(numQuads==MAXTQUADS-1?"\n" : "")));
+	numQuads = (numQuads + 1) % MAXTQUADS;
 	}
     appendcOFile(fp,'\n');
 
@@ -1142,7 +1142,7 @@ static int writeBase64(OFile *fp, unsigned char *s, long len)
 }
 
 /* this function really sucks.  Too basic. */
-static void writeQPString(OFile *fp, const char *s, int qp)
+static void writeTQPString(OFile *fp, const char *s, int qp)
 {
     const char *p = s;
     while (*p) {
@@ -1166,17 +1166,17 @@ static void writeValue(OFile *fp, VObject *o, unsigned long size)
 	case VCVT_USTRINGZ: {
 	    char *s = fakeCString(USTRINGZ_VALUE_OF(o));
 	    if (isAPropertyOf(o, VCQuotedPrintableProp))
-	      writeQPString(fp, s, 1);
+	      writeTQPString(fp, s, 1);
 	    else
-	      writeQPString(fp, s, 0);
+	      writeTQPString(fp, s, 0);
 	    deleteStr(s);
 	    break;
 	    }
 	case VCVT_STRINGZ: {
 	    if (isAPropertyOf(o, VCQuotedPrintableProp))
-	      writeQPString(fp, STRINGZ_VALUE_OF(o), 1);
+	      writeTQPString(fp, STRINGZ_VALUE_OF(o), 1);
 	    else
-	      writeQPString(fp, STRINGZ_VALUE_OF(o), 0);
+	      writeTQPString(fp, STRINGZ_VALUE_OF(o), 0);
 	    break;
 	    }
 	case VCVT_UINT: {