Actually most of them are -+ cause I opened them in xemacs..

The main goal is to
replace some header names to let them be overwritten by external once
so "qpeapplication.h" is now <qpe/qpeapplication.h>
I'll check if it's building on non Qt2/X11 systems...

1 files changed, 58 insertions, 58 deletions

diff --git a/library/backend/vobject.cpp b/library/backend/vobject.cpp
index e6f6b78..dab128e 100644
--- a/library/backend/vobject.cpp
+++ b/library/backend/vobject.cpp
@@ -1,74 +1,74 @@
 /***************************************************************************
-(C) Copyright 1996 Apple Computer, Inc., AT&T Corp., International             
-Business Machines Corporation and Siemens Rolm Communications Inc.             
-                                                                               
-For purposes of this license notice, the term Licensors shall mean,            
-collectively, Apple Computer, Inc., AT&T Corp., International                  
-Business Machines Corporation and Siemens Rolm Communications Inc.             
-The term Licensor shall mean any of the Licensors.                             
-                                                                               
-Subject to acceptance of the following conditions, permission is hereby        
-granted by Licensors without the need for written agreement and without        
-license or royalty fees, to use, copy, modify and distribute this              
-software for any purpose.                                                      
-                                                                               
-The above copyright notice and the following four paragraphs must be           
-reproduced in all copies of this software and any software including           
-this software.                                                                 
-                                                                               
-THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS AND NO LICENSOR SHALL HAVE       
-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         
-OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH         
-DAMAGE.                                                                        
-                                                                               
-EACH LICENSOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED,       
-INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF NONINFRINGEMENT OR THE            
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR             
-PURPOSE.                                                                       
-
-The software is provided with RESTRICTED RIGHTS.  Use, duplication, or         
-disclosure by the government are subject to restrictions set forth in          
-DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.                         
+(C) Copyright 1996 Apple Computer, Inc., AT&T Corp., International
+Business Machines Corporation and Siemens Rolm Communications Inc.
+
+For purposes of this license notice, the term Licensors shall mean,
+collectively, Apple Computer, Inc., AT&T Corp., International
+Business Machines Corporation and Siemens Rolm Communications Inc.
+The term Licensor shall mean any of the Licensors.
+
+Subject to acceptance of the following conditions, permission is hereby
+granted by Licensors without the need for written agreement and without
+license or royalty fees, to use, copy, modify and distribute this
+software for any purpose.
+
+The above copyright notice and the following four paragraphs must be
+reproduced in all copies of this software and any software including
+this software.
+
+THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS AND NO LICENSOR SHALL HAVE
+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
+OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+EACH LICENSOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF NONINFRINGEMENT OR THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.
+
+The software is provided with RESTRICTED RIGHTS.  Use, duplication, or
+disclosure by the government are subject to restrictions set forth in
+DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.
 
 ***************************************************************************/
 
 /*
  * src: vobject.c
- * doc: vobject and APIs to construct vobject, APIs pretty print 
+ * doc: vobject and APIs to construct vobject, APIs pretty print
  * vobject, and convert a vobject into its textual representation.
  */
 
 #ifndef	 MWERKS
 #include <malloc.h>
 #endif
 
