$NetBSD: patch-ah,v 1.4 2011/01/20 12:19:30 markd Exp $ --- kopete/protocols/oscar/liboscar/rtf.ll.orig 2005-09-10 08:20:23.000000000 +0000 +++ kopete/protocols/oscar/liboscar/rtf.ll @@ -568,7 +568,7 @@ void Level::setText(const char *str) FontDef& def = p->fonts[m_nFont-1]; - char *pp = strchr(str, ';'); + const char *pp = strchr(str, ';'); unsigned size; if (pp != NULL) size = (pp - str); @@ -631,7 +631,7 @@ const unsigned RED = 2; const unsigned GREEN = 3; const unsigned BLUE = 4; const unsigned CF = 5; -const unsigned FS = 6; +const unsigned KDE_FS = 6; const unsigned HIGHLIGHT = 7; const unsigned PARD = 8; const unsigned PAR = 9; @@ -795,7 +795,7 @@ QString RTF2HTML::Parse(const char *rtf, case CF: cur_level.setFontColor(cmd_value); break; - case FS: + case KDE_FS: cur_level.setFontSizeHalfPoints(cmd_value); break; case HIGHLIGHT: