summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordeva <deva>2008-06-20 09:34:36 +0000
committerdeva <deva>2008-06-20 09:34:36 +0000
commit9e2a2daf56fd87e773050583df11a32e04a6a447 (patch)
tree4966ae4da6bd3c13fb0014bc928597bcf7a3a7c1
parent84c884f28ece21c13708929093b8ed670f870efd (diff)
Changed internal tagname attribute from 'type' to 'tagname'.
-rw-r--r--server/src/macroparser.cc4
-rw-r--r--server/src/widgetgenerator.cc2
2 files changed, 3 insertions, 3 deletions
diff --git a/server/src/macroparser.cc b/server/src/macroparser.cc
index 6f4798e..9175c07 100644
--- a/server/src/macroparser.cc
+++ b/server/src/macroparser.cc
@@ -195,7 +195,7 @@ void MacroParser::startTag(std::string name, std::map< std::string, std::string>
assert(m); // No macro is currently available, cannot create window!
m->window.attributes = attributes;
- m->window.attributes["type"] = name;
+ m->window.attributes["tagname"] = name;
Widget *current = &(m->window);
widgetstack.push_back(current);
@@ -211,7 +211,7 @@ void MacroParser::startTag(std::string name, std::map< std::string, std::string>
Widget w;
w.attributes = attributes;
- w.attributes["type"] = name;
+ w.attributes["tagname"] = name;
Widget *parent = widgetstack.back();
parent->widgets.push_back(w);
diff --git a/server/src/widgetgenerator.cc b/server/src/widgetgenerator.cc
index 4061600..32fdaba 100644
--- a/server/src/widgetgenerator.cc
+++ b/server/src/widgetgenerator.cc
@@ -72,7 +72,7 @@ static std::string send_macro_widget(Macro &macro,
}
while(p != widget.attributes.end()) {
- if(p->first != "type" && p->first != "map") {
+ if(p->first != "tagname" && p->first != "map") {
result += " " + p->first + "=\"" + p->second + "\"";
}
p++;