changeset 590:eb1072890045

setNonCssProperties() -> setNonCssHints()
author Johannes Hofmann <Johannes.Hofmann@gmx.de>
date Fri, 14 Nov 2008 16:16:25 +0100
parents d82c6a91385f
children a5ef7f8d14c5
files src/css.cc src/css.hh src/html.cc src/styleengine.cc src/styleengine.hh src/table.cc
diffstat 6 files changed, 19 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/src/css.cc	Fri Nov 14 16:11:44 2008 +0100
+++ b/src/css.cc	Fri Nov 14 16:16:25 2008 +0100
@@ -152,14 +152,14 @@
 }
 
 void CssContext::apply (CssPropertyList *props, Doctree *docTree,
-         CssPropertyList *tagStyle, CssPropertyList *nonCss) {
+         CssPropertyList *tagStyle, CssPropertyList *nonCssHints) {
 
    for (int o = CSS_PRIMARY_USER_AGENT; o <= CSS_PRIMARY_USER; o++)
       if (sheet[o])
          sheet[o]->apply (props, docTree);
 
-   if (nonCss)
-        nonCss->apply (props);
+   if (nonCssHints)
+        nonCssHints->apply (props);
 
    for (int o = CSS_PRIMARY_AUTHOR; o <= CSS_PRIMARY_USER_IMPORTANT; o++)
       if (sheet[o])
--- a/src/css.hh	Fri Nov 14 16:11:44 2008 +0100
+++ b/src/css.hh	Fri Nov 14 16:16:25 2008 +0100
@@ -247,7 +247,7 @@
       void addRule (CssRule *rule, CssPrimaryOrder order);
       void apply (CssPropertyList *props,
          Doctree *docTree,
-         CssPropertyList *tagStyle, CssPropertyList *nonCss);
+         CssPropertyList *tagStyle, CssPropertyList *nonCssHints);
 };
 
 #endif
--- a/src/html.cc	Fri Nov 14 16:11:44 2008 +0100
+++ b/src/html.cc	Fri Nov 14 16:16:25 2008 +0100
@@ -1736,7 +1736,7 @@
                        S_TOP(html)->current_bg_color);
    }
 
-   html->styleEngine->setNonCssProperties (&props);
+   html->styleEngine->setNonCssHints (&props);
    html->dw->setStyle (html->styleEngine->style ());
 
    S_TOP(html)->parse_mode = DILLO_HTML_PARSE_MODE_BODY;
@@ -1770,7 +1770,7 @@
       DW2TB(html->dw)->addParbreak (9, html->styleEngine->style ());
    }
    a_Html_tag_set_align_attr (html, &props, tag, tagsize);
-   html->styleEngine->setNonCssProperties (&props);
+   html->styleEngine->setNonCssHints (&props);
 }
 
 /*
@@ -1864,7 +1864,7 @@
    DW2TB(html->dw)->addParbreak (9, html->styleEngine->style ());
 
    a_Html_tag_set_align_attr (html, &props, tag, tagsize);
-   html->styleEngine->setNonCssProperties (&props);
+   html->styleEngine->setNonCssHints (&props);
 
    /* First finalize unclosed H tags (we test if already named anyway) */
    a_Menu_pagemarks_set_text(html->bw, html->Stash->str);
@@ -1931,7 +1931,7 @@
    if ((attrbuf = a_Html_get_attr(html, tag, tagsize, "face")))
       props.set (CssProperty::CSS_PROPERTY_FONT_FAMILY, attrbuf);
 
