You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
21 lines
733 B
21 lines
733 B
14 years ago
|
--- kcontrol/kfontinst/kfontinst/Fontmap.cpp.sav 2006-01-19 18:00:49.000000000 +0100
|
||
|
|
+++ kcontrol/kfontinst/kfontinst/Fontmap.cpp 2009-05-29 14:50:08.000000000 +0200
|
||
|
|
@@ -44,7 +44,7 @@
|
||
|
|
|
||
|
|
using namespace std;
|
||
|
|
|
||
|
|
-static char * findSpace(char *str)
|
||
|
|
+static const char * findSpace(const char *str)
|
||
|
|
{
|
||
|
|
while(str && *str!=' ' && *str!='\t')
|
||
|
|
str++;
|
||
|
|
@@ -65,7 +65,7 @@ static bool parseLine(const char *line,
|
||
|
|
char a[constMaxLen+1],
|
||
|
|
b[constFileMaxLen+1];
|
||
|
|
|
||
|
|
- char *slash1=strchr(line, '/'),
|
||
|
|
+ const char *slash1=strchr(line, '/'),
|
||
|
|
*space1=slash1 ? findSpace(slash1) : NULL, //strchr(slash1, ' ') : NULL,
|
||
|
|
*ob=slash1 ? strchr(slash1, '(') : NULL,
|
||
|
|
*cb=ob ? strchr(ob, ')') : NULL,
|