From 9fab5b8a216e283e563f3457315715672bc8b55a Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 13 Dec 2009 06:26:27 +0000 Subject: Update to Trinity 3.5.11 Will need to watch for commit warnings and rebuild test git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1061808 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kopete/protocols/oscar/liboscar/rtf.cc | 2 +- kopete/protocols/oscar/liboscar/rtf.ll | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'kopete/protocols/oscar') diff --git a/kopete/protocols/oscar/liboscar/rtf.cc b/kopete/protocols/oscar/liboscar/rtf.cc index 6daa636e..bb4d88ee 100644 --- a/kopete/protocols/oscar/liboscar/rtf.cc +++ b/kopete/protocols/oscar/liboscar/rtf.cc @@ -2131,7 +2131,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); diff --git a/kopete/protocols/oscar/liboscar/rtf.ll b/kopete/protocols/oscar/liboscar/rtf.ll index d982234b..c43aeaea 100644 --- a/kopete/protocols/oscar/liboscar/rtf.ll +++ b/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); -- cgit v1.2.1