[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/khtml/css
From:       Allan Sandfeld Jensen <kde () carewolf ! com>
Date:       2005-06-21 19:24:54
Message-ID: 1119381894.129290.21236.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 427759 by carewolf:

Clean code


 M  +9 -7      css_base.cpp  


--- trunk/KDE/kdelibs/khtml/css/css_base.cpp #427758:427759
@@ -307,34 +307,36 @@
 
 DOMString CSSSelector::selectorText() const
 {
-    // #### fix namespace
+    // FIXME: Support namespaces when dumping the selector text.  This requires preserving
+    // the original namespace prefix used. Ugh. -dwh
     DOMString str;
     const CSSSelector* cs = this;
-    if ( cs->tag == 0xffffffff && cs->attr == ATTR_ID && cs->match == CSSSelector::Id )
+    Q_UINT16 tag = localNamePart(cs->tag);
+    if ( tag == anyLocalName && cs->attr == ATTR_ID && cs->match == CSSSelector::Id )
     {
         str = "#";
         str += cs->value;
     }
-    else if ( cs->tag == 0xffffffff && cs->attr == ATTR_CLASS && cs->match == CSSSelector::List )
+    else if ( tag == anyLocalName && cs->attr == ATTR_CLASS && cs->match == CSSSelector::List )
     {
         str = ".";
         str += cs->value;
     }
-    else if ( cs->tag == 0xffffffff && cs->match == CSSSelector::PseudoClass )
+    else if ( tag == anyLocalName && cs->match == CSSSelector::PseudoClass )
     {
         str = ":";
         str += cs->value;
     }
-    else if ( cs->tag == 0xffffffff && cs->match == CSSSelector::PseudoElement )
+    else if ( tag == anyLocalName && cs->match == CSSSelector::PseudoElement )
     {
         str = "::";
         str += cs->value;
     }
     else
     {
-        if ( cs->tag == 0xffffffff )
+        if ( tag == anyLocalName )
             str = "*";
-        else if ( cs->tag != 0xffff )
+        else if ( tag != anyLocalName )
             str = getTagName( cs->tag );
         if ( cs->attr == ATTR_ID && cs->match == CSSSelector::Id )
         {
[prev in list] [next in list] [prev in thread] [next in thread]