CVS: M/src/wx/vcard vcc.y,1.11,1.12 vobject.c,1.6,1.7

Update of /cvsroot/mahogany/M/src/wx/vcard
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv18925

Modified Files:
	vcc.y vobject.c 
Log Message:
reverted vcc.y to 1.9 and vobject.c to 1.4

Index: vcc.y
===================================================================
RCS file: /cvsroot/mahogany/M/src/wx/vcard/vcc.y,v
retrieving revision 1.11
retrieving revision 1.12
diff -b -u -2 -r1.11 -r1.12
--- vcc.y	4 Sep 2006 23:42:59 -0000	1.11
+++ vcc.y	12 Sep 2006 16:39:28 -0000	1.12
@@ -108,8 +108,4 @@
 #include "vcc.h"
 
-#ifndef USE_PCH
-#include <wx/wxchar.h>    // for wxStricmp
-#endif // USE_PCH
-
 /****  Types, Constants  ****/
 
@@ -440,8 +436,8 @@
     else
 	addProp(curProp,p1);
-    if (wxStricmp(p1,VCBase64Prop) == 0 || (s2 && wxStricmp(p2,VCBase64Prop)==0))
+    if (stricmp(p1,VCBase64Prop) == 0 || (s2 && stricmp(p2,VCBase64Prop)==0))
 	lexPushMode(L_BASE64);
-    else if (wxStricmp(p1,VCQuotedPrintableProp) == 0
-	    || (s2 && wxStricmp(p2,VCQuotedPrintableProp)==0))
+    else if (stricmp(p1,VCQuotedPrintableProp) == 0
+	    || (s2 && stricmp(p2,VCQuotedPrintableProp)==0))
 	lexPushMode(L_QUOTED_PRINTABLE);
     deleteStr(s1); deleteStr(s2);
@@ -778,8 +774,8 @@
     int token = ID;
     if (n) {
-	if (!wxStricmp(n,"vcard")) token = end?END_VCARD:BEGIN_VCARD;
-	else if (!wxStricmp(n,"vcalendar")) token = end?END_VCAL:BEGIN_VCAL;
-	else if (!wxStricmp(n,"vevent")) token = end?END_VEVENT:BEGIN_VEVENT;
-	else if (!wxStricmp(n,"vtodo")) token = end?END_VTODO:BEGIN_VTODO;
+	if (!stricmp(n,"vcard")) token = end?END_VCARD:BEGIN_VCARD;
+	else if (!stricmp(n,"vcalendar")) token = end?END_VCAL:BEGIN_VCAL;
+	else if (!stricmp(n,"vevent")) token = end?END_VEVENT:BEGIN_VEVENT;
+	else if (!stricmp(n,"vtodo")) token = end?END_VTODO:BEGIN_VTODO;
 	deleteStr(n);
 	return token;
@@ -1091,8 +1087,8 @@
 			char *t = lexGetWord();
 			yylval.str = t;
-			if (!wxStricmp(t, "begin")) {
+			if (!stricmp(t, "begin")) {
 			    return match_begin_end_name(0);
 			    }
-			else if (!wxStricmp(t,"end")) {
+			else if (!stricmp(t,"end")) {
 			    return match_begin_end_name(1);
 			    }

Index: vobject.c
===================================================================
RCS file: /cvsroot/mahogany/M/src/wx/vcard/vobject.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -b -u -2 -r1.6 -r1.7
--- vobject.c	4 Sep 2006 23:42:59 -0000	1.6
+++ vobject.c	12 Sep 2006 16:39:28 -0000	1.7
@@ -48,7 +48,4 @@
 #include <fcntl.h>
 
-#ifndef USE_PCH
-#include <wx/wxchar.h>    // for wxStricmp
-#endif // USE_PCH
 
 #define NAME_OF(o)				o->id
@@ -404,5 +401,5 @@
     while (moreIteration(&i)) {
 	VObject *each = nextVObject(&i);
-	if (!wxStricmp(id,each->id))
+	if (!stricmp(id,each->id))
 	    return each;
 	}
@@ -657,5 +654,5 @@
     if ((t = strTbl[h]) != 0) {
 	do {
-	    if (wxStricmp(t->s,s) == 0) {
+	    if (stricmp(t->s,s) == 0) {
 		t->refCnt++;
 		return t->s;
@@ -676,5 +673,5 @@
 	p = t;
 	do {
-	    if (wxStricmp(t->s,s) == 0) {
+	    if (stricmp(t->s,s) == 0) {
 		t->refCnt--;
 		if (t->refCnt == 0) {
@@ -958,5 +955,5 @@
 	
     for (i = 0; propNames[i].name; i++)
-	if (wxStricmp(str, propNames[i].name) == 0) {
+	if (stricmp(str, propNames[i].name) == 0) {
 	    return &propNames[i];
 	    }
@@ -971,5 +968,5 @@
 	
     for (i = 0; propNames[i].name; i++)
-	if (wxStricmp(str, propNames[i].name) == 0) {
+	if (stricmp(str, propNames[i].name) == 0) {
 	    const char* s;
 	    s = propNames[i].alias?propNames[i].alias:propNames[i].name;
@@ -985,5 +982,5 @@
 	
     for (i = 0; propNames[i].name; i++)
-	if (wxStricmp(str, propNames[i].name) == 0) {
+	if (stricmp(str, propNames[i].name) == 0) {
 	    const char *s;
 	    fieldedProp = propNames[i].fields;
@@ -1262,5 +1259,5 @@
     if (list == 0) return 0;
     while (*list) {
-	if (wxStricmp(*list,s) == 0) return 1;
+	if (stricmp(*list,s) == 0) return 1;
 	list++;
 	}
@@ -1289,5 +1286,5 @@
 	    VObject *eachProp = nextVObject(&t);
 	    s = NAME_OF(eachProp);
-	    if (wxStricmp(VCGroupingProp,s) && !inList(fields_,s))
+	    if (stricmp(VCGroupingProp,s) && !inList(fields_,s))
 		writeAttrValue(fp,eachProp);
 	    }


-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642