changeset 562:145b8a4d65b3

tag -> element
author Johannes Hofmann <Johannes.Hofmann@gmx.de>
date Wed, 12 Nov 2008 16:17:35 +0100
parents 514488f329ea
children b384452e32fb
files src/css.cc src/css.hh src/doctree.hh
diffstat 3 files changed, 5 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/css.cc	Tue Nov 11 22:21:13 2008 +0100
+++ b/src/css.cc	Wed Nov 12 16:17:35 2008 +0100
@@ -48,7 +48,7 @@
 bool CssSelector::match (Doctree *docTree) {
    const DoctreeNode *n = docTree-> top ();
 
-   if (tag >= 0 && tag != n->tag)
+   if (element >= 0 && element != n->element)
       return false;
    if (klass != NULL &&
       (n->klass == NULL || strcmp (klass, n->klass) != 0))
--- a/src/css.hh	Tue Nov 11 22:21:13 2008 +0100
+++ b/src/css.hh	Wed Nov 12 16:17:35 2008 +0100
@@ -12,7 +12,6 @@
       } Value;
 
       typedef enum {
-         CSS_PROPERTY_END = -1,
          CSS_PROPERTY_BACKGROUND_ATTACHMENT,
          CSS_PROPERTY_BACKGROUND_COLOR,
          CSS_PROPERTY_BACKGROUND_IMAGE,
@@ -156,13 +155,13 @@
 /** \todo proper implementation */
 class CssSelector {
    public:
-      int tag;
+      int element;
       const char *klass, *pseudo, *id;
 
    public:
-      CssSelector (int tag = -1, const char *klass = NULL,
+      CssSelector (int element = -1, const char *klass = NULL,
                    const char *pseudo = NULL, const char *id = NULL) {
-         this->tag = tag;
+         this->element = element;
          this->klass = klass;
          this->pseudo = pseudo;
          this->id = id;
--- a/src/doctree.hh	Tue Nov 11 22:21:13 2008 +0100
+++ b/src/doctree.hh	Wed Nov 12 16:17:35 2008 +0100
@@ -4,7 +4,7 @@
 class DoctreeNode {
    public:
       int depth;
-      int tag;
+      int element;
       const char *klass;
       const char *pseudo;
       const char *id;