summaryrefslogtreecommitdiffstats
path: root/kcontrol
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-01-04 04:24:50 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-01-04 04:24:50 +0000
commit65cf1e63bbfb4fe8bede01b16201b624ce78aa88 (patch)
treec97461c2deae3c0533e644a5879b17ec36f0ce84 /kcontrol
parent30b58398437ee413c6b1f7804847808b45092759 (diff)
downloadtdebase-65cf1e63bbfb4fe8bede01b16201b624ce78aa88.tar.gz
tdebase-65cf1e63bbfb4fe8bede01b16201b624ce78aa88.zip
gcc4.4 compilation fixes
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1069683 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kcontrol')
-rw-r--r--kcontrol/kfontinst/kfontinst/Fontmap.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kcontrol/kfontinst/kfontinst/Fontmap.cpp b/kcontrol/kfontinst/kfontinst/Fontmap.cpp
index 87cfabad8..6e0c165e9 100644
--- a/kcontrol/kfontinst/kfontinst/Fontmap.cpp
+++ b/kcontrol/kfontinst/kfontinst/Fontmap.cpp
@@ -66,11 +66,11 @@ static bool parseLine(const char *line, QString &ps, QString &fname, bool &isAli
b[constFileMaxLen+1];
char *slash1=(char*)strchr(line, '/'),
- *space1=slash1 ? findSpace(slash1) : NULL, //strchr(slash1, ' ') : NULL,
+ *space1=slash1 ? (char*)findSpace(slash1) : NULL, //strchr(slash1, ' ') : NULL,
*ob=slash1 ? (char*)strchr(slash1, '(') : NULL,
*cb=ob ? (char*)strchr(ob, ')') : NULL,
*slash2=space1 && !ob && !cb ? (char*)strchr(space1, '/') : NULL,
- *space2=slash2 ? findSpace(slash2) : NULL, // strchr(slash2, ' ') : NULL,
+ *space2=slash2 ? (char*)findSpace(slash2) : NULL, // strchr(slash2, ' ') : NULL,
*semic=cb || space2 ? (char*)strchr(cb ? cb : space2, ';') : NULL;
if(semic && space1-slash1<constMaxLen)