From d497b1b0373d758ede3d877ab68c8d7c8ab29062 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 13 Jan 2012 15:08:46 -0600 Subject: Fix inadvertent TQt changes This closes Bug 752 --- libkcal/versit/port.h | 2 +- libkcal/versit/vcc.c | 10 +++++----- libkcal/versit/vcc.h | 2 +- libkcal/versit/vobject.c | 8 ++++---- libkcal/versit/vobject.h | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) (limited to 'libkcal/versit') diff --git a/libkcal/versit/port.h b/libkcal/versit/port.h index 0052b7007..afc16dd42 100644 --- a/libkcal/versit/port.h +++ b/libkcal/versit/port.h @@ -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 CONSETQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT +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. diff --git a/libkcal/versit/vcc.c b/libkcal/versit/vcc.c index 1ff36f7d2..0dfc6bff6 100644 --- a/libkcal/versit/vcc.c +++ b/libkcal/versit/vcc.c @@ -122,7 +122,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 CONSETQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT +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. @@ -259,7 +259,7 @@ enum LexMode { L_VTODO, L_VALUES, L_BASE64, - L_TQUOTED_PRINTABLE + L_QUOTED_PRINTABLE }; /**** Private Forward Declarations ****/ @@ -1288,7 +1288,7 @@ yyreduce: case 15: #line 259 "vcc.y" { - if (lexWithinMode(L_BASE64) || lexWithinMode(L_TQUOTED_PRINTABLE)) + if (lexWithinMode(L_BASE64) || lexWithinMode(L_QUOTED_PRINTABLE)) lexPopMode(0); lexPopMode(0); ;} @@ -1750,7 +1750,7 @@ static void enterAttr(const char *s1, const char *s2) lexPushMode(L_BASE64); else if (strcasecmp(p1,VCQuotedPrintableProp) == 0 || (s2 && strcasecmp(p2,VCQuotedPrintableProp)==0)) - lexPushMode(L_TQUOTED_PRINTABLE); + lexPushMode(L_QUOTED_PRINTABLE); deleteStr(s1); deleteStr(s2); } @@ -2329,7 +2329,7 @@ static int yylex() { yylval.str = p; return STRING; } - else if (lexWithinMode(L_TQUOTED_PRINTABLE)) { + else if (lexWithinMode(L_QUOTED_PRINTABLE)) { p = lexGetQuotedPrintable(); } else { diff --git a/libkcal/versit/vcc.h b/libkcal/versit/vcc.h index 0c160910e..03886d16d 100644 --- a/libkcal/versit/vcc.h +++ b/libkcal/versit/vcc.h @@ -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 CONSETQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT +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. diff --git a/libkcal/versit/vobject.c b/libkcal/versit/vobject.c index e52cecbef..0bb37041b 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 CONSETQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT +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. @@ -1106,7 +1106,7 @@ static int writeBase64(OFile *fp, unsigned char *s, long len) unsigned long trip; unsigned char b; char quad[5]; -#define MAXTQUADS 16 +#define MAXQUADS 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==MAXTQUADS-1?"\n" : ""))); - numQuads = (numQuads + 1) % MAXTQUADS; + appendsOFile(fp, ((cur >= len)?"\n" :(numQuads==MAXQUADS-1?"\n" : ""))); + numQuads = (numQuads + 1) % MAXQUADS; } appendcOFile(fp,'\n'); diff --git a/libkcal/versit/vobject.h b/libkcal/versit/vobject.h index e456c8815..33897381b 100644 --- a/libkcal/versit/vobject.h +++ b/libkcal/versit/vobject.h @@ -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 CONSETQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT +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. -- cgit v1.2.1