From kde-commits  Sun Nov 30 21:56:07 2003
From: Rob Buis <rwlbuis () xs4all ! nl>
Date: Sun, 30 Nov 2003 21:56:07 +0000
To: kde-commits
Subject: kdegraphics/ksvg/impl
X-MARC-Message: https://marc.info/?l=kde-commits&m=107022939906141

CVS commit by buis: 


Save 16 bytes per element at a tiny speed loss...


  M +14 -14    SVGElementImpl.cc   1.177
  M +4 -6      SVGElementImpl.h   1.104


--- kdegraphics/ksvg/impl/SVGElementImpl.h  #1.103:1.104
@@ -75,8 +75,8 @@ public:
 
         void setId(DOM::DOMString);
-        DOM::DOMString id();
+        DOM::DOMString id() const;
 
         void setXmlbase(DOM::DOMString);
-        DOM::DOMString xmlbase();
+        DOM::DOMString xmlbase() const;
 
         void setOwnerSVGElement(SVGSVGElementImpl *owner);
@@ -187,12 +187,10 @@ protected:
 
 private:
-        DOM::DOMString m_id;
-        DOM::DOMString m_xmlbase;
-
         SVGSVGElementImpl *m_ownerSVGElement;
         SVGElementImpl *m_viewportElement;
         SVGDocumentImpl *m_ownerDoc;
 
-        bool m_mouseOver, m_focus;
+        bool m_mouseOver : 1;
+        bool m_focus : 1;
 
         QPtrList<SVGRegisteredEventListener> m_eventListeners;

--- kdegraphics/ksvg/impl/SVGElementImpl.cc  #1.176:1.177
@@ -218,11 +218,11 @@ Value SVGElementImpl::getValueProperty(E
         {
                 case ElementId:
-                        return String(m_id.string());
+                        return String(id().string());
+                case XmlBase:
+                        return String(xmlbase().string());
                 case OwnerSvgElement:
                         return getDOMNode(exec, *ownerSVGElement());
                 case ViewportElement:
                         return getDOMNode(exec, *viewportElement());
-                case XmlBase:
-                        return String(m_xmlbase.string());
                 default:
                         kdWarning() << "Unhandled token in " << k_funcinfo << " : " << token << endl;
@@ -239,5 +239,5 @@ void SVGElementImpl::putValueProperty(Ex
                         break;
                 case XmlBase:
-                        m_xmlbase = value.toString(exec).string();
+                        setXmlbase(value.toString(exec).string());
                         break;
                 case OnMouseUp:
@@ -391,25 +391,25 @@ void SVGElementImpl::setApplyAttribute(c
 void SVGElementImpl::setId(DOM::DOMString id)
 {
-        m_id = id;
+        setAttribute("id", id);
 
-        if(ownerDoc() && ownerDoc()->rootElement() && !m_id.isEmpty())
-                ownerDoc()->rootElement()->addToIdMap(m_id.string(), this);
-        else if(m_ownerSVGElement && !m_id.isEmpty())
-                m_ownerSVGElement->addToIdMap(m_id.string(), this);
+        if(ownerDoc() && ownerDoc()->rootElement() && !id.isEmpty())
+                ownerDoc()->rootElement()->addToIdMap(id.string(), this);
+        else if(m_ownerSVGElement && !id.isEmpty())
+                m_ownerSVGElement->addToIdMap(id.string(), this);
 }
 
-DOM::DOMString SVGElementImpl::id()
+DOM::DOMString SVGElementImpl::id() const
 {
-        return m_id;
+        return getAttribute("id");
 }
 
 void SVGElementImpl::setXmlbase(DOM::DOMString xmlbase)
 {
-        m_xmlbase = xmlbase;
+        setAttribute("xml:base", xmlbase);
 }
 
-DOM::DOMString SVGElementImpl::xmlbase()
+DOM::DOMString SVGElementImpl::xmlbase() const
 {
-        return m_xmlbase;
+        return getAttribute("xml:base");
 }