diff options
author | Robert Bieber <robby@bieberphoto.com> | 2010-06-02 06:12:18 +0000 |
---|---|---|
committer | Robert Bieber <robby@bieberphoto.com> | 2010-06-02 06:12:18 +0000 |
commit | 4003f35dc79c4678526d2ee3a510963713ce88b8 (patch) | |
tree | a5b82cdb81cb56b65f6b5f6a4a4284d5a32f94f0 /utils | |
parent | f16adb045a25bf6f7ac29a2f6c80b25f1a3d2613 (diff) | |
download | rockbox-4003f35dc79c4678526d2ee3a510963713ce88b8.tar.gz rockbox-4003f35dc79c4678526d2ee3a510963713ce88b8.zip |
Theme Editor: Removed the NEWLINE parse tree element
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26463 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'utils')
-rw-r--r-- | utils/themeeditor/parsetreenode.cpp | 13 | ||||
-rw-r--r-- | utils/themeeditor/skin_debug.c | 4 | ||||
-rw-r--r-- | utils/themeeditor/skin_parser.c | 28 | ||||
-rw-r--r-- | utils/themeeditor/skin_parser.h | 1 |
4 files changed, 4 insertions, 42 deletions
diff --git a/utils/themeeditor/parsetreenode.cpp b/utils/themeeditor/parsetreenode.cpp index b283e13038..70124c338d 100644 --- a/utils/themeeditor/parsetreenode.cpp +++ b/utils/themeeditor/parsetreenode.cpp | |||
@@ -107,6 +107,8 @@ QString ParseTreeNode::genCode() const | |||
107 | if(children[i]->element->type == TAG) | 107 | if(children[i]->element->type == TAG) |
108 | buffer.append(TAGSYM); | 108 | buffer.append(TAGSYM); |
109 | buffer.append(children[i]->genCode()); | 109 | buffer.append(children[i]->genCode()); |
110 | if(element->type == LINE || i == 0) | ||
111 | buffer.append('\n'); | ||
110 | } | 112 | } |
111 | break; | 113 | break; |
112 | 114 | ||
@@ -117,6 +119,7 @@ QString ParseTreeNode::genCode() const | |||
117 | if(i != children.count() - 1) | 119 | if(i != children.count() - 1) |
118 | buffer.append(MULTILINESYM); | 120 | buffer.append(MULTILINESYM); |
119 | } | 121 | } |
122 | buffer.append('\n'); | ||
120 | break; | 123 | break; |
121 | 124 | ||
122 | case CONDITIONAL: | 125 | case CONDITIONAL: |
@@ -156,10 +159,6 @@ QString ParseTreeNode::genCode() const | |||
156 | } | 159 | } |
157 | break; | 160 | break; |
158 | 161 | ||
159 | case NEWLINE: | ||
160 | buffer.append('\n'); | ||
161 | break; | ||
162 | |||
163 | case TEXT: | 162 | case TEXT: |
164 | for(char* cursor = element->text; *cursor; cursor++) | 163 | for(char* cursor = element->text; *cursor; cursor++) |
165 | { | 164 | { |
@@ -253,9 +252,6 @@ QVariant ParseTreeNode::data(int column) const | |||
253 | case TAG: | 252 | case TAG: |
254 | return QObject::tr("Tag"); | 253 | return QObject::tr("Tag"); |
255 | 254 | ||
256 | case NEWLINE: | ||
257 | return QObject::tr("Newline"); | ||
258 | |||
259 | case TEXT: | 255 | case TEXT: |
260 | return QObject::tr("Plaintext"); | 256 | return QObject::tr("Plaintext"); |
261 | } | 257 | } |
@@ -295,9 +291,6 @@ QVariant ParseTreeNode::data(int column) const | |||
295 | case CONDITIONAL: | 291 | case CONDITIONAL: |
296 | return QString(); | 292 | return QString(); |
297 | 293 | ||
298 | case NEWLINE: | ||
299 | return QObject::tr("\\n"); | ||
300 | |||
301 | case TEXT: | 294 | case TEXT: |
302 | case COMMENT: | 295 | case COMMENT: |
303 | return QString(element->text); | 296 | return QString(element->text); |
diff --git a/utils/themeeditor/skin_debug.c b/utils/themeeditor/skin_debug.c index 360d7208b9..4d691892ff 100644 --- a/utils/themeeditor/skin_debug.c +++ b/utils/themeeditor/skin_debug.c | |||
@@ -107,10 +107,6 @@ void skin_debug_tree(struct skin_element* root) | |||
107 | current->text); | 107 | current->text); |
108 | break; | 108 | break; |
109 | 109 | ||
110 | case NEWLINE: | ||
111 | printf("[ Newline on line %d ]\n", current->line); | ||
112 | break; | ||
113 | |||
114 | case COMMENT: | 110 | case COMMENT: |
115 | printf("[ Comment on line %d: ", current->line); | 111 | printf("[ Comment on line %d: ", current->line); |
116 | for(i = 0; i < (int)strlen(current->text); i++) | 112 | for(i = 0; i < (int)strlen(current->text); i++) |
diff --git a/utils/themeeditor/skin_parser.c b/utils/themeeditor/skin_parser.c index 860970b7e7..9ff4f90115 100644 --- a/utils/themeeditor/skin_parser.c +++ b/utils/themeeditor/skin_parser.c | |||
@@ -49,7 +49,6 @@ int skin_parse_tag(struct skin_element* element, char** document); | |||
49 | int skin_parse_text(struct skin_element* element, char** document, | 49 | int skin_parse_text(struct skin_element* element, char** document, |
50 | int conditional); | 50 | int conditional); |
51 | int skin_parse_conditional(struct skin_element* element, char** document); | 51 | int skin_parse_conditional(struct skin_element* element, char** document); |
52 | int skin_parse_newline(struct skin_element* element, char** document); | ||
53 | int skin_parse_comment(struct skin_element* element, char** document); | 52 | int skin_parse_comment(struct skin_element* element, char** document); |
54 | struct skin_element* skin_parse_code_as_arg(char** document); | 53 | struct skin_element* skin_parse_code_as_arg(char** document); |
55 | 54 | ||
@@ -166,10 +165,7 @@ struct skin_element* skin_parse_viewport(char** document) | |||
166 | 165 | ||
167 | if(*cursor == '\n') | 166 | if(*cursor == '\n') |
168 | { | 167 | { |
169 | *to_write = skin_alloc_element(); | 168 | cursor++; |
170 | skin_parse_newline(*to_write, &cursor); | ||
171 | if(!last) | ||
172 | return NULL; | ||
173 | } | 169 | } |
174 | else if(sublines) | 170 | else if(sublines) |
175 | { | 171 | { |
@@ -705,28 +701,6 @@ int skin_parse_conditional(struct skin_element* element, char** document) | |||
705 | return 1; | 701 | return 1; |
706 | } | 702 | } |
707 | 703 | ||
708 | int skin_parse_newline(struct skin_element* element, char** document) | ||
709 | { | ||
710 | |||
711 | char* cursor = *document; | ||
712 | if(*cursor != '\n') | ||
713 | { | ||
714 | skin_error(NEWLINE_EXPECTED); | ||
715 | return 0; | ||
716 | } | ||
717 | cursor++; | ||
718 | |||
719 | /* Assembling a skin_element struct for a newline */ | ||
720 | element->type = NEWLINE; | ||
721 | element->line = skin_line; | ||
722 | skin_line++; | ||
723 | element->next = NULL; | ||
724 | |||
725 | *document = cursor; | ||
726 | |||
727 | return 1; | ||
728 | } | ||
729 | |||
730 | int skin_parse_comment(struct skin_element* element, char** document) | 704 | int skin_parse_comment(struct skin_element* element, char** document) |
731 | { | 705 | { |
732 | char* cursor = *document; | 706 | char* cursor = *document; |
diff --git a/utils/themeeditor/skin_parser.h b/utils/themeeditor/skin_parser.h index ca2d7bc54b..d3821c0f9b 100644 --- a/utils/themeeditor/skin_parser.h +++ b/utils/themeeditor/skin_parser.h | |||
@@ -47,7 +47,6 @@ enum skin_element_type | |||
47 | SUBLINES, | 47 | SUBLINES, |
48 | CONDITIONAL, | 48 | CONDITIONAL, |
49 | TAG, | 49 | TAG, |
50 | NEWLINE, | ||
51 | TEXT, | 50 | TEXT, |
52 | COMMENT, | 51 | COMMENT, |
53 | }; | 52 | }; |