summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2010-07-04 02:04:14 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2010-07-04 02:04:14 +0000
commitdc34785b18ee91b7705d96ab8bb3cc0b984b85fb (patch)
tree9352a4344fd872d3f51ea9df1acb027d60e77fe0
parent7cfb56484e692a687b12c0c1207ebfb2c579012c (diff)
downloadrockbox-dc34785b18ee91b7705d96ab8bb3cc0b984b85fb.tar.gz
rockbox-dc34785b18ee91b7705d96ab8bb3cc0b984b85fb.tar.bz2
rockbox-dc34785b18ee91b7705d96ab8bb3cc0b984b85fb.zip
s/SUBLINES/LINE_ALTERNATOR/
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27271 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--lib/skin_parser/skin_debug.c2
-rw-r--r--lib/skin_parser/skin_parser.c2
-rw-r--r--lib/skin_parser/skin_parser.h2
-rw-r--r--utils/themeeditor/models/parsetreenode.cpp14
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)
break;
- case SUBLINES:
+ case LINE_ALTERNATOR:
printf("[ Alternator on line %d with %d sublines \n", current->line,
current->children_count);
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,
int i;
retval = skin_alloc_element();
- retval->type = SUBLINES;
+ retval->type = LINE_ALTERNATOR;
retval->next = NULL;
retval->line = skin_line;
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
UNKNOWN = -1,
VIEWPORT,
LINE,
- SUBLINES,
+ LINE_ALTERNATOR,
CONDITIONAL,
TAG,
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)
children.append(new ParseTreeNode(data->children[i], this));
break;
- case SUBLINES:
+ case LINE_ALTERNATOR:
for(int i = 0; i < element->children_count; i++)
{
children.append(new ParseTreeNode(data->children[i], this));
@@ -147,13 +147,13 @@ QString ParseTreeNode::genCode() const
buffer.append(children[i]->genCode());
}
if(openConditionals == 0
- && !(parent && parent->element->type == SUBLINES))
+ && !(parent && parent->element->type == LINE_ALTERNATOR))
{
buffer.append('\n');
}
break;
- case SUBLINES:
+ case LINE_ALTERNATOR:
for(int i = 0; i < children.count(); i++)
{
buffer.append(children[i]->genCode());
@@ -282,7 +282,7 @@ int ParseTreeNode::genHash() const
break;
case VIEWPORT:
case LINE:
- case SUBLINES:
+ case LINE_ALTERNATOR:
case CONDITIONAL:
hash += element->children_count;
break;
@@ -371,7 +371,7 @@ QVariant ParseTreeNode::data(int column) const
case LINE:
return QObject::tr("Logical Line");
- case SUBLINES:
+ case LINE_ALTERNATOR:
return QObject::tr("Alternator");
case COMMENT:
@@ -419,7 +419,7 @@ QVariant ParseTreeNode::data(int column) const
case UNKNOWN:
case VIEWPORT:
case LINE:
- case SUBLINES:
+ case LINE_ALTERNATOR:
return QString();
case CONDITIONAL:
@@ -543,7 +543,7 @@ void ParseTreeNode::render(const RBRenderInfo &info, RBViewport* viewport,
int child = evalTag(info, true, element->children_count).toInt();
children[element->params_count + child]->render(info, viewport, true);
}
- else if(element->type == SUBLINES)
+ else if(element->type == LINE_ALTERNATOR)
{
/* First we build a list of the times for each branch */
QList<double> times;