--- kdebase-3.0.4/kcontrol/kfontinst/kfontinst/XftConfig.cpp.orig 2002-10-30 00:53:18.000000000 +0200 +++ kdebase-3.0.4/kcontrol/kfontinst/kfontinst/XftConfig.cpp 2002-10-30 01:01:49.000000000 +0200 @@ -276,7 +276,7 @@ } case XftTypeString: str+="\""; - str+=test->value.u.s; + str+=(QCString &)test->value.u.s; str+="\""; break; case XftTypeBool: @@ -554,7 +554,7 @@ XftValue value; CXftConfig::TEntry *entry=new CXftConfig::TEntry; - value.u.s=sval; + (char *)value.u.s=sval; value.type=XftTypeString; entry->test=XftTestCreate(XftQualAny, "family", XftOpEqual, value); @@ -780,7 +780,7 @@ for(entry=itsList.first(); entry; entry=itsList.next()) if(entry->test && 0==CMisc::stricmp(entry->test->field, "family") && XftTypeString==entry->test->value.type && - 0==CMisc::stricmp(entry->test->value.u.s, family.latin1()) && entry->edit && + 0==CMisc::stricmp((char *)entry->test->value.u.s, family.latin1()) && entry->edit && 0==CMisc::stricmp(entry->edit->field, field) && XftOpAssign==entry->edit->op && entry->edit->expr) break; @@ -798,7 +798,7 @@ free(test->field); if(XftTypeString==test->value.type) - free(test->value.u.s); + free((void *)test->value.u.s); } } --- kdebase-3.0.4/kcontrol/kfontinst/kfontinst/XftConfigEditor.cpp.orig 2002-10-30 01:03:25.000000000 +0200 +++ kdebase-3.0.4/kcontrol/kfontinst/kfontinst/XftConfigEditor.cpp 2002-10-30 01:07:27.000000000 +0200 @@ -469,7 +469,7 @@ break; case XftTypeString: expr->op=XftOpString; - expr->u.sval=val.u.s; + expr->u.sval=(char *)val.u.s; break; case XftTypeBool: default: @@ -655,12 +655,12 @@ if("foundry"==field || "family"==field || "encoding"==field || "style"==field) { val.type=XftTypeString; - val.u.s=(char *)malloc(edit ? strVal.length()+1 : strVal.length()-1); + (char *)val.u.s=(char *)malloc(edit ? strVal.length()+1 : strVal.length()-1); if(edit) - strcpy(val.u.s, strVal.local8Bit()); + strcpy((char *)val.u.s, strVal.local8Bit()); else - strcpy(val.u.s, strVal.mid(1, strVal.length()-2).local8Bit()); // Need to remove quotes from each end of the string... + strcpy((char *)val.u.s, strVal.mid(1, strVal.length()-2).local8Bit()); // Need to remove quotes from each end of the string... } else if("spacing"==field) { @@ -747,8 +747,8 @@ { // Not sure about this... val.type=XftTypeString; - val.u.s=(char *)malloc(strVal.length()+1); - strcpy(val.u.s, strVal.local8Bit()); + (char *)val.u.s=(char *)malloc(strVal.length()+1); + strcpy((char *)val.u.s, strVal.local8Bit()); } else if("rgba"==field) {