diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-12-13 06:26:27 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-12-13 06:26:27 +0000 |
| commit | 9fab5b8a216e283e563f3457315715672bc8b55a (patch) | |
| tree | c1251952e4e0e28fad0bca829d49335ff15b6e98 /kopete/protocols/groupwise | |
| parent | bcb704366cb5e333a626c18c308c7e0448a8e69f (diff) | |
| download | tdenetwork-9fab5b8a216e283e563f3457315715672bc8b55a.tar.gz tdenetwork-9fab5b8a216e283e563f3457315715672bc8b55a.zip | |
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
Diffstat (limited to 'kopete/protocols/groupwise')
| -rw-r--r-- | kopete/protocols/groupwise/libgroupwise/rtf.cc | 2 | ||||
| -rw-r--r-- | kopete/protocols/groupwise/libgroupwise/rtf.ll | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kopete/protocols/groupwise/libgroupwise/rtf.cc b/kopete/protocols/groupwise/libgroupwise/rtf.cc index eb5da80e..14a3005a 100644 --- a/kopete/protocols/groupwise/libgroupwise/rtf.cc +++ b/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); diff --git a/kopete/protocols/groupwise/libgroupwise/rtf.ll b/kopete/protocols/groupwise/libgroupwise/rtf.ll index 37ebd9a3..67e9f5f5 100644 --- a/kopete/protocols/groupwise/libgroupwise/rtf.ll +++ b/kopete/protocols/groupwise/libgroupwise/rtf.ll @@ -570,7 +570,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); |