git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix small bug introduced with v2 merging
[enigma2.git]
/
lib
/
dvb
/
db.cpp
diff --git
a/lib/dvb/db.cpp
b/lib/dvb/db.cpp
index 5426fa4bf5c106d2f0405592ce344bd2a34a7782..1a2cd7df711893f9879333d4a9c71f02d42c7e4b 100644
(file)
--- a/
lib/dvb/db.cpp
+++ b/
lib/dvb/db.cpp
@@
-126,7
+126,7
@@
eDVBDB::eDVBDB()
if (strlen(line))
line[strlen(line)-1]=0;
if (strlen(line))
line[strlen(line)-1]=0;
-
eS
tring str=line;
+
std::s
tring str=line;
if (str[1]!=':') // old ... (only service_provider)
{
if (str[1]!=':') // old ... (only service_provider)
{
@@
-136,15
+136,15
@@
eDVBDB::eDVBDB()
{
unsigned int c=str.find(',');
char p=str[0];
{
unsigned int c=str.find(',');
char p=str[0];
-
eS
tring v;
- if (c ==
eS
tring::npos)
+
std::s
tring v;
+ if (c ==
std::s
tring::npos)
{
{
- v=str.
mid
(2);
+ v=str.
substr
(2);
str="";
} else
{
str="";
} else
{
- v=str.
mid
(2, c-2);
- str=str.
mid
(c+1);
+ v=str.
substr
(2, c-2);
+ str=str.
substr
(c+1);
}
// eDebug("%c ... %s", p, v.c_str());
if (p == 'p')
}
// eDebug("%c ... %s", p, v.c_str());
if (p == 'p')