Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

gcc-4.7 fix

  • Loading branch information...
commit ac9440dd568e6f0b4ae152ed3b47af831560360d 1 parent 87cfd48
Serghei Amelian authored
4 kcontrol/kfontinst/kfontinst/Fontmap.cpp
View
@@ -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, QString &ps, QString &fname, bool &isAli
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,
6 kicker/applets/launcher/easyvector.h
View
@@ -87,7 +87,7 @@ typename EasyVector< VALUE, CHECKINDEX >::Index
template < class VALUE, bool CHECKINDEX >
void EasyVector< VALUE, CHECKINDEX >::eraseAt(Index index)
{ _checkIndex(index);
- erase(this->begin()+index);
+ this->erase(this->begin()+index);
}
@@ -108,7 +108,7 @@ void EasyVector< VALUE, CHECKINDEX >::insertAt(EasyVector< VALUE, CHECKINDEX >::
this->push_back(value);
return;
}
- insert(this->begin()+index,value);
+ this->insert(this->begin()+index,value);
}
@@ -116,7 +116,7 @@ template < class VALUE, bool CHECKINDEX >
void EasyVector< VALUE, CHECKINDEX >::insertAt(EasyVector< VALUE, CHECKINDEX >::Index index,const EasyVector< VALUE, CHECKINDEX > &v)
{ index=_convertInsertIndex(index);
_checkInsertIndex(index);
- insert(this->begin()+index,v.begin(),v.end());
+ this->insert(this->begin()+index,v.begin(),v.end());
}
Please sign in to comment.
Something went wrong with that request. Please try again.