1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
|
diff --git a/dist/epgdata2xmltv/epgdata2xmltv.cpp b/dist/epgdata2xmltv/epgdata2xmltv.cpp
index de6fb26..ec465fb 100644
--- a/dist/epgdata2xmltv/epgdata2xmltv.cpp
+++ b/dist/epgdata2xmltv/epgdata2xmltv.cpp
@@ -561,7 +561,7 @@ int cepgdata2xmltv::Process(int argc, char *argv[])
enca_analyser_free(analyser);
}
- string s = xmlmem;
+ std::string s = xmlmem;
int reps=pcrecpp::RE("&(?![a-zA-Z]{1,8};)").GlobalReplace("%amp;",&s);
if (reps) {
xmlmem = (char *)realloc(xmlmem, s.size()+1);
diff --git a/event.cpp b/event.cpp
index ae33002..1df43ec 100644
--- a/event.cpp
+++ b/event.cpp
@@ -528,7 +528,7 @@ void cXMLTVEvent::GetSQL(const char *Source, int SrcIdx, const char *ChannelID,
return;
}
- string si=sql_insert;
+ std::string si=sql_insert;
int ireps;
ireps=pcrecpp::RE("'").GlobalReplace("''",&si);
ireps+=pcrecpp::RE("\\^").GlobalReplace("'",&si);
@@ -540,7 +540,7 @@ void cXMLTVEvent::GetSQL(const char *Source, int SrcIdx, const char *ChannelID,
}
*Insert=sql_insert;
- string su=sql_update;
+ std::string su=sql_update;
int ureps;
ureps=pcrecpp::RE("'").GlobalReplace("''",&su);
ureps+=pcrecpp::RE("\\^").GlobalReplace("'",&su);
diff --git a/import.cpp b/import.cpp
index 0d6f7bf..e417c59 100644
--- a/import.cpp
+++ b/import.cpp
@@ -1401,7 +1401,7 @@ bool cImport::UpdateXMLTVEvent(cEPGSource *Source, sqlite3 *Db, cXMLTVEvent *xEv
return false;
}
- string ed=shortdesc;
+ std::string ed=shortdesc;
int reps;
reps=pcrecpp::RE("'").GlobalReplace("''",&ed);
@@ -1511,7 +1511,7 @@ bool cImport::UpdateXMLTVEvent(cEPGSource *Source, sqlite3 *Db, const cEvent *Ev
return false;
}
- string ed=eitdescription;
+ std::string ed=eitdescription;
int reps;
reps=pcrecpp::RE("'").GlobalReplace("''",&ed);
@@ -1649,7 +1649,7 @@ cXMLTVEvent *cImport::SearchXMLTVEvent(sqlite3 **Db,const char *ChannelID, const
return NULL;
}
- string st=sqltitle;
+ std::string st=sqltitle;
int reps;
reps=pcrecpp::RE("'").GlobalReplace("''",&st);
|