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

List:       kde-commits
Subject:    branches/work/khtml-svg/misc
From:       Nikolas Zimmermann <wildfox () kde ! org>
Date:       2006-04-01 18:35:30
Message-ID: 1143916530.523380.4515.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 525352 by wildfox:

Also offer helper method getAttrIDSVG, not needed for tags* those are already seperated in HTML and SVG..


 M  +20 -20    hashes.cpp  
 M  +5 -1      hashes.h  


--- branches/work/khtml-svg/misc/hashes.cpp #525351:525352
@@ -36,16 +36,10 @@
         if (!tagPtr)
         {
 #if SVG_SUPPORT
-            { // SVG Tags
-                const struct tags_svg *tagPtr = findTagSVG(tagStr, len);
-                if (!tagPtr)
-                    return 0;
-
-                return tagPtr->id;
-            }
+            return getTagIDSVG(tagStr, len);
+#else
+            return 0;
 #endif
-
-            return 0;
         }
 
         return tagPtr->id;
@@ -85,29 +79,35 @@
     }
 }
 
-int khtml::getAttrID(const char *tagStr, int len)
+int khtml::getAttrID(const char *attrStr, int len)
 {
     { // HTML Attributes
-        const struct attrs_html *attrPtr = findAttrHTML(tagStr, len);
+        const struct attrs_html *attrPtr = findAttrHTML(attrStr, len);
         if (!attrPtr)
         {
 #if SVG_SUPPORT
-            { // SVG Attributes
-                const struct attrs_svg *attrPtr = findAttrSVG(tagStr, len);
-                if (!attrPtr)
-                    return 0;
-
-                return attrPtr->id;
-            }
+            return getAttrIDSVG(attrStr, len);
+#else
+            return 0;
 #endif
-
-            return 0;
         }
 
         return attrPtr->id;
     }
 }
 
+#if SVG_SUPPORT
+int khtml::getAttrIDSVG(const char *attrStr, int len)
+{
+    const struct attrs_svg *attrPtr = findAttrSVG(attrStr, len);
+    if (!attrPtr)
+        return 0;
+
+    return attrPtr->id;
+}
+#endif
+
+
 const char *khtml::getAttrName(unsigned short id)
 {
     { // HTML Attributes
--- branches/work/khtml-svg/misc/hashes.h #525351:525352
@@ -43,8 +43,12 @@
 #endif
 
     // Attrs name <-> id resolution
-    int getAttrID(const char *tagStr, int len);
+    int getAttrID(const char *attrStr, int len);
     const char *getAttrName(unsigned short id);
+
+#if SVG_SUPPORT
+    int getAttrIDSVG(const char *attrStr, int len);
+#endif
 }
 
 #endif
[prev in list] [next in list] [prev in thread] [next in thread]