-#include "vobject_p.h"
-#include "qfiledirect_p.h"
+#include <qtopia/private/vobject_p.h>
+#include <qtopia/private/qfiledirect_p.h>
 #include <string.h>
 #include <stdio.h>
 #include <fcntl.h>
 //#include <io.h>
 
 
 #define NAME_OF(o)				o->id
 #define VALUE_TYPE(o)			o->valType
 #define STRINGZ_VALUE_OF(o)		o->val.strs
 #define INTEGER_VALUE_OF(o)		o->val.i
 #define LONG_VALUE_OF(o)		o->val.l
 #define ANY_VALUE_OF(o)			o->val.any
 #define VOBJECT_VALUE_OF(o)		o->val.vobj
 
 typedef union ValueItem {
     const char *strs;
     unsigned int i;
     unsigned long l;
     void *any;
     VObject *vobj;
     } ValueItem;
 
 struct VObject {
     VObject *next;
@@ -306,60 +306,60 @@ DLLEXPORT(void) addList(VObject **o, VObject *p)
 }
 
 DLLEXPORT(VObject*) nextVObjectInList(VObject *o)
 {
     return o->next;
 }
 
 DLLEXPORT(VObject*) setValueWithSize_(VObject *prop, void *val, unsigned int size)
 {
     VObject *sizeProp;
     setVObjectAnyValue(prop, val);
     sizeProp = addProp(prop,VCDataSizeProp);
     setVObjectLongValue(sizeProp, size);
     return prop;
 }
 
 DLLEXPORT(VObject*) setValueWithSize(VObject *prop, void *val, unsigned int size)
 {
     void *p = dupStr((const char *)val,size);
     return setValueWithSize_(prop,p,p?size:0);
 }
 
 DLLEXPORT(void) initPropIterator(VObjectIterator *i, VObject *o)
 {
-    i->start = o->prop; 
+    i->start = o->prop;
     i->next = 0;
 }
 
 DLLEXPORT(void) initVObjectIterator(VObjectIterator *i, VObject *o)
 {
-    i->start = o->next; 
+    i->start = o->next;
     i->next = 0;
 }
 
 DLLEXPORT(int) moreIteration(VObjectIterator *i)
