summaryrefslogtreecommitdiff
path: root/utils/themeeditor/models
diff options
context:
space:
mode:
Diffstat (limited to 'utils/themeeditor/models')
-rw-r--r--utils/themeeditor/models/parsetreenode.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/utils/themeeditor/models/parsetreenode.cpp b/utils/themeeditor/models/parsetreenode.cpp
index 7efcbc3ffc..1ce3d098b9 100644
--- a/utils/themeeditor/models/parsetreenode.cpp
+++ b/utils/themeeditor/models/parsetreenode.cpp
@@ -69,7 +69,7 @@ ParseTreeNode::ParseTreeNode(struct skin_element* data, ParseTreeNode* parent)
69 children.append(new ParseTreeNode(data->children[i], this)); 69 children.append(new ParseTreeNode(data->children[i], this));
70 break; 70 break;
71 71
72 case SUBLINES: 72 case LINE_ALTERNATOR:
73 for(int i = 0; i < element->children_count; i++) 73 for(int i = 0; i < element->children_count; i++)
74 { 74 {
75 children.append(new ParseTreeNode(data->children[i], this)); 75 children.append(new ParseTreeNode(data->children[i], this));
@@ -147,13 +147,13 @@ QString ParseTreeNode::genCode() const
147 buffer.append(children[i]->genCode()); 147 buffer.append(children[i]->genCode());
148 } 148 }
149 if(openConditionals == 0 149 if(openConditionals == 0
150 && !(parent && parent->element->type == SUBLINES)) 150 && !(parent && parent->element->type == LINE_ALTERNATOR))
151 { 151 {
152 buffer.append('\n'); 152 buffer.append('\n');
153 } 153 }
154 break; 154 break;
155 155
156 case SUBLINES: 156 case LINE_ALTERNATOR:
157 for(int i = 0; i < children.count(); i++) 157 for(int i = 0; i < children.count(); i++)
158 { 158 {
159 buffer.append(children[i]->genCode()); 159 buffer.append(children[i]->genCode());
@@ -282,7 +282,7 @@ int ParseTreeNode::genHash() const
282 break; 282 break;
283 case VIEWPORT: 283 case VIEWPORT:
284 case LINE: 284 case LINE:
285 case SUBLINES: 285 case LINE_ALTERNATOR:
286 case CONDITIONAL: 286 case CONDITIONAL:
287 hash += element->children_count; 287 hash += element->children_count;
288 break; 288 break;
@@ -371,7 +371,7 @@ QVariant ParseTreeNode::data(int column) const
371 case LINE: 371 case LINE:
372 return QObject::tr("Logical Line"); 372 return QObject::tr("Logical Line");
373 373
374 case SUBLINES: 374 case LINE_ALTERNATOR:
375 return QObject::tr("Alternator"); 375 return QObject::tr("Alternator");
376 376
377 case COMMENT: 377 case COMMENT:
@@ -419,7 +419,7 @@ QVariant ParseTreeNode::data(int column) const
419 case UNKNOWN: 419 case UNKNOWN:
420 case VIEWPORT: 420 case VIEWPORT:
421 case LINE: 421 case LINE:
422 case SUBLINES: 422 case LINE_ALTERNATOR:
423 return QString(); 423 return QString();
424 424
425 case CONDITIONAL: 425 case CONDITIONAL:
@@ -543,7 +543,7 @@ void ParseTreeNode::render(const RBRenderInfo &info, RBViewport* viewport,
543 int child = evalTag(info, true, element->children_count).toInt(); 543 int child = evalTag(info, true, element->children_count).toInt();
544 children[element->params_count + child]->render(info, viewport, true); 544 children[element->params_count + child]->render(info, viewport, true);
545 } 545 }
546 else if(element->type == SUBLINES) 546 else if(element->type == LINE_ALTERNATOR)
547 { 547 {
548 /* First we build a list of the times for each branch */ 548 /* First we build a list of the times for each branch */
549 QList<double> times; 549 QList<double> times;