-   html->styleEngine->setNonCssProperties (&props);
+   html->styleEngine->setNonCssHints (&props);
 }
 
 /*
@@ -2462,7 +2462,7 @@
 
       props.set (CssProperty::PROPERTY_X_LINK, Html_set_new_link(html, &url));
 
-      html->styleEngine->setNonCssProperties (&props);
+      html->styleEngine->setNonCssHints (&props);
    }
 
    if ((attrbuf = a_Html_get_attr(html, tag, tagsize, "name"))) {
@@ -2626,7 +2626,7 @@
          listStyleType = LIST_STYLE_TYPE_UPPER_ROMAN;
 
       props.set (CssProperty::CSS_PROPERTY_LIST_STYLE_TYPE, listStyleType);
-      html->styleEngine->setNonCssProperties (&props);
+      html->styleEngine->setNonCssHints (&props);
    }
 
    DW2TB(html->dw)->addParbreak (9, html->styleEngine->style ());
@@ -3038,7 +3038,7 @@
 
    DW2TB(html->dw)->addParbreak (0, html->styleEngine->style ());
    a_Html_tag_set_align_attr (html, &props, tag, tagsize);
-   html->styleEngine->setNonCssProperties (&props);
+   html->styleEngine->setNonCssHints (&props);
 }
 
 /*
--- a/src/styleengine.cc	Fri Nov 14 16:11:44 2008 +0100
+++ b/src/styleengine.cc	Fri Nov 14 16:16:25 2008 +0100
@@ -69,10 +69,10 @@
  * \brief set properties that were definded using (mostly deprecated) HTML
  *    attributes (e.g. bgColor).
  */
-void StyleEngine::setNonCssProperties (CssPropertyList *props) {
+void StyleEngine::setNonCssHints (CssPropertyList *nonCssHints) {
    if (stack->getRef (stack->size () - 1)->style)
       stack->getRef (stack->size () - 1)->style->unref ();
-   style0 (props); // evaluate now, so caller can free props
+   style0 (nonCssHints); // evaluate now, so caller can free nonCssHints
 }
 
 /**
--- a/src/styleengine.hh	Fri Nov 14 16:11:44 2008 +0100
+++ b/src/styleengine.hh	Fri Nov 14 16:16:25 2008 +0100
@@ -17,7 +17,7 @@
       lout::misc::SimpleVector <Node> *stack;
       CssContext *cssContext;
 
-      dw::core::style::Style *style0 (CssPropertyList *nonCssProperties = NULL);
+      dw::core::style::Style *style0 (CssPropertyList *nonCssHints = NULL);
       void apply (dw::core::style::StyleAttrs *attrs, CssPropertyList *props);
       int computeValue (CssLength value, dw::core::style::Font *font);
 
@@ -40,7 +40,7 @@
       void startElement (int tag, const char *id = NULL, const char *klass = NULL,
          const char *style = NULL);
       void endElement (int tag);
-      void setNonCssProperties (CssPropertyList *props);
+      void setNonCssHints (CssPropertyList *nonCssHints);
       void setPseudoClass (const char *pseudoClass);
 
       inline dw::core::style::Style *style () {
--- a/src/table.cc	Fri Nov 14 16:11:44 2008 +0100
+++ b/src/table.cc	Fri Nov 14 16:16:25 2008 +0100
@@ -98,7 +98,7 @@
       }
    }
 
-   html->styleEngine->setNonCssProperties (&props);
+   html->styleEngine->setNonCssHints (&props);
 
    /* The style for the cells */
    table_cell_props = new CssPropertyList ();
@@ -159,14 +159,14 @@
          }
       }
 
-      html->styleEngine->setNonCssProperties (&props);
+      html->styleEngine->setNonCssHints (&props);
 
       ((dw::Table*)S_TOP(html)->table)->addRow (html->styleEngine->style ());
 
       if (a_Html_get_attr (html, tag, tagsize, "align")) {
          S_TOP(html)->cell_text_align_set = TRUE;
          a_Html_tag_set_align_attr (html, &props, tag, tagsize);
-         html->styleEngine->setNonCssProperties (&props);
+         html->styleEngine->setNonCssHints (&props);
       }
 
       table_cell_props = new CssPropertyList (*S_TOP(html)->table_cell_props);
@@ -283,7 +283,7 @@
          }
       }
 
-      html->styleEngine->setNonCssProperties (&props);
+      html->styleEngine->setNonCssHints (&props);
 
       if (html->styleEngine->style ()->textAlign
           == TEXT_ALIGN_STRING)