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

List:       kde-commits
Subject:    kdenonbeta
From:       Rob Buis <rwlbuis () xs4all ! nl>
Date:       2005-09-04 22:51:03
Message-ID: 1125874263.557303.17635.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 457188 by buis:

Apply a few (tested) leak fixes by MacDome, I'll investigate other
leak fixes tomorrow...


 M  +9 -9      kdom/css/CSSStyleSelector.cpp  
 M  +2 -2      ksvg2/css/SVGCSSStyleSelector.cpp  
 M  +4 -4      ksvg2/svg/SVGStyleElementImpl.cpp  


--- trunk/kdenonbeta/kdom/css/CSSStyleSelector.cpp #457187:457188
@@ -139,10 +139,10 @@
     if(!userStyleSheet.isEmpty())
     {
         userSheet = new CSSStyleSheetImpl(doc);
-        userSheet->parseString(new DOMStringImpl(userStyleSheet));
+        userSheet->parseString(DOMString(userStyleSheet).handle());
 
         userStyle = new CSSStyleSelectorList();
-        userStyle->append(userSheet, new DOMStringImpl(m_medium));
+        userStyle->append(userSheet, DOMString(m_medium).handle());
     }
 
     // add stylesheets from document
@@ -152,7 +152,7 @@
     for(; it.current(); ++it)
     {
            if(it.current()->isCSSStyleSheet())
-            authorStyle->append(static_cast<CSSStyleSheetImpl *>(it.current()), new \
DOMStringImpl(m_medium)); +               \
authorStyle->append(static_cast<CSSStyleSheetImpl *>(it.current()), \
DOMString(m_medium).handle());  }
 
     KURL u = url;
@@ -183,7 +183,7 @@
     m_medium = view ? view->mediaType() : QString::fromLatin1("all");
 
     authorStyle = new CSSStyleSelectorList();
-    authorStyle->append(sheet, new DOMStringImpl(m_medium));
+    authorStyle->append(sheet, DOMString(m_medium).handle());
 }
 
 void CSSStyleSelector::init(const KDOMSettings *_settings)
@@ -217,7 +217,7 @@
 {
     KDOMView *view = sheet->doc()->view();
     m_medium = view ? view->mediaType() : QString::fromLatin1("screen");
-    authorStyle->append(sheet, new DOMStringImpl(m_medium));
+    authorStyle->append(sheet, DOMString(m_medium).handle());
 }
 
 void CSSStyleSelector::clear()
@@ -642,7 +642,7 @@
         return;
     }
 
-    DOMString attr(e->getAttribute(new DOMStringImpl("href")));
+    DOMString attr(e->getAttribute(DOMString("href").handle()));
     if(attr.isNull())
     {
         pseudoState = PseudoNone;
@@ -3646,7 +3646,7 @@
             {
                 int attrID = element->ownerDocument()->getId(NodeImpl::AttributeId, \
val->getDOMStringValue(), false);  if(attrID)
-                    style->setContent(element->getAttribute(attrID), i != 0);
+                    \
style->setContent(DOMString(element->getAttribute(attrID)).handle(), i != 0);  }
             else if(val->primitiveType() == CSS_URI)
             {
@@ -3657,7 +3657,7 @@
                 style->setContent(val->getCounterValue(), i != 0);
             else if(val->primitiveType() == CSS_IDENT)
             {
-                EQuoteContent quote;
+                EQuoteContent quote = QC_NO_QUOTE;
                 switch (val->getIdent())
                 {
                     case CSS_VAL_OPEN_QUOTE:
@@ -4204,7 +4204,7 @@
 DOMStringImpl *CSSStyleSelector::getLangAttribute(ElementImpl *e)
 {
     // TODO: Check NS_XML & friends...
-    return e->getAttributeNS(NS_XML.handle(), new DOMStringImpl("xml:lang"));
+    return e->getAttributeNS(NS_XML.handle(), DOMString("xml:lang").handle());
 }
 
 // vim:ts=4:noet
--- trunk/kdenonbeta/ksvg2/css/SVGCSSStyleSelector.cpp #457187:457188
@@ -156,10 +156,10 @@
 
     // Collect only strict-mode rules.
     s_defaultStyle = new KDOM::CSSStyleSelectorList();
-    s_defaultStyle->append(s_defaultSheet, new KDOM::DOMStringImpl("screen"));
+    s_defaultStyle->append(s_defaultSheet, KDOM::DOMString("screen").handle());
 
     s_defaultPrintStyle = new KDOM::CSSStyleSelectorList();
-    s_defaultPrintStyle->append(s_defaultSheet, new KDOM::DOMStringImpl("print"));
+    s_defaultPrintStyle->append(s_defaultSheet, KDOM::DOMString("print").handle());
 }
 
 unsigned int SVGCSSStyleSelector::addExtraDeclarations(KDOM::ElementImpl *e, \
                unsigned int numProps)
--- trunk/kdenonbeta/ksvg2/svg/SVGStyleElementImpl.cpp #457187:457188
@@ -46,7 +46,7 @@
 
 KDOM::DOMStringImpl *SVGStyleElementImpl::xmlspace() const
 {
-    return tryGetAttribute(new KDOM::DOMStringImpl("xml:space"));
+    return tryGetAttribute(KDOM::DOMString("xml:space").handle());
 }
 
 void SVGStyleElementImpl::setXmlspace(KDOM::DOMStringImpl *)
@@ -56,7 +56,7 @@
 
 KDOM::DOMStringImpl *SVGStyleElementImpl::type() const
 {
-    return tryGetAttribute(new KDOM::DOMStringImpl("type"), new \
KDOM::DOMStringImpl("text/css")); +    return \
tryGetAttribute(KDOM::DOMString("type").handle(), \
KDOM::DOMString("text/css").handle());  }
 
 void SVGStyleElementImpl::setType(KDOM::DOMStringImpl *)
@@ -66,7 +66,7 @@
 
 KDOM::DOMStringImpl *SVGStyleElementImpl::media() const
 {
-    return tryGetAttribute(new KDOM::DOMStringImpl("media"), new \
KDOM::DOMStringImpl("all")); +    return \
tryGetAttribute(KDOM::DOMString("media").handle(), KDOM::DOMString("all").handle());  \
}  
 void SVGStyleElementImpl::setMedia(KDOM::DOMStringImpl *)
@@ -76,7 +76,7 @@
 
 KDOM::DOMStringImpl *SVGStyleElementImpl::title() const
 {
-    return tryGetAttribute(new KDOM::DOMStringImpl("title"));
+    return tryGetAttribute(KDOM::DOMString("title").handle());
 }
 
 void SVGStyleElementImpl::setTitle(KDOM::DOMStringImpl *)


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