diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/attribute-rel-util.cpp | 2 | ||||
| -rw-r--r-- | src/dom/css.h | 14 | ||||
| -rw-r--r-- | src/dom/dom.h | 27 | ||||
| -rw-r--r-- | src/dom/domptr.h | 2 | ||||
| -rw-r--r-- | src/dom/stylesheets.h | 19 | ||||
| -rw-r--r-- | src/syseq.h | 2 |
6 files changed, 35 insertions, 31 deletions
diff --git a/src/attribute-rel-util.cpp b/src/attribute-rel-util.cpp index 38327b413..0527dad4e 100644 --- a/src/attribute-rel-util.cpp +++ b/src/attribute-rel-util.cpp @@ -209,9 +209,9 @@ void sp_attribute_clean_style(Node* repr, SPCSSAttr *css, unsigned int flags) { } // Find parent value for same property (property) - gchar const * property_p = NULL; gchar const * value_p = NULL; if( css_parent != NULL ) { + gchar const * property_p = NULL; for ( List<AttributeRecord const> iter_p = css_parent->attributeList() ; iter_p ; ++iter_p ) { property_p = g_quark_to_string(iter_p->key); diff --git a/src/dom/css.h b/src/dom/css.h index 2776b6d20..f270b99eb 100644 --- a/src/dom/css.h +++ b/src/dom/css.h @@ -269,8 +269,8 @@ public: * */ CSSRuleList(const CSSRuleList &other) + : rules (other.rules) { - rules = other.rules; } /** @@ -1012,9 +1012,10 @@ public: /** * */ - CSSFontFaceRule(const CSSFontFaceRule &other) : CSSRule(other) + CSSFontFaceRule(const CSSFontFaceRule &other) + : CSSRule(other), + style (other.style) { - style = other.style; } /** @@ -1433,9 +1434,10 @@ public: /** * */ - CSSValueList(const CSSValueList &other) : CSSValue(other) + CSSValueList(const CSSValueList &other) + : CSSValue(other), + items (other.items) { - items = other.items; } /** @@ -2014,8 +2016,8 @@ public: * */ ElementCSSInlineStyle(const ElementCSSInlineStyle &other) + : style (other.style) { - style = other.style; } /** diff --git a/src/dom/dom.h b/src/dom/dom.h index c12c02869..22fd09ebf 100644 --- a/src/dom/dom.h +++ b/src/dom/dom.h @@ -224,7 +224,8 @@ public: DOMException(const DOMString &reasonMsg) - { msg = reasonMsg; } + : msg (reasonMsg) + { } DOMException(short theCode) { @@ -318,8 +319,8 @@ public: * */ DOMStringList(const DOMStringList &other) + : strings (other.strings) { - strings = other.strings; } /** @@ -369,14 +370,14 @@ private: { public: NamePair(const DOMString &theNamespaceURI, const DOMString &theName) + : namespaceURI (theNamespaceURI), + name (theName) { - namespaceURI = theNamespaceURI; - name = theName; } NamePair(const NamePair &other) + : namespaceURI (other.namespaceURI), + name (other.name) { - namespaceURI = other.namespaceURI; - name = other.name; } NamePair &operator=(const NamePair &other) { @@ -463,8 +464,8 @@ public: * */ NameList(const NameList &other) + : namePairs (other.namePairs) { - namePairs = other.namePairs; } /** @@ -533,8 +534,8 @@ public: * */ DOMImplementationList(const DOMImplementationList &other) + : implementations (other.implementations) { - implementations = other.implementations; } /** @@ -1018,8 +1019,8 @@ public: * */ NodeList(const NodeList &other) + : nodes (other.nodes) { - nodes = other.nodes; } /** @@ -1087,10 +1088,10 @@ private: NamedNodeMapEntry(const DOMString &theNamespaceURI, const DOMString &theName, const NodePtr theNode) + : namespaceURI (theNamespaceURI), + name (theName), + node (theNode) { - namespaceURI = theNamespaceURI; - name = theName; - node = theNode; } NamedNodeMapEntry(const NamedNodeMapEntry &other) { @@ -1277,8 +1278,8 @@ public: * */ NamedNodeMap(const NamedNodeMap &other) + : entries (other.entries) { - entries = other.entries; } /** diff --git a/src/dom/domptr.h b/src/dom/domptr.h index 5a1299867..aa9d4c208 100644 --- a/src/dom/domptr.h +++ b/src/dom/domptr.h @@ -153,7 +153,7 @@ public: template<class Y> Ptr &operator=(const Y * ref) { decrementRefCount(_ref); - _ref = (Y *) ref; + _ref = const_cast<Y *>(ref); incrementRefCount(_ref); return *this; } diff --git a/src/dom/stylesheets.h b/src/dom/stylesheets.h index fc1bc9d88..2903b96d9 100644 --- a/src/dom/stylesheets.h +++ b/src/dom/stylesheets.h @@ -308,13 +308,14 @@ public: * */ StyleSheet() + : type(""), + disabled (false), + ownerNode (NULL), + parentStylesheet (NULL), + href (""), + title (""), + mediaList () { - type = ""; - disabled = false; - ownerNode = NULL; - parentStylesheet = NULL; - href = ""; - title = ""; } @@ -422,8 +423,8 @@ public: * */ StyleSheetList(const StyleSheetList &other) + : sheets (other.sheets) { - sheets = other.sheets; } /** @@ -489,8 +490,8 @@ public: * */ LinkStyle(const LinkStyle &other) + : sheet (other.sheet) { - sheet = other.sheet; } /** @@ -556,8 +557,8 @@ public: * */ DocumentStyle(const DocumentStyle &other) + : styleSheets (other.styleSheets) { - styleSheets = other.styleSheets; } /** diff --git a/src/syseq.h b/src/syseq.h index 5c7702268..029f27a91 100644 --- a/src/syseq.h +++ b/src/syseq.h @@ -279,7 +279,7 @@ template <int S, int T> SolutionKind gaussjord_solve (double A[S][T], double x[T // we need to adapt the value if we we are in the "projective case" (see above) double val_new = (proj ? projectify<S,T>(cols, B, x, index, val) : val); - if (index != -1 && index >= 0 && index < T) { + if (index >= 0 && index < T) { // we want the specified coefficient of the solution vector to have a given value x[index] = val_new; } |