From 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 13 Apr 2011 00:46:47 +0000 Subject: 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 --- libkcal/versit/port.h | 2 +- libkcal/versit/readme.txt | 14 +++++++------- libkcal/versit/vcc.c | 10 +++++----- libkcal/versit/vcc.h | 2 +- libkcal/versit/vobject.c | 20 ++++++++++---------- libkcal/versit/vobject.h | 8 ++++---- 6 files changed, 28 insertions(+), 28 deletions(-) (limited to 'libkcal/versit') diff --git a/libkcal/versit/port.h b/libkcal/versit/port.h index afc16dd42..0052b7007 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 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. diff --git a/libkcal/versit/readme.txt b/libkcal/versit/readme.txt index 5f38fe005..c03ba9b53 100644 --- a/libkcal/versit/readme.txt +++ b/libkcal/versit/readme.txt @@ -228,10 +228,10 @@ Use the API isAPropertyOf() to query if a name match the name of VObject tree can be pretty printed with the printVObject() function. The output of pretty printing a VObject representation of the input test file "vobject.vcf" is shown below. Note that the indentation -indicates the tree hirerarchy where the immediate children nodes -of a parent node is all at the same indentation level and the -immediate children nodes are the immediate properties of the -associated parent nodes. In the following, {N,FN,ORG,TITLE,...} +indicates the tree hirerarchy where the immediate tqchildren nodes +of a tqparent node is all at the same indentation level and the +immediate tqchildren nodes are the immediate properties of the +associated tqparent nodes. In the following, {N,FN,ORG,TITLE,...} are immediate properties of VCARD. {F and G} are properties of N with value {"Alden" and "Roland"} respectively; FN has no property but has the value "Roland H. Alden"; EMAIL has value and @@ -391,7 +391,7 @@ c. values of a property is determined by the property definition itself. The vobject APIs does not attempt to enforce any of such definition. It is the consumer responsibility to know what value is expected from a property. e.g - most properties have unicode string value, so to access + most properties have tqunicode string value, so to access the value of these type of properties, you will use the vObjectUStringZValue() to read the value and setVObjectUStringZValue() to set or modify the value. @@ -498,7 +498,7 @@ d. properties name (id) are case incensitive. const wchar_t* vObjectUStringZValue(VObject *o); -- retrieve the VObject's value interpreted as - null-terminated unicode string. + null-terminated tqunicode string. unsigned int vObjectIntegerValue(VObject *o); -- retrieve the VObject's value interpreted as @@ -578,7 +578,7 @@ d. properties name (id) are case incensitive. -- convert char* to wchar_t*. extern int uStrLen(const wchar_t *u); - -- length of unicode u. + -- length of tqunicode u. char *fakeCString(const wchar_t *u); -- convert wchar_t to CString (blindly assumes that diff --git a/libkcal/versit/vcc.c b/libkcal/versit/vcc.c index 0dfc6bff6..1ff36f7d2 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 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. @@ -259,7 +259,7 @@ enum LexMode { L_VTODO, L_VALUES, L_BASE64, - L_QUOTED_PRINTABLE + L_TQUOTED_PRINTABLE }; /**** Private Forward Declarations ****/ @@ -1288,7 +1288,7 @@ yyreduce: case 15: #line 259 "vcc.y" { - if (lexWithinMode(L_BASE64) || lexWithinMode(L_QUOTED_PRINTABLE)) + if (lexWithinMode(L_BASE64) || lexWithinMode(L_TQUOTED_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_QUOTED_PRINTABLE); + lexPushMode(L_TQUOTED_PRINTABLE); deleteStr(s1); deleteStr(s2); } @@ -2329,7 +2329,7 @@ static int yylex() { yylval.str = p; return STRING; } - else if (lexWithinMode(L_QUOTED_PRINTABLE)) { + else if (lexWithinMode(L_TQUOTED_PRINTABLE)) { p = lexGetQuotedPrintable(); } else { diff --git a/libkcal/versit/vcc.h b/libkcal/versit/vcc.h index 03886d16d..0c160910e 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 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. 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: { diff --git a/libkcal/versit/vobject.h b/libkcal/versit/vobject.h index c84d4c8a7..835a4b133 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 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. @@ -206,9 +206,9 @@ extern "C" { #define VCPronunciationProp "SOUND" #define VCPSProp "PS" #define VCPublicKeyProp "KEY" -#define VCQPProp "QP" -#define VCQuickTimeProp "QTIME" -#define VCQuotedPrintableProp "QUOTED-PRINTABLE" +#define VCTQPProp "QP" +#define VCQuickTimeProp "TQTIME" +#define VCQuotedPrintableProp "TQUOTED-PRINTABLE" #define VCRDateProp "RDATE" #define VCRegionProp "R" #define VCRelatedToProp "RELATED-TO" -- cgit v1.2.1