summaryrefslogtreecommitdiff
path: root/net/kdenetwork3/patches/patch-af
blob: cb0430a8ab44765cfc937f5457d52bfaca3f7f34 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
$NetBSD: patch-af,v 1.10 2011/01/20 12:19:30 markd Exp $

--- kopete/protocols/groupwise/libgroupwise/rtf.cc.orig	2005-09-10 08:20:20.000000000 +0000
+++ kopete/protocols/groupwise/libgroupwise/rtf.cc
@@ -2235,7 +2235,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);
@@ -2298,7 +2298,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;
@@ -2462,7 +2462,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: