diff options
-rw-r--r-- | lib/skin_parser/skin_debug.c | 2 | ||||
-rw-r--r-- | lib/skin_parser/skin_parser.c | 2 | ||||
-rw-r--r-- | lib/skin_parser/skin_parser.h | 2 | ||||
-rw-r--r-- | utils/themeeditor/models/parsetreenode.cpp | 14 |
4 files changed, 10 insertions, 10 deletions
diff --git a/lib/skin_parser/skin_debug.c b/lib/skin_parser/skin_debug.c index 496268f3cf..00d09aea7e 100644 --- a/lib/skin_parser/skin_debug.c +++ b/lib/skin_parser/skin_debug.c | |||
@@ -157,7 +157,7 @@ void skin_debug_tree(struct skin_element* root) | |||
157 | 157 | ||
158 | break; | 158 | break; |
159 | 159 | ||
160 | case SUBLINES: | 160 | case LINE_ALTERNATOR: |
161 | printf("[ Alternator on line %d with %d sublines \n", current->line, | 161 | printf("[ Alternator on line %d with %d sublines \n", current->line, |
162 | current->children_count); | 162 | current->children_count); |
163 | debug_indent_level++; | 163 | debug_indent_level++; |
diff --git a/lib/skin_parser/skin_parser.c b/lib/skin_parser/skin_parser.c index 7a30e93fb5..2ce41c6d9a 100644 --- a/lib/skin_parser/skin_parser.c +++ b/lib/skin_parser/skin_parser.c | |||
@@ -325,7 +325,7 @@ static struct skin_element* skin_parse_sublines_optional(char** document, | |||
325 | int i; | 325 | int i; |
326 | 326 | ||
327 | retval = skin_alloc_element(); | 327 | retval = skin_alloc_element(); |
328 | retval->type = SUBLINES; | 328 | retval->type = LINE_ALTERNATOR; |
329 | retval->next = NULL; | 329 | retval->next = NULL; |
330 | retval->line = skin_line; | 330 | retval->line = skin_line; |
331 | 331 | ||
diff --git a/lib/skin_parser/skin_parser.h b/lib/skin_parser/skin_parser.h index 95a22a6d53..d12624e727 100644 --- a/lib/skin_parser/skin_parser.h +++ b/lib/skin_parser/skin_parser.h | |||
@@ -38,7 +38,7 @@ enum skin_element_type | |||
38 | UNKNOWN = -1, | 38 | UNKNOWN = -1, |
39 | VIEWPORT, | 39 | VIEWPORT, |
40 | LINE, | 40 | LINE, |
41 | SUBLINES, | 41 | LINE_ALTERNATOR, |
42 | CONDITIONAL, | 42 | CONDITIONAL, |
43 | TAG, | 43 | TAG, |
44 | TEXT, | 44 | TEXT, |
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; |