-{ 
+{
     return (i->start && (i->next==0 || i->next!=i->start));
 }
 
 DLLEXPORT(VObject*) nextVObject(VObjectIterator *i)
 {
     if (i->start && i->next != i->start) {
 	if (i->next == 0) {
 	    i->next = i->start->next;
 	    return i->next;
 	    }
 	else {
 	    i->next = i->next->next;
 	    return i->next;
 	    }
 	}
     else return (VObject*)0;
 }
 
 DLLEXPORT(VObject*) isAPropertyOf(VObject *o, const char *id)
 {
     VObjectIterator i;
     initPropIterator(&i,o);
     while (moreIteration(&i)) {
 	VObject *each = nextVObject(&i);
@@ -382,49 +382,49 @@ DLLEXPORT(VObject*) addGroup(VObject *o, const char *g)
     if (dot) {
 	VObject *p, *t;
 	char *gs, *n = dot+1;
 	gs = dupStr(g,0);	/* so we can write to it. */
 	/* used to be
 	* t = p = addProp_(o,lookupProp_(n));
 	*/
 	t = p = addProp_(o,lookupProp(n));
 	dot = strrchr(gs,'.');
 	*dot = 0;
 	do {
 	    dot = strrchr(gs,'.');
 	    if (dot) {
 		n = dot+1;
 		*dot=0;
 		}
 	    else
 		n = gs;
 	    /* property(VCGroupingProp=n);
 	     *	and the value may have VCGrouping property
 	     */
 	    t = addProp(t,VCGroupingProp);
 	    setVObjectStringZValue(t,lookupProp_(n));
 	    } while (n != gs);
-	deleteStr(gs);	
+	deleteStr(gs);
 	return p;
 	}
     else
 	return addProp_(o,lookupProp(g));
 }
 
 DLLEXPORT(VObject*) addPropValue(VObject *o, const char *p, const char *v)
 {
     VObject *prop;
     prop = addProp(o,p);
     setVObjectStringZValue_(prop, strdup( v ) );
     return prop;
 }
 
 DLLEXPORT(VObject*) addPropSizedValue_(VObject *o, const char *p, const char *v,
 	unsigned int size)
 {
     VObject *prop;
     prop = addProp(o,p);
     setValueWithSize_(prop, (void*)v, size);
     return prop;
 }
 
 DLLEXPORT(VObject*) addPropSizedValue(VObject *o, const char *p, const char *v,
@@ -778,76 +778,76 @@ static struct PreDefProp propNames[] = {
     { VCTLXProp, 0, 0, 0 },
     { VCTodoProp, 0, 0, PD_BEGIN },
     { VCTranspProp, 0, 0, 0 },
     { VCUniqueStringProp, 0, 0, 0 },
     { VCURLProp, 0, 0, 0 },
     { VCURLValueProp, 0, 0, 0 },
     { VCValueProp, 0, 0, 0 },
     { VCVersionProp, 0, 0, 0 },
     { VCVideoProp, 0, 0, 0 },
     { VCVoiceProp, 0, 0, 0 },
     { VCWAVEProp, 0, 0, 0 },
     { VCWMFProp, 0, 0, 0 },
     { VCWorkProp, 0, 0, 0 },
     { VCX400Prop, 0, 0, 0 },
     { VCX509Prop, 0, 0, 0 },
     { VCXRuleProp, 0, 0, 0 },
     { 0,0,0,0 }
     };
 
 
 static struct PreDefProp* lookupPropInfo(const char* str)
 {
     /* brute force for now, could use a hash table here. */
     int i;
-	
+
     for (i = 0; propNames[i].name; i++)
 	if (qstricmp(str, propNames[i].name) == 0) {
 	    return &propNames[i];
 	    }
-    
+
     return 0;
 }
 
 
 DLLEXPORT(const char*) lookupProp_(const char* str)
 {
     int i;
-	
+
     for (i = 0; propNames[i].name; i++)
 	if (qstricmp(str, propNames[i].name) == 0) {
 	    const char* s;
 	    s = propNames[i].alias?propNames[i].alias:propNames[i].name;
 	    return lookupStr(s);
 	    }
     return lookupStr(str);
 }
 
 
 DLLEXPORT(const char*) lookupProp(const char* str)
 {
     int i;
-	
+
     for (i = 0; propNames[i].name; i++)
 	if (qstricmp(str, propNames[i].name) == 0) {
 	    const char *s;
 	    fieldedProp = propNames[i].fields;
 	    s = propNames[i].alias?propNames[i].alias:propNames[i].name;
 	    return lookupStr(s);
 	    }
     fieldedProp = 0;
     return lookupStr(str);
 }
 
 
 /*----------------------------------------------------------------------
   APIs to Output text form.
   ----------------------------------------------------------------------*/
 #define OFILE_REALLOC_SIZE 256
 typedef struct OFile {
     FILE *fp;
     char *s;
     int len;
     int limit;
     int alloc:1;
     int fail:1;
     } OFile;
@@ -984,137 +984,137 @@ static int writeBase64(OFile *fp, unsigned char *s, long len)
 	    }
 	// fill in 'quad' with the appropriate four characters
 	for (i = 3; i >= 0; i--) {
 	    b = (unsigned char)(trip & 0x3F);
 	    trip = trip >> 6;
 	    if ((3 - i) < (cur - len))
 		quad[i] = '='; // pad char
 	    else if (b < 26) quad[i] = (char)b + 'A';
 	    else if (b < 52) quad[i] = (char)(b - 26) + 'a';
 	    else if (b < 62) quad[i] = (char)(b - 52) + '0';
 	    else if (b == 62) quad[i] = '+';
 	    else quad[i] = '/';
 	    }
 	// 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;
 	}
     appendcOFile(fp,'\n');
 
     return 1;
 }
 
