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

List:       kde-commits
Subject:    kdenonbeta/kdom/core
From:       Frans Englich <frans.englich () telia ! com>
Date:       2006-06-14 12:17:20
Message-ID: 1150287440.070745.21197.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 551349 by englich:

Compile without warnings with -Wshadow.


 M  +7 -7      AttrImpl.h  
 M  +1 -1      ElementImpl.h  


--- trunk/kdenonbeta/kdom/core/AttrImpl.h #551348:551349
@@ -51,12 +51,12 @@
 
     public:
         // null value is forbidden !
-        AttributeImpl(const QualifiedName& name, const AtomicString& value)
-            : m_name(name), m_value(value), m_impl(0)
+        AttributeImpl(const QualifiedName& n, const AtomicString& val)
+            : m_name(n), m_value(val), m_impl(0)
         {}
 
-        AttributeImpl(const AtomicString& name, const AtomicString& value)
-            : m_name(nullAtom, name, nullAtom), m_value(value), m_impl(0)
+        AttributeImpl(const AtomicString& n, const AtomicString& val)
+            : m_name(nullAtom, n, nullAtom), m_value(val), m_impl(0)
         {}
 
         virtual ~AttributeImpl() {}
@@ -76,8 +76,8 @@
         virtual AttributeImpl* clone(bool preserveDecl=true) const;
 
     private:
-        void setValue(const AtomicString& value) { m_value = value; }
-        void setPrefix(const AtomicString& prefix) { m_name.setPrefix(prefix); }
+        void setValue(const AtomicString& val) { m_value = val; }
+        void setPrefix(const AtomicString& p) { m_name.setPrefix(p); }
 
         void allocateImpl(ElementImpl* e);
 
@@ -104,7 +104,7 @@
         // 'Attr' functions
         DOMString name() const;
         virtual bool specified() const { return m_specified; }
-        void setSpecified(bool specified) { m_specified = specified; }
+        void setSpecified(bool specd) { m_specified = specd; }
         virtual ElementImpl *ownerElement() const { return m_element; }
         AttributeImpl* attrImpl() const { return m_attribute; }
 
--- trunk/kdenonbeta/kdom/core/ElementImpl.h #551348:551349
@@ -59,7 +59,7 @@
         virtual unsigned short nodeType() const;
 
         virtual const QualifiedName& tagName() const { return m_tagName; }
-        virtual bool hasTagName(const QualifiedName& tagName) const { return \
m_tagName.matches(tagName); } +        virtual bool hasTagName(const QualifiedName& \
tagname) const { return m_tagName.matches(tagname); }  
         // A fast function for checking the local name against another atomic \
                string.
         bool hasLocalName(const AtomicString& other) const { return \
m_tagName.localName() == other; }


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