| -rw-r--r-- | library/backend/vcc.y | 2 | ||||
| -rw-r--r-- | library/backend/vcc_yacc.cpp | 2 | ||||
| -rw-r--r-- | library/backend/vobject.cpp | 116 |
3 files changed, 60 insertions, 60 deletions
diff --git a/library/backend/vcc.y b/library/backend/vcc.y index 5bcf0cb..6781312 100644 --- a/library/backend/vcc.y +++ b/library/backend/vcc.y @@ -124,3 +124,3 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable. //#else
-#include "vobject_p.h"
+#include <qtopia/private/vobject_p.h> //#endif
diff --git a/library/backend/vcc_yacc.cpp b/library/backend/vcc_yacc.cpp index 19a108f..b2b0c14 100644 --- a/library/backend/vcc_yacc.cpp +++ b/library/backend/vcc_yacc.cpp @@ -160,3 +160,3 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable. /*#else
*/ -#include "vobject_p.h"
+#include <qtopia/private/vobject_p.h> /*#endif
*/ 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,36 +1,36 @@ /*************************************************************************** -(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. @@ -40,3 +40,3 @@ 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. @@ -48,4 +48,4 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable. -#include "vobject_p.h" -#include "qfiledirect_p.h" +#include <qtopia/private/vobject_p.h> +#include <qtopia/private/qfiledirect_p.h> #include <string.h> @@ -329,3 +329,3 @@ DLLEXPORT(void) initPropIterator(VObjectIterator *i, VObject *o) { - i->start = o->prop; + i->start = o->prop; i->next = 0; @@ -335,3 +335,3 @@ DLLEXPORT(void) initVObjectIterator(VObjectIterator *i, VObject *o) { - i->start = o->next; + i->start = o->next; i->next = 0; @@ -340,3 +340,3 @@ DLLEXPORT(void) initVObjectIterator(VObjectIterator *i, VObject *o) DLLEXPORT(int) moreIteration(VObjectIterator *i) -{ +{ return (i->start && (i->next==0 || i->next!=i->start)); @@ -405,3 +405,3 @@ DLLEXPORT(VObject*) addGroup(VObject *o, const char *g) } while (n != gs); - deleteStr(gs); + deleteStr(gs); return p; @@ -801,3 +801,3 @@ static struct PreDefProp* lookupPropInfo(const char* str) int i; - + for (i = 0; propNames[i].name; i++) @@ -806,3 +806,3 @@ static struct PreDefProp* lookupPropInfo(const char* str) } - + return 0; @@ -814,3 +814,3 @@ DLLEXPORT(const char*) lookupProp_(const char* str) int i; - + for (i = 0; propNames[i].name; i++) @@ -828,3 +828,3 @@ DLLEXPORT(const char*) lookupProp(const char* str) int i; - + for (i = 0; propNames[i].name; i++) @@ -1007,3 +1007,3 @@ static int writeBase64(OFile *fp, unsigned char *s, long len) -static const char *replaceChar(unsigned char c) +static const char *replaceChar(unsigned char c) { @@ -1012,11 +1012,11 @@ static const char *replaceChar(unsigned char c) } 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 <= '-') || @@ -1024,6 +1024,6 @@ static const char *replaceChar(unsigned char c) || - (c == '?') + (c == '?') || - (c == ' ')) - { + (c == ' ')) + { return 0; @@ -1053,3 +1053,3 @@ static void writeQPString(OFile *fp, const char *s) /* - only A-Z, 0-9 and + only A-Z, 0-9 and "'" (ASCII code 39) @@ -1062,3 +1062,3 @@ static void writeQPString(OFile *fp, const char *s) "?" (ASCII code 63) - + should remain un-encoded. @@ -1095,3 +1095,3 @@ static bool includesUnprintable(VObject *o) } - + static void writeVObject_(OFile *fp, VObject *o); @@ -1231,3 +1231,3 @@ static void writeProp(OFile *fp, VObject *o) - + if (VALUE_TYPE(o)) { |