From fd81cca9448f3ec45db258eb73b8de41f301e4e1 Mon Sep 17 00:00:00 2001 From: joncruz Date: Sat, 8 Mar 2008 21:10:02 +0000 Subject: [PATCH] Warning cleanup --- src/dom/css.h | 38 ++++---- src/dom/events.h | 202 +++++++++++++++++++-------------------- src/dom/io/domstream.cpp | 2 +- src/dom/ls.h | 32 +++---- src/dom/lsimpl.cpp | 8 +- src/dom/lsimpl.h | 8 +- src/dom/smil.h | 16 ++-- src/dom/svg/svgparser.h | 4 +- src/dom/svg/svgtypes.h | 48 +++++----- src/dom/traversal.h | 22 ++--- src/file.cpp | 57 ++++++----- 11 files changed, 218 insertions(+), 219 deletions(-) diff --git a/src/dom/css.h b/src/dom/css.h index 461003dcb..ad61ddb0f 100644 --- a/src/dom/css.h +++ b/src/dom/css.h @@ -286,7 +286,7 @@ public: /** * */ - virtual unsigned long insertRule(const DOMString &ruleStr, + virtual unsigned long insertRule(const DOMString &/*ruleStr*/, unsigned long index) throw (dom::DOMException) { @@ -427,8 +427,8 @@ protected: class CSSStyleDeclarationEntry { public: - CSSStyleDeclarationEntry(const DOMString &nameArg, - const DOMString &valueArg, + CSSStyleDeclarationEntry(const DOMString &nameArg, + const DOMString &valueArg, const DOMString &prioArg) { name = nameArg; @@ -484,7 +484,7 @@ public: /** * */ - virtual CSSValue getPropertyCSSValue(const DOMString &propertyName) + virtual CSSValue getPropertyCSSValue(const DOMString &/*propertyName*/) { CSSValue value; return value; @@ -586,7 +586,7 @@ public: /** * */ - CSSStyleDeclaration(const CSSStyleDeclaration &other) + CSSStyleDeclaration(const CSSStyleDeclaration &/*other*/) { } @@ -710,7 +710,7 @@ public: /** * */ - virtual unsigned long insertRule(const DOMString &ruleStr, + virtual unsigned long insertRule(const DOMString &/*ruleStr*/, unsigned long index) throw (dom::DOMException) { @@ -1204,7 +1204,7 @@ public: /** * */ - virtual double getFloatValue(unsigned short unitType) + virtual double getFloatValue(unsigned short /*unitType*/) throw (dom::DOMException) { return doubleValue; @@ -1213,7 +1213,7 @@ public: /** * */ - virtual void setStringValue(unsigned short stringType, + virtual void setStringValue(unsigned short /*stringType*/, const DOMString &stringValueArg) throw (dom::DOMException) { @@ -1326,12 +1326,12 @@ public: /** * REPLACES: RGBColor CSSPrimitiveValue::getRGBColorValue() throw (dom::DOMException) */ - static RGBColor getRGBColorValue(const CSSPrimitiveValue &val) + static RGBColor getRGBColorValue(const CSSPrimitiveValue &/*val*/) { RGBColor col; return col; } - + //################## //# Non-API methods //################## @@ -1412,7 +1412,7 @@ public: /** * REPLACES: Rect CSSPrimitiveValue::getRectValue() throw (dom::DOMException) */ - static Rect getRectValue(const CSSPrimitiveValue &val) + static Rect getRectValue(const CSSPrimitiveValue &/*val*/) { Rect rect; return rect; @@ -1494,7 +1494,7 @@ public: /** * REPLACES: Counter CSSPrimitiveValue::getCounterValue() throw (dom::DOMException) */ - static Counter getCounterValue(const CSSPrimitiveValue &val) + static Counter getCounterValue(const CSSPrimitiveValue &/*val*/) { Counter counter; return counter; @@ -3971,8 +3971,8 @@ public: /** * */ - virtual CSSStyleDeclaration getComputedStyle(const Element &elt, - const DOMString &pseudoElt) + virtual CSSStyleDeclaration getComputedStyle(const Element &/*elt*/, + const DOMString &/*pseudoElt*/) { CSSStyleDeclaration style; return style; @@ -4020,8 +4020,8 @@ public: /** * */ - virtual CSSStyleDeclaration getOverrideStyle(const Element *elt, - const DOMString &pseudoElt) + virtual CSSStyleDeclaration getOverrideStyle(const Element */*elt*/, + const DOMString &/*pseudoElt*/) { CSSStyleDeclaration style; return style; @@ -4070,8 +4070,8 @@ public: /** * */ - virtual CSSStyleSheet createCSSStyleSheet(const DOMString &title, - const DOMString &media) + virtual CSSStyleSheet createCSSStyleSheet(const DOMString &/*title*/, + const DOMString &/*media*/) throw (dom::DOMException) { CSSStyleSheet sheet; @@ -4090,7 +4090,7 @@ public: /** * */ - DOMImplementationCSS(const DOMImplementationCSS &other) + DOMImplementationCSS(const DOMImplementationCSS &other) : DOMImplementation(other) { } diff --git a/src/dom/events.h b/src/dom/events.h index d237ff545..f57383987 100644 --- a/src/dom/events.h +++ b/src/dom/events.h @@ -324,7 +324,7 @@ public: /** * */ - virtual void handleEvent(const Event &evt) + virtual void handleEvent(const Event &/*evt*/) {} //################## @@ -545,7 +545,7 @@ public: /** * */ - virtual Event createEvent(const DOMString &eventType) + virtual Event createEvent(const DOMString &/*eventType*/) throw (dom::DOMException) { Event event; @@ -555,8 +555,8 @@ public: /** * */ - virtual bool canDispatch(const DOMString &namespaceURI, - const DOMString &type) + virtual bool canDispatch(const DOMString &/*namespaceURI*/, + const DOMString &/*type*/) { return dispatchable; } @@ -605,8 +605,8 @@ public: /** * */ - virtual void setDispatchState(const EventTarget *target, - unsigned short phase) + virtual void setDispatchState(const EventTarget */*target*/, + unsigned short /*phase*/) { } @@ -688,23 +688,23 @@ public: /** * Note that views.idl and events.idl disagree on the name of Views */ - virtual void initUIEvent(const DOMString &typeArg, - bool canBubbleArg, - bool cancelableArg, - const views::View *viewArg, - long detailArg) + virtual void initUIEvent(const DOMString &/*typeArg*/, + bool /*canBubbleArg*/, + bool /*cancelableArg*/, + const views::View */*viewArg*/, + long /*detailArg*/) { } /** * Note that views.idl and events.idl disagree on the name of Views */ - virtual void initUIEventNS(const DOMString &namespaceURI, - const DOMString &typeArg, - bool canBubbleArg, - bool cancelableArg, - const views::View *viewArg, - long detailArg) + virtual void initUIEventNS(const DOMString &/*namespaceURI*/, + const DOMString &/*typeArg*/, + bool /*canBubbleArg*/, + bool /*cancelableArg*/, + const views::View */*viewArg*/, + long /*detailArg*/) { } @@ -760,23 +760,23 @@ public: /** * Note that views.idl and events.idl disagree on the name of Views */ - virtual void initTextEvent(const DOMString &typeArg, - bool canBubbleArg, - bool cancelableArg, - const views::View *viewArg, - long detailArg) + virtual void initTextEvent(const DOMString &/*typeArg*/, + bool /*canBubbleArg*/, + bool /*cancelableArg*/, + const views::View */*viewArg*/, + long /*detailArg*/) { } /** * */ - virtual void initTextEventNS(const DOMString &namespaceURI, - const DOMString &typeArg, - bool canBubbleArg, - bool cancelableArg, - const views::View *viewArg, - long detailArg) + virtual void initTextEventNS(const DOMString &/*namespaceURI*/, + const DOMString &/*typeArg*/, + bool /*canBubbleArg*/, + bool /*cancelableArg*/, + const views::View */*viewArg*/, + long /*detailArg*/) { } @@ -896,21 +896,21 @@ public: /** * */ - virtual void initMouseEvent(const DOMString &typeArg, - bool canBubbleArg, - bool cancelableArg, - const views::View *viewArg, - long detailArg, - long screenXArg, - long screenYArg, - long clientXArg, - long clientYArg, - bool ctrlKeyArg, - bool altKeyArg, - bool shiftKeyArg, - bool metaKeyArg, - unsigned short buttonArg, - const EventTarget *relatedTargetArg) + virtual void initMouseEvent(const DOMString &/*typeArg*/, + bool /*canBubbleArg*/, + bool /*cancelableArg*/, + const views::View */*viewArg*/, + long /*detailArg*/, + long /*screenXArg*/, + long /*screenYArg*/, + long /*clientXArg*/, + long /*clientYArg*/, + bool /*ctrlKeyArg*/, + bool /*altKeyArg*/, + bool /*shiftKeyArg*/, + bool /*metaKeyArg*/, + unsigned short /*buttonArg*/, + const EventTarget */*relatedTargetArg*/) { } @@ -918,19 +918,19 @@ public: /** * */ - virtual void initMouseEventNS(const DOMString &namespaceURI, - const DOMString &typeArg, - bool canBubbleArg, - bool cancelableArg, - const views::View *viewArg, - long detailArg, - long screenXArg, - long screenYArg, - long clientXArg, - long clientYArg, - unsigned short buttonArg, - const EventTarget *relatedTargetArg, - const DOMString &modifiersList) + virtual void initMouseEventNS(const DOMString &/*namespaceURI*/, + const DOMString &/*typeArg*/, + bool /*canBubbleArg*/, + bool /*cancelableArg*/, + const views::View */*viewArg*/, + long /*detailArg*/, + long /*screenXArg*/, + long /*screenYArg*/, + long /*clientXArg*/, + long /*clientYArg*/, + unsigned short /*buttonArg*/, + const EventTarget */*relatedTargetArg*/, + const DOMString &/*modifiersList*/) { } @@ -1050,13 +1050,13 @@ public: /** * */ - virtual void initKeyboardEvent(const DOMString &typeArg, - bool canBubbleArg, - bool cancelableArg, - const views::View *viewArg, - const DOMString &keyIdentifier, - unsigned long keyLocation, - const DOMString modifiersList) + virtual void initKeyboardEvent(const DOMString &/*typeArg*/, + bool /*canBubbleArg*/, + bool /*cancelableArg*/, + const views::View */*viewArg*/, + const DOMString &/*keyIdentifier*/, + unsigned long /*keyLocation*/, + const DOMString /*modifiersList*/) { } @@ -1065,14 +1065,14 @@ public: /** * */ - virtual void initKeyboardEventNS(const DOMString &namespaceURI, - const DOMString &typeArg, - bool canBubbleArg, - bool cancelableArg, - const views::View *viewArg, - const DOMString &keyIdentifier, - unsigned long keyLocation, - const DOMString modifiersList) + virtual void initKeyboardEventNS(const DOMString &/*namespaceURI*/, + const DOMString &/*typeArg*/, + bool /*canBubbleArg*/, + bool /*cancelableArg*/, + const views::View */*viewArg*/, + const DOMString &/*keyIdentifier*/, + unsigned long /*keyLocation*/, + const DOMString /*modifiersList*/) { } @@ -1179,29 +1179,29 @@ public: /** * */ - virtual void initMutationEvent(const DOMString &typeArg, - bool canBubbleArg, - bool cancelableArg, - const NodePtr relatedNodeArg, - const DOMString &prevValueArg, - const DOMString &newValueArg, - const DOMString &attrNameArg, - unsigned short attrChangeArg) + virtual void initMutationEvent(const DOMString &/*typeArg*/, + bool /*canBubbleArg*/, + bool /*cancelableArg*/, + const NodePtr /*relatedNodeArg*/, + const DOMString &/*prevValueArg*/, + const DOMString &/*newValueArg*/, + const DOMString &/*attrNameArg*/, + unsigned short /*attrChangeArg*/) { } /** * */ - virtual void initMutationEventNS(const DOMString &namespaceURI, - const DOMString &typeArg, - bool canBubbleArg, - bool cancelableArg, - const NodePtr relatedNodeArg, - const DOMString &prevValueArg, - const DOMString &newValueArg, - const DOMString &attrNameArg, - unsigned short attrChangeArg) + virtual void initMutationEventNS(const DOMString &/*namespaceURI*/, + const DOMString &/*typeArg*/, + bool /*canBubbleArg*/, + bool /*cancelableArg*/, + const NodePtr /*relatedNodeArg*/, + const DOMString &/*prevValueArg*/, + const DOMString &/*newValueArg*/, + const DOMString &/*attrNameArg*/, + unsigned short /*attrChangeArg*/) { } @@ -1274,12 +1274,12 @@ public: /** * */ - virtual void initMutationNameEvent(const DOMString &typeArg, - bool canBubbleArg, - bool cancelableArg, - const NodePtr relatedNodeArg, - const DOMString &prevNamespaceURIArg, - const DOMString &prevNodeNameArg) + virtual void initMutationNameEvent(const DOMString &/*typeArg*/, + bool /*canBubbleArg*/, + bool /*cancelableArg*/, + const NodePtr /*relatedNodeArg*/, + const DOMString &/*prevNamespaceURIArg*/, + const DOMString &/*prevNodeNameArg*/) { } @@ -1287,13 +1287,13 @@ public: /** * */ - virtual void initMutationNameEventNS(const DOMString &namespaceURI, - const DOMString &typeArg, - bool canBubbleArg, - bool cancelableArg, - const NodePtr relatedNodeArg, - const DOMString &prevNamespaceURIArg, - const DOMString &prevNodeNameArg) + virtual void initMutationNameEventNS(const DOMString &/*namespaceURI*/, + const DOMString &/*typeArg*/, + bool /*canBubbleArg*/, + bool /*cancelableArg*/, + const NodePtr /*relatedNodeArg*/, + const DOMString &/*prevNamespaceURIArg*/, + const DOMString &/*prevNodeNameArg*/) { } diff --git a/src/dom/io/domstream.cpp b/src/dom/io/domstream.cpp index 9a3d49f15..6f8dc634d 100644 --- a/src/dom/io/domstream.cpp +++ b/src/dom/io/domstream.cpp @@ -38,7 +38,7 @@ #include #include "domstream.h" -#include "dom/charclass.h" +#include "dom/ucd.h" namespace org { diff --git a/src/dom/ls.h b/src/dom/ls.h index db009e234..c4bdf1120 100644 --- a/src/dom/ls.h +++ b/src/dom/ls.h @@ -393,7 +393,7 @@ public: /** * */ - virtual DocumentPtr parse(const LSInput &input) + virtual DocumentPtr parse(const LSInput &/*input*/) throw(dom::DOMException, LSException) { return NULL; } @@ -401,7 +401,7 @@ public: /** * */ - virtual DocumentPtr parseURI(const DOMString &uri) + virtual DocumentPtr parseURI(const DOMString &/*uri*/) throw(dom::DOMException, LSException) { return NULL; } @@ -418,9 +418,9 @@ public: /** * */ - virtual NodePtr parseWithContext(const LSInput &input, - const NodePtr contextArg, - unsigned short action) + virtual NodePtr parseWithContext(const LSInput &/*input*/, + const NodePtr /*contextArg*/, + unsigned short /*action*/) throw(dom::DOMException, LSException) { return NULL; } @@ -478,11 +478,11 @@ public: /** * */ - virtual LSInput resolveResource(const DOMString &type, - const DOMString &namespaceURI, - const DOMString &publicId, - const DOMString &systemId, - const DOMString &baseURI) + virtual LSInput resolveResource(const DOMString &/*type*/, + const DOMString &/*namespaceURI*/, + const DOMString &/*publicId*/, + const DOMString &/*systemId*/, + const DOMString &/*baseURI*/) { LSInput input; //do something @@ -501,7 +501,7 @@ public: /** * */ - LSResourceResolver(const LSResourceResolver &other) + LSResourceResolver(const LSResourceResolver &/*other*/) { } @@ -660,23 +660,23 @@ public: /** * */ - virtual bool write(const NodePtr nodeArg, - const LSOutput &destination) + virtual bool write(const NodePtr /*nodeArg*/, + const LSOutput &/*destination*/) throw (LSException) { return false; } /** * */ - virtual bool writeToURI(const NodePtr nodeArg, - const DOMString &uri) + virtual bool writeToURI(const NodePtr /*nodeArg*/, + const DOMString &/*uri*/) throw(LSException) { return false; } /** * */ - virtual DOMString writeToString(const NodePtr nodeArg) + virtual DOMString writeToString(const NodePtr /*nodeArg*/) throw(dom::DOMException, LSException) { DOMString str; diff --git a/src/dom/lsimpl.cpp b/src/dom/lsimpl.cpp index 40b464814..b3b3f0b20 100644 --- a/src/dom/lsimpl.cpp +++ b/src/dom/lsimpl.cpp @@ -128,7 +128,7 @@ DocumentPtr LSParserImpl::parse(const LSInput &input) /** * */ -DocumentPtr LSParserImpl::parseURI(const DOMString &uri) +DocumentPtr LSParserImpl::parseURI(const DOMString &/*uri*/) throw(dom::DOMException, LSException) { return NULL; @@ -137,9 +137,9 @@ DocumentPtr LSParserImpl::parseURI(const DOMString &uri) /** * */ -NodePtr LSParserImpl::parseWithContext(const LSInput &input, - const NodePtr contextArg, - unsigned short action) +NodePtr LSParserImpl::parseWithContext(const LSInput &/*input*/, + const NodePtr /*contextArg*/, + unsigned short /*action*/) throw(dom::DOMException, LSException) { return NULL; diff --git a/src/dom/lsimpl.h b/src/dom/lsimpl.h index 2375a1d49..b87498517 100644 --- a/src/dom/lsimpl.h +++ b/src/dom/lsimpl.h @@ -144,13 +144,13 @@ public: /** * */ - virtual unsigned short startElement(const ElementPtr elementArg) + virtual unsigned short startElement(const ElementPtr /*elementArg*/) { return 0; } /** * */ - virtual unsigned short acceptNode(const NodePtr nodeArg) + virtual unsigned short acceptNode(const NodePtr /*nodeArg*/) { return 0; } /** @@ -305,8 +305,8 @@ public: /** * */ - virtual LSParser &createLSParser(unsigned short mode, - const DOMString &schemaType) + virtual LSParser &createLSParser(unsigned short /*mode*/, + const DOMString &/*schemaType*/) throw (dom::DOMException) { LSParserImpl newParser; diff --git a/src/dom/smil.h b/src/dom/smil.h index 0be0afe54..cbabe2525 100644 --- a/src/dom/smil.h +++ b/src/dom/smil.h @@ -607,7 +607,7 @@ public: /** * */ - virtual void seekElement(double &seekTo) + virtual void seekElement(double &/*seekTo*/) { } @@ -786,7 +786,7 @@ public: /** * */ - virtual NodeList getActiveChildrenAt(double instant) + virtual NodeList getActiveChildrenAt(double /*instant*/) { NodeList list; return list; @@ -1091,7 +1091,7 @@ public: /** * */ - virtual bool beginElementAt(double offset) throw(dom::DOMException) + virtual bool beginElementAt(double /*offset*/) throw(dom::DOMException) { return true; } @@ -1107,7 +1107,7 @@ public: /** * */ - virtual bool endElementAt(double offset) throw(dom::DOMException) + virtual bool endElementAt(double /*offset*/) throw(dom::DOMException) { return true; } @@ -1124,7 +1124,7 @@ public: /** * */ - ElementTimeControl(const ElementTimeControl &other) + ElementTimeControl(const ElementTimeControl &/*other*/) { } @@ -1386,9 +1386,9 @@ public: /** * */ - virtual void initTimeEvent(const DOMString &typeArg, - const views::View *viewArg, - long detailArg) + virtual void initTimeEvent(const DOMString &/*typeArg*/, + const views::View */*viewArg*/, + long /*detailArg*/) { } diff --git a/src/dom/svg/svgparser.h b/src/dom/svg/svgparser.h index bd230c4e6..cb3ac15d4 100644 --- a/src/dom/svg/svgparser.h +++ b/src/dom/svg/svgparser.h @@ -57,7 +57,7 @@ public: /** * */ - SvgParser(const SvgParser &other) + SvgParser(const SvgParser &/*other*/) { } @@ -116,7 +116,7 @@ private: * */ bool parseElement(SVGElementImplPtr destElem, - ElementImplPtr sourceElem); + ElementImplPtr sourceElem); /** diff --git a/src/dom/svg/svgtypes.h b/src/dom/svg/svgtypes.h index 59fe38ab5..36bb1fcdf 100644 --- a/src/dom/svg/svgtypes.h +++ b/src/dom/svg/svgtypes.h @@ -1799,7 +1799,7 @@ public: /** * */ - virtual void setValueInSpecifiedUnits( double val ) + virtual void setValueInSpecifiedUnits( double /*val*/ ) throw (DOMException) { //fill this in @@ -1820,7 +1820,7 @@ public: /** * */ - virtual void setValueAsString( const DOMString& val ) + virtual void setValueAsString( const DOMString& /*val*/ ) throw (DOMException) { } @@ -1829,14 +1829,14 @@ public: /** * */ - virtual void newValueSpecifiedUnits ( unsigned short unitType, double val ) + virtual void newValueSpecifiedUnits ( unsigned short /*unitType*/, double /*val*/ ) { } /** * */ - virtual void convertToSpecifiedUnits ( unsigned short unitType ) + virtual void convertToSpecifiedUnits ( unsigned short /*unitType*/ ) { } @@ -2221,7 +2221,7 @@ public: /** * */ - virtual void setValueInSpecifiedUnits(double val) + virtual void setValueInSpecifiedUnits(double /*val*/) throw (DOMException) { //do conversion @@ -2242,7 +2242,7 @@ public: /** * */ - virtual void setValueAsString(const DOMString &val) + virtual void setValueAsString(const DOMString &/*val*/) throw (DOMException) { //convert here @@ -2252,8 +2252,8 @@ public: /** * */ - virtual void newValueSpecifiedUnits (unsigned short unitType, - double valueInSpecifiedUnits ) + virtual void newValueSpecifiedUnits (unsigned short /*unitType*/, + double /*valueInSpecifiedUnits*/ ) { //convert here } @@ -2261,7 +2261,7 @@ public: /** * */ - virtual void convertToSpecifiedUnits (unsigned short unitType ) + virtual void convertToSpecifiedUnits (unsigned short /*unitType*/ ) { //convert here } @@ -2498,7 +2498,7 @@ public: /** * */ - virtual void setRGBColor (const DOMString& rgbColor ) + virtual void setRGBColor (const DOMString& /*rgbColor*/ ) throw( SVGException ) { } @@ -2506,8 +2506,8 @@ public: /** * */ - virtual void setRGBColorICCColor (const DOMString& rgbColor, - const DOMString& iccColor ) + virtual void setRGBColorICCColor (const DOMString& /*rgbColor*/, + const DOMString& /*iccColor*/ ) throw( SVGException ) { } @@ -2515,9 +2515,9 @@ public: /** * */ - virtual void setColor (unsigned short colorType, - const DOMString& rgbColor, - const DOMString& iccColor ) + virtual void setColor (unsigned short /*colorType*/, + const DOMString& /*rgbColor*/, + const DOMString& /*iccColor*/ ) throw( SVGException ) { } @@ -2781,7 +2781,7 @@ public: /** * */ - virtual SVGPoint matrixTransform(const SVGMatrix &matrix) + virtual SVGPoint matrixTransform(const SVGMatrix &/*matrix*/) { SVGPoint point; return point; @@ -3041,7 +3041,7 @@ public: /** * */ - virtual css::CSSValue getPresentationAttribute (const DOMString& name ) + virtual css::CSSValue getPresentationAttribute (const DOMString& /*name*/ ) { css::CSSValue val; //perform a lookup @@ -3136,7 +3136,7 @@ public: /** * */ - virtual SVGMatrix getTransformToElement (const SVGElement &element) + virtual SVGMatrix getTransformToElement (const SVGElement &/*element*/) throw( SVGException ) { SVGMatrix result; @@ -3158,7 +3158,7 @@ public: /** * */ - SVGLocatable(const SVGLocatable &other) + SVGLocatable(const SVGLocatable &/*other*/) { } @@ -3274,7 +3274,7 @@ public: /** * */ - virtual bool hasExtension (const DOMString& extension ) + virtual bool hasExtension (const DOMString& /*extension*/ ) { return false; } @@ -6209,7 +6209,7 @@ public: /** * */ - SVGAnimatedPathData(const SVGAnimatedPathData &other) + SVGAnimatedPathData(const SVGAnimatedPathData &/*other*/) { } @@ -6337,8 +6337,8 @@ public: */ virtual void setPaint (unsigned short paintTypeArg, const DOMString& uriArg, - const DOMString& rgbColor, - const DOMString& iccColor ) + const DOMString& /*rgbColor*/, + const DOMString& /*iccColor*/ ) throw( SVGException ) { paintType = paintTypeArg; @@ -6829,7 +6829,7 @@ public: * SVGElementInstanceList SVGElementInstance::getChildNodes() * */ - static SVGElementInstanceList getChildNodes(const SVGElementInstance &instance) + static SVGElementInstanceList getChildNodes(const SVGElementInstance &/*instance*/) { SVGElementInstanceList list; return list; diff --git a/src/dom/traversal.h b/src/dom/traversal.h index 95a4c05e0..4e99b8e52 100644 --- a/src/dom/traversal.h +++ b/src/dom/traversal.h @@ -92,7 +92,7 @@ public: /** * */ - virtual short acceptNode(const Node *n) + virtual short acceptNode(const Node */*n*/) { return 0; } @@ -112,7 +112,7 @@ public: /** * */ - NodeFilter(const NodeFilter &other) + NodeFilter(const NodeFilter &/*other*/) { } @@ -379,10 +379,10 @@ public: /** * */ - virtual NodeIterator createNodeIterator(const Node *root, - unsigned long whatToShow, - const NodeFilter *filter, - bool entityReferenceExpansion) + virtual NodeIterator createNodeIterator(const Node */*root*/, + unsigned long /*whatToShow*/, + const NodeFilter */*filter*/, + bool /*entityReferenceExpansion*/) throw (dom::DOMException) { NodeIterator ret; @@ -392,10 +392,10 @@ public: /** * */ - virtual TreeWalker createTreeWalker(const Node *root, - unsigned long whatToShow, - const NodeFilter *filter, - bool entityReferenceExpansion) + virtual TreeWalker createTreeWalker(const Node */*root*/, + unsigned long /*whatToShow*/, + const NodeFilter */*filter*/, + bool /*entityReferenceExpansion*/) throw (dom::DOMException) { TreeWalker ret; @@ -415,7 +415,7 @@ public: /** * */ - DocumentTraversal(const DocumentTraversal &other) + DocumentTraversal(const DocumentTraversal &/*other*/) {} /** diff --git a/src/file.cpp b/src/file.cpp index 8e26bdfc9..51dce81cf 100644 --- a/src/file.cpp +++ b/src/file.cpp @@ -379,26 +379,25 @@ sp_file_open_dialog(Gtk::Window &parentWindow, gpointer /*object*/, gpointer /*d { //# Get the current directory for finding files static Glib::ustring open_path; - - if(open_path.empty()) - { - gchar const *attr = prefs_get_string_attribute("dialogs.open", "path"); - if (attr) - open_path = attr; - } - + + if(open_path.empty()) + { + gchar const *attr = prefs_get_string_attribute("dialogs.open", "path"); + if (attr) + open_path = attr; + } + //# Test if the open_path directory exists if (!Inkscape::IO::file_test(open_path.c_str(), (GFileTest)(G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) open_path = ""; #ifdef WIN32 - //# If no open path, default to our win32 documents folder + //# If no open path, default to our win32 documents folder if (open_path.empty()) - { + { // The path to the My Documents folder is read from the - // value "HKEY_CURRENT_USER\Software\Windows\CurrentVersion\ - // Explorer\Shell Folders\Personal" + // value "HKEY_CURRENT_USER\Software\Windows\CurrentVersion\Explorer\Shell Folders\Personal" HKEY key = NULL; if(RegOpenKeyExA(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", @@ -420,23 +419,23 @@ sp_file_open_dialog(Gtk::Window &parentWindow, gpointer /*object*/, gpointer /*d } } } - } + } #endif - + //# If no open path, default to our home directory if (open_path.empty()) { open_path = g_get_home_dir(); open_path.append(G_DIR_SEPARATOR_S); } - + //# Create a dialog if we don't already have one Inkscape::UI::Dialog::FileOpenDialog *openDialogInstance = Inkscape::UI::Dialog::FileOpenDialog::create( parentWindow, open_path, Inkscape::UI::Dialog::SVG_TYPES, _("Select file to open")); - + //# Show the dialog bool const success = openDialogInstance->show(); @@ -448,27 +447,27 @@ sp_file_open_dialog(Gtk::Window &parentWindow, gpointer /*object*/, gpointer /*d delete openDialogInstance; return; } - + //# User selected something. Get name and type Glib::ustring fileName = openDialogInstance->getFilename(); Inkscape::Extension::Extension *selection = openDialogInstance->getSelectionType(); - + //# Code to check & open if multiple files. std::vector flist = openDialogInstance->getFilenames(); - + //# We no longer need the file dialog object - delete it delete openDialogInstance; openDialogInstance = NULL; - + //# Iterate through filenames if more than 1 if (flist.size() > 1) { for (unsigned int i = 0; i < flist.size(); i++) { fileName = flist[i]; - + Glib::ustring newFileName = Glib::filename_to_utf8(fileName); if ( newFileName.size() > 0 ) fileName = newFileName; @@ -480,7 +479,7 @@ sp_file_open_dialog(Gtk::Window &parentWindow, gpointer /*object*/, gpointer /*d #endif sp_file_open(fileName, selection); } - + return; } @@ -663,8 +662,8 @@ file_save_remote(SPDocument */*doc*/, } return true; #else - // in case we do not have GNOME_VFS - return false; + // in case we do not have GNOME_VFS + return false; #endif } @@ -740,7 +739,7 @@ sp_file_save_dialog(Gtk::Window &parentWindow, SPDocument *doc, bool is_copy) if ( save_loc_local.size() > 0) save_loc = save_loc_local; - + //# Show the SaveAs dialog char const * dialog_title; if (is_copy) { @@ -750,15 +749,15 @@ sp_file_save_dialog(Gtk::Window &parentWindow, SPDocument *doc, bool is_copy) } Inkscape::UI::Dialog::FileSaveDialog *saveDialog = Inkscape::UI::Dialog::FileSaveDialog::create( - parentWindow, + parentWindow, save_loc, Inkscape::UI::Dialog::SVG_TYPES, dialog_title, default_extension ); - + saveDialog->setSelectionType(extension); - + bool success = saveDialog->show(); if (!success) { delete saveDialog; @@ -1019,7 +1018,7 @@ sp_file_import(Gtk::Window &parentWindow) importDialogInstance = Inkscape::UI::Dialog::FileOpenDialog::create( parentWindow, - import_path, + import_path, Inkscape::UI::Dialog::IMPORT_TYPES, (char const *)_("Select file to import")); } -- 2.30.2