summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsvntobi <svntobi@cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f>2007-07-27 22:32:47 +0000
committersvntobi <svntobi@cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f>2007-07-27 22:32:47 +0000
commitd2ff7b4d49309b77d91cd96446edd008d145a90b (patch)
tree50a44f468a1c3d6851e024e045bec7548114daed
parent0cf4f7defaca6e05f264e708d4b7466440466859 (diff)
downloadvdr-plugin-menuorg-d2ff7b4d49309b77d91cd96446edd008d145a90b.tar.gz
vdr-plugin-menuorg-d2ff7b4d49309b77d91cd96446edd008d145a90b.tar.bz2
made it work
git-svn-id: file:///home/tobias/sandbox/vdr/--/vdr-pkg/vdr-pkg/submenu/trunk@5659 cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f
-rw-r--r--src/xmlmenu.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/xmlmenu.cpp b/src/xmlmenu.cpp
index a716627..d4e92ee 100644
--- a/src/xmlmenu.cpp
+++ b/src/xmlmenu.cpp
@@ -55,7 +55,7 @@ void XmlMenu::parseNode(const Element* element, MenuNode* menuNode)
{
if (const xmlpp::Attribute* nameAttribute = childElement->get_attribute("name"))
{
- MenuNode* subMenu = menuNode->AddChild(new SubMenuItem(nameAttribute->get_value().c_str()));
+ MenuNode* subMenu = menuNode->AddChild(new SubMenuItem(nameAttribute->get_value()));
parseNode(childElement, subMenu);
}
}
@@ -63,9 +63,8 @@ void XmlMenu::parseNode(const Element* element, MenuNode* menuNode)
{
if (const xmlpp::Attribute* nameAttribute = childElement->get_attribute("name"))
{
- const char* systemMenuItemText = nameAttribute->get_value().c_str();
- MenuNode* systemMenuItem = menuNode->AddChild(
- new VdrMenuItem(systemMenuItemText, geteOSState(systemMenuItemText)));
+ std::string systemMenuItemText = nameAttribute->get_value();
+ menuNode->AddChild(new VdrMenuItem(systemMenuItemText, geteOSState(systemMenuItemText)));
}
}
if (childElement->get_name() == "plugin")
@@ -77,8 +76,7 @@ void XmlMenu::parseNode(const Element* element, MenuNode* menuNode)
if (FindPluginByName(nameAttribute->get_value(), &pluginMainMenuEntry, pluginIndex))
{
- MenuNode* pluginMenuItem = menuNode->AddChild(
- new PluginMenuItem(pluginMainMenuEntry, pluginIndex));
+ menuNode->AddChild(new PluginMenuItem(pluginMainMenuEntry, pluginIndex));
}
}
}