xmlinterface use const char instand char

This commit is contained in:
Jacek Jendrzej
2015-03-20 12:05:22 +01:00
parent 40fe7fae34
commit 8227a01592
9 changed files with 50 additions and 50 deletions

View File

@@ -347,7 +347,7 @@ void *insertEventsfromFile(void * data)
node = event->xmlChildrenNode;
while ((node = xmlGetNextOccurence(node, "name"))) {
char *s = xmlGetAttribute(node, "string");
const char *s = xmlGetAttribute(node, "string");
if (s)
e.setName(ZapitTools::UTF8_to_Latin1(xmlGetAttribute(node, "lang")), s);
node = node->xmlNextNode;
@@ -355,7 +355,7 @@ void *insertEventsfromFile(void * data)
node = event->xmlChildrenNode;
while ((node = xmlGetNextOccurence(node, "text"))) {
char *s = xmlGetAttribute(node, "string");
const char *s = xmlGetAttribute(node, "string");
if (s)
e.setText(ZapitTools::UTF8_to_Latin1(xmlGetAttribute(node, "lang")), s);
node = node->xmlNextNode;
@@ -363,7 +363,7 @@ void *insertEventsfromFile(void * data)
node = event->xmlChildrenNode;
while ((node = xmlGetNextOccurence(node, "item"))) {
#ifdef USE_ITEM_DESCRIPTION
char *s = xmlGetAttribute(node, "string");
const char *s = xmlGetAttribute(node, "string");
if (s)
e.item = s;
#endif
@@ -373,7 +373,7 @@ void *insertEventsfromFile(void * data)
node = event->xmlChildrenNode;
while ((node = xmlGetNextOccurence(node, "item_description"))) {
#ifdef USE_ITEM_DESCRIPTION
char *s = xmlGetAttribute(node, "string");
const char *s = xmlGetAttribute(node, "string");
if (s)
e.itemDescription = s;
#endif
@@ -381,8 +381,8 @@ void *insertEventsfromFile(void * data)
}
node = event->xmlChildrenNode;
while ((node = xmlGetNextOccurence(node, "extended_text"))) {
char *l = xmlGetAttribute(node, "lang");
char *s = xmlGetAttribute(node, "string");
const char *l = xmlGetAttribute(node, "lang");
const char *s = xmlGetAttribute(node, "string");
if (l && s)
e.appendExtendedText(ZapitTools::UTF8_to_Latin1(l), s);
node = node->xmlNextNode;
@@ -397,10 +397,10 @@ void *insertEventsfromFile(void * data)
node = event->xmlChildrenNode;
while ((node = xmlGetNextOccurence(node, "content"))) {
char cl = xmlGetNumericAttribute(node, "class", 16);
const char cl = xmlGetNumericAttribute(node, "class", 16);
contentClassification += cl;
cl = xmlGetNumericAttribute(node, "user", 16);
userClassification += cl;
const char cl2 = xmlGetNumericAttribute(node, "user", 16);
userClassification += cl2;
node = node->xmlNextNode;
}
@@ -410,7 +410,7 @@ void *insertEventsfromFile(void * data)
c.streamContent = xmlGetNumericAttribute(node, "stream_content", 16);
c.componentType = xmlGetNumericAttribute(node, "type", 16);
c.componentTag = xmlGetNumericAttribute(node, "tag", 16);
char *s = xmlGetAttribute(node, "text");
const char *s = xmlGetAttribute(node, "text");
if (s)
c.setComponent(s);
//e.components.insert(c);
@@ -420,7 +420,7 @@ void *insertEventsfromFile(void * data)
node = event->xmlChildrenNode;
while ((node = xmlGetNextOccurence(node, "parental_rating"))) {
char *s = xmlGetAttribute(node, "country");
const char *s = xmlGetAttribute(node, "country");
if (s)
#if 0
e.ratings.insert(SIparentalRating(ZapitTools::UTF8_to_Latin1(s),
@@ -438,7 +438,7 @@ void *insertEventsfromFile(void * data)
l.transportStreamId = xmlGetNumericAttribute(node, "transport_stream_id", 16);
l.originalNetworkId = xmlGetNumericAttribute(node, "original_network_id", 16);
l.serviceId = xmlGetNumericAttribute(node, "service_id", 16);
char *s = xmlGetAttribute(node, "linkage_descriptor");
const char *s = xmlGetAttribute(node, "linkage_descriptor");
if (s)
l.name = s;
e.linkage_descs.insert(e.linkage_descs.end(), l);