-static const char *replaceChar(unsigned char c) 
+static const char *replaceChar(unsigned char c)
 {
     if (c == '\n') {
 	return "=0A=\n";
     } else if (
-	    (c >= 'A' && c <= 'Z') 
+	    (c >= 'A' && c <= 'Z')
 	    ||
-	    (c >= 'a' && c <= 'z') 
+	    (c >= 'a' && c <= 'z')
 	    ||
-	    (c >= '0' && c <= '9') 
+	    (c >= '0' && c <= '9')
 	    ||
-	    (c >= '\'' && c <= ')') 
+	    (c >= '\'' && c <= ')')
 	    ||
-	    (c >= '+' && c <= '-') 
+	    (c >= '+' && c <= '-')
 	    ||
 	    (c == '/')
 	    ||
-	    (c == '?') 
+	    (c == '?')
 	    ||
-	    (c == ' ')) 
-    { 
+	    (c == ' '))
+    {
 	return 0;
     }
 
     static char trans[4];
     trans[0] = '=';
     trans[3] = '\0';
     int rem = c % 16;
     int div = c / 16;
 
     if (div < 10)
 	trans[1] = '0' + div;
     else
 	trans[1] = 'A' + (div - 10);
 
     if (rem < 10)
 	trans[2] = '0' + rem;
     else
 	trans[2] = 'A' + (rem - 10);
 
     return trans;
 }
 
 static void writeQPString(OFile *fp, const char *s)
 {
     /*
-	only A-Z, 0-9 and 
+	only A-Z, 0-9 and
        "'"  (ASCII code 39)
        "("  (ASCII code 40)
        ")"  (ASCII code 41)
        "+"  (ASCII code 43)
        ","  (ASCII code 44)
        "-"  (ASCII code 45)
        "/"  (ASCII code 47)
        "?"  (ASCII code 63)
-       
+
        should remain un-encoded.
        '=' needs to be encoded as it is the escape character.
        ';' needs to be as it is a field separator.
 
      */
     const char *p = s;
     while (*p) {
 	const char *rep = replaceChar(*p);
 	if (rep)
 	    appendsOFile(fp, rep);
 	else
 	    appendcOFile(fp, *p);
 	p++;
     }
 }
 
 static bool includesUnprintable(VObject *o)
 {
     if (o) {
 	if (VALUE_TYPE(o) == VCVT_STRINGZ) {
 	    const char *p = STRINGZ_VALUE_OF(o);
 	    if (p) {
 		while (*p) {
 		    if (replaceChar(*p))
 			return TRUE;
 		    p++;
 		}
 	    }
 	}
     }
     return FALSE;
 }
-	    
+
 static void writeVObject_(OFile *fp, VObject *o);
 
 static void writeValue(OFile *fp, VObject *o, unsigned long size)
 {
     if (o == 0) return;
     switch (VALUE_TYPE(o)) {
 	case VCVT_STRINGZ: {
 	    writeQPString(fp, STRINGZ_VALUE_OF(o));
 	    break;
 	    }
 	case VCVT_UINT: {
 	    char buf[16];
 	    sprintf(buf,"%u", INTEGER_VALUE_OF(o));
 	    appendsOFile(fp,buf);
 	    break;
 	    }
 	case VCVT_ULONG: {
 	    char buf[16];
 	    sprintf(buf,"%lu", LONG_VALUE_OF(o));
 	    appendsOFile(fp,buf);
 	    break;
 	    }
 	case VCVT_RAW: {
 	    appendcOFile(fp,'\n');
@@ -1208,49 +1208,49 @@ static void writeProp(OFile *fp, VObject *o)
 		    printable = FALSE;
 		fields++;
 	    }
 	    fields = fields_;
 	    if (!printable) {
 		appendsOFile(fp, ";" VCEncodingProp "=" VCQuotedPrintableProp);
 		appendsOFile(fp, ";" VCCharSetProp "=" "UTF-8");
 	    }
 	    appendcOFile(fp,':');
 	    while (*fields) {
 		VObject *t = isAPropertyOf(o,*fields);
 		i++;
 		if (t) n = i;
 		fields++;
 	    }
 	    fields = fields_;
 	    for (i=0;i<n;i++) {
 		writeValue(fp,isAPropertyOf(o,*fields),0);
 		fields++;
 		if (i<(n-1)) appendcOFile(fp,';');
 	    }
 	    }
 	}
 
-	
+
     if (VALUE_TYPE(o)) {
 	    if ( includesUnprintable(o) ) {
 	    appendsOFile(fp, ";" VCEncodingProp "=" VCQuotedPrintableProp);
 	    appendsOFile(fp, ";" VCCharSetProp "=" "UTF-8");
 	}
 	unsigned long size = 0;
         VObject *p = isAPropertyOf(o,VCDataSizeProp);
 	if (p) size = LONG_VALUE_OF(p);
 	appendcOFile(fp,':');
 	writeValue(fp,o,size);
 	}
 
     appendcOFile(fp,'\n');
 }
 
 static void writeVObject_(OFile *fp, VObject *o)
 {
     if (NAME_OF(o)) {
 	struct PreDefProp *pi;
 	pi = lookupPropInfo(NAME_OF(o));
 
 	if (pi && ((pi->flags & PD_BEGIN) != 0)) {
 	    VObjectIterator t;
 	    const char *begin = NAME_OF(o);