changeset 1010:4653ee2e7657

camelCase
author Johannes Hofmann <Johannes.Hofmann@gmx.de>
date Sun, 15 Mar 2009 22:12:11 +0100
parents d56a97316e3a
children 05e4782142f1
files src/cssparser.cc src/cssparser.hh
diffstat 2 files changed, 15 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/src/cssparser.cc	Sun Mar 15 21:25:31 2009 +0100
+++ b/src/cssparser.cc	Sun Mar 15 22:12:11 2009 +0100
@@ -359,8 +359,8 @@
    this->buf = buf;
    this->buflen = buflen;
    this->bufptr = 0;
-   this->space_separated = false;
-   this->within_block = false;
+   this->spaceSeparated = false;
+   this->withinBlock = false;
 
    nextToken ();
 }
@@ -398,13 +398,13 @@
    int i = 0;
 
    ttype = CSS_TK_CHAR; /* init */
-   space_separated = false;
+   spaceSeparated = false;
 
    c = getc();
 
    while (true) {
       if (isspace(c)) { // ignore whitespace
-         space_separated = true;
+         spaceSeparated = true;
          c = getc();
       } else if (c == '/') { // ignore comments
          d = getc();
@@ -550,7 +550,7 @@
    /*
     * Within blocks, '#' starts a color, outside, it is used in selectors.
     */
-   if (c == '#' && within_block) {
+   if (c == '#' && withinBlock) {
       ttype = CSS_TK_COLOR;
 
       tval[0] = c;
@@ -1020,12 +1020,12 @@
    if (ttype == CSS_TK_SYMBOL) {
       selector->element = a_Html_tag_index(tval);
       nextToken();
-      if (space_separated)
+      if (spaceSeparated)
          return true;
    } else if (ttype == CSS_TK_CHAR && tval[0] == '*') {
       selector->element = CssSimpleSelector::ELEMENT_ANY;
       nextToken();
-      if (space_separated)
+      if (spaceSeparated)
          return true;
    } else if (ttype == CSS_TK_CHAR &&
               (tval[0] == '#' ||
@@ -1061,7 +1061,7 @@
 
       if (pp) {
          nextToken();
-         if (space_separated)
+         if (spaceSeparated)
             return true;
 
          if (ttype == CSS_TK_SYMBOL) {
@@ -1071,7 +1071,7 @@
          } else {
             return false; // don't accept classes or id's starting with integer
          }
-         if (space_separated)
+         if (spaceSeparated)
             return true;
       }
    } while (pp);
@@ -1100,7 +1100,7 @@
       } else if (ttype == CSS_TK_CHAR && tval[0] == '>') {
          selector->addSimpleSelector (CssSelector::CHILD);
          nextToken();
-      } else if (ttype != CSS_TK_END && space_separated) {
+      } else if (ttype != CSS_TK_END && spaceSeparated) {
          selector->addSimpleSelector (CssSelector::DESCENDANT);
       } else {
          delete selector;
@@ -1155,13 +1155,13 @@
 
    /* Read block. ('{' has already been read.) */
    if (ttype != CSS_TK_END) {
-      within_block = true;
+      withinBlock = true;
       nextToken();
       do
          parseDeclaration(props, importantProps);
       while (!(ttype == CSS_TK_END ||
                (ttype == CSS_TK_CHAR && tval[0] == '}')));
-      within_block = false;
+      withinBlock = false;
    }
 
    for (int i = 0; i < list->size(); i++) {
@@ -1206,7 +1206,7 @@
    CssPropertyList *props = new CssPropertyList (true);
    CssParser parser (NULL, CSS_ORIGIN_AUTHOR, buf, buflen);
 
-   parser.within_block = true;
+   parser.withinBlock = true;
 
    do
       parser.parseDeclaration(props, NULL);
--- a/src/cssparser.hh	Sun Mar 15 21:25:31 2009 +0100
+++ b/src/cssparser.hh	Sun Mar 15 22:12:11 2009 +0100
@@ -27,8 +27,8 @@
 
       CssTokenType ttype;
       char tval[maxStrLen];
-      bool within_block;
-      bool space_separated; /* used when parsing CSS selectors */
+      bool withinBlock;
+      bool spaceSeparated; /* used when parsing CSS selectors */
 
       CssParser(CssContext *context, CssOrigin origin,
                 const char *buf, int buflen);