summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4c37e7a)
raw | patch | inline | side by side (parent: 4c37e7a)
author | joncruz <joncruz@users.sourceforge.net> | |
Sat, 8 Mar 2008 21:10:02 +0000 (21:10 +0000) | ||
committer | joncruz <joncruz@users.sourceforge.net> | |
Sat, 8 Mar 2008 21:10:02 +0000 (21:10 +0000) |
diff --git a/src/dom/css.h b/src/dom/css.h
index 461003dcb65dde7f2bc708e74717d084553a8040..ad61ddb0f0323093cedab83e91e4edc1ef0f3869 100644 (file)
--- a/src/dom/css.h
+++ b/src/dom/css.h
/**
*
*/
- virtual unsigned long insertRule(const DOMString &ruleStr,
+ virtual unsigned long insertRule(const DOMString &/*ruleStr*/,
unsigned long index)
throw (dom::DOMException)
{
class CSSStyleDeclarationEntry
{
public:
- CSSStyleDeclarationEntry(const DOMString &nameArg,
- const DOMString &valueArg,
+ CSSStyleDeclarationEntry(const DOMString &nameArg,
+ const DOMString &valueArg,
const DOMString &prioArg)
{
name = nameArg;
/**
*
*/
- virtual CSSValue getPropertyCSSValue(const DOMString &propertyName)
+ virtual CSSValue getPropertyCSSValue(const DOMString &/*propertyName*/)
{
CSSValue value;
return value;
/**
*
*/
- CSSStyleDeclaration(const CSSStyleDeclaration &other)
+ CSSStyleDeclaration(const CSSStyleDeclaration &/*other*/)
{
}
/**
*
*/
- virtual unsigned long insertRule(const DOMString &ruleStr,
+ virtual unsigned long insertRule(const DOMString &/*ruleStr*/,
unsigned long index)
throw (dom::DOMException)
{
/**
*
*/
- virtual double getFloatValue(unsigned short unitType)
+ virtual double getFloatValue(unsigned short /*unitType*/)
throw (dom::DOMException)
{
return doubleValue;
/**
*
*/
- virtual void setStringValue(unsigned short stringType,
+ virtual void setStringValue(unsigned short /*stringType*/,
const DOMString &stringValueArg)
throw (dom::DOMException)
{
/**
* 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
//##################
/**
* REPLACES: Rect CSSPrimitiveValue::getRectValue() throw (dom::DOMException)
*/
- static Rect getRectValue(const CSSPrimitiveValue &val)
+ static Rect getRectValue(const CSSPrimitiveValue &/*val*/)
{
Rect rect;
return rect;
/**
* REPLACES: Counter CSSPrimitiveValue::getCounterValue() throw (dom::DOMException)
*/
- static Counter getCounterValue(const CSSPrimitiveValue &val)
+ static Counter getCounterValue(const CSSPrimitiveValue &/*val*/)
{
Counter counter;
return counter;
/**
*
*/
- virtual CSSStyleDeclaration getComputedStyle(const Element &elt,
- const DOMString &pseudoElt)
+ virtual CSSStyleDeclaration getComputedStyle(const Element &/*elt*/,
+ const DOMString &/*pseudoElt*/)
{
CSSStyleDeclaration style;
return style;
/**
*
*/
- virtual CSSStyleDeclaration getOverrideStyle(const Element *elt,
- const DOMString &pseudoElt)
+ virtual CSSStyleDeclaration getOverrideStyle(const Element */*elt*/,
+ const DOMString &/*pseudoElt*/)
{
CSSStyleDeclaration style;
return style;
/**
*
*/
- virtual CSSStyleSheet createCSSStyleSheet(const DOMString &title,
- const DOMString &media)
+ virtual CSSStyleSheet createCSSStyleSheet(const DOMString &/*title*/,
+ const DOMString &/*media*/)
throw (dom::DOMException)
{
CSSStyleSheet sheet;
/**
*
*/
- DOMImplementationCSS(const DOMImplementationCSS &other)
+ DOMImplementationCSS(const DOMImplementationCSS &other)
: DOMImplementation(other)
{
}
diff --git a/src/dom/events.h b/src/dom/events.h
index d237ff545b58f3162a9357e0d834a3de551e2d15..f5738398797da5637f67c70ca1a2358172a7a079 100644 (file)
--- a/src/dom/events.h
+++ b/src/dom/events.h
/**
*
*/
- virtual void handleEvent(const Event &evt)
+ virtual void handleEvent(const Event &/*evt*/)
{}
//##################
/**
*
*/
- virtual Event createEvent(const DOMString &eventType)
+ virtual Event createEvent(const DOMString &/*eventType*/)
throw (dom::DOMException)
{
Event event;
/**
*
*/
- virtual bool canDispatch(const DOMString &namespaceURI,
- const DOMString &type)
+ virtual bool canDispatch(const DOMString &/*namespaceURI*/,
+ const DOMString &/*type*/)
{
return dispatchable;
}
/**
*
*/
- virtual void setDispatchState(const EventTarget *target,
- unsigned short phase)
+ virtual void setDispatchState(const EventTarget */*target*/,
+ unsigned short /*phase*/)
{
}
/**
* 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*/)
{
}
/**
* 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*/)
{
}
/**
*
*/
- 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*/)
{
}
/**
*
*/
- 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*/)
{
}
/**
*
*/
- 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*/)
{
}
/**
*
*/
- 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*/)
{
}
/**
*
*/
- 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*/)
{
}
/**
*
*/
- 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*/)
{
}
/**
*
*/
- 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*/)
{
}
index 9a3d49f150991a55e823cefa28a7900c64998a62..6f8dc634d5596e70a589e2b289d978aa947372f7 100644 (file)
--- a/src/dom/io/domstream.cpp
+++ b/src/dom/io/domstream.cpp
#include <stdarg.h>
#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 db009e234c15e47bbbf4d59c8fcf7cf3d137ab18..c4bdf112073b29e55a4fda62cf65ab6a9a3b9c3b 100644 (file)
--- a/src/dom/ls.h
+++ b/src/dom/ls.h
/**
*
*/
- virtual DocumentPtr parse(const LSInput &input)
+ virtual DocumentPtr parse(const LSInput &/*input*/)
throw(dom::DOMException, LSException)
{ return NULL; }
/**
*
*/
- virtual DocumentPtr parseURI(const DOMString &uri)
+ virtual DocumentPtr parseURI(const DOMString &/*uri*/)
throw(dom::DOMException, LSException)
{ return NULL; }
/**
*
*/
- 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; }
/**
*
*/
- 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
/**
*
*/
- LSResourceResolver(const LSResourceResolver &other)
+ LSResourceResolver(const LSResourceResolver &/*other*/)
{
}
/**
*
*/
- 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 40b4648145d2710c84f5034436ea362283096fbc..b3b3f0b20cb59fa34635c7fadc38d70f546d44b2 100644 (file)
--- a/src/dom/lsimpl.cpp
+++ b/src/dom/lsimpl.cpp
/**
*
*/
-DocumentPtr LSParserImpl::parseURI(const DOMString &uri)
+DocumentPtr LSParserImpl::parseURI(const DOMString &/*uri*/)
throw(dom::DOMException, LSException)
{
return NULL;
/**
*
*/
-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 2375a1d49b0bc0b7fa8070f2aef58a609d15a32c..b87498517d50f47c5c86eb33b9d71dbc45c9bcee 100644 (file)
--- a/src/dom/lsimpl.h
+++ b/src/dom/lsimpl.h
/**
*
*/
- 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; }
/**
/**
*
*/
- 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 0be0afe54bde03c13400fb670a470e645be9e0cd..cbabe252508c7f73f93a67957ece947072493b87 100644 (file)
--- a/src/dom/smil.h
+++ b/src/dom/smil.h
/**
*
*/
- virtual void seekElement(double &seekTo)
+ virtual void seekElement(double &/*seekTo*/)
{
}
/**
*
*/
- virtual NodeList getActiveChildrenAt(double instant)
+ virtual NodeList getActiveChildrenAt(double /*instant*/)
{
NodeList list;
return list;
/**
*
*/
- virtual bool beginElementAt(double offset) throw(dom::DOMException)
+ virtual bool beginElementAt(double /*offset*/) throw(dom::DOMException)
{
return true;
}
/**
*
*/
- virtual bool endElementAt(double offset) throw(dom::DOMException)
+ virtual bool endElementAt(double /*offset*/) throw(dom::DOMException)
{
return true;
}
/**
*
*/
- ElementTimeControl(const ElementTimeControl &other)
+ ElementTimeControl(const ElementTimeControl &/*other*/)
{
}
/**
*
*/
- virtual void initTimeEvent(const DOMString &typeArg,
- const views::View *viewArg,
- long detailArg)
+ virtual void initTimeEvent(const DOMString &/*typeArg*/,
+ const views::View */*viewArg*/,
+ long /*detailArg*/)
{
}
index bd230c4e667ac04c489a552261ed9628df72dc88..cb3ac15d4c87d83055adaf5570b9dd973b6d3f2b 100644 (file)
--- a/src/dom/svg/svgparser.h
+++ b/src/dom/svg/svgparser.h
/**
*
*/
- SvgParser(const SvgParser &other)
+ SvgParser(const SvgParser &/*other*/)
{
}
*
*/
bool parseElement(SVGElementImplPtr destElem,
- ElementImplPtr sourceElem);
+ ElementImplPtr sourceElem);
/**
diff --git a/src/dom/svg/svgtypes.h b/src/dom/svg/svgtypes.h
index 59fe38ab5e9aebc869c9abcb5d758a65c747baf6..36bb1fcdf14fb3f6d6fc6f7bd3957e7c9304fc60 100644 (file)
--- a/src/dom/svg/svgtypes.h
+++ b/src/dom/svg/svgtypes.h
/**
*
*/
- virtual void setValueInSpecifiedUnits( double val )
+ virtual void setValueInSpecifiedUnits( double /*val*/ )
throw (DOMException)
{
//fill this in
/**
*
*/
- virtual void setValueAsString( const DOMString& val )
+ virtual void setValueAsString( const DOMString& /*val*/ )
throw (DOMException)
{
}
/**
*
*/
- 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*/ )
{
}
/**
*
*/
- virtual void setValueInSpecifiedUnits(double val)
+ virtual void setValueInSpecifiedUnits(double /*val*/)
throw (DOMException)
{
//do conversion
/**
*
*/
- virtual void setValueAsString(const DOMString &val)
+ virtual void setValueAsString(const DOMString &/*val*/)
throw (DOMException)
{
//convert here
/**
*
*/
- virtual void newValueSpecifiedUnits (unsigned short unitType,
- double valueInSpecifiedUnits )
+ virtual void newValueSpecifiedUnits (unsigned short /*unitType*/,
+ double /*valueInSpecifiedUnits*/ )
{
//convert here
}
/**
*
*/
- virtual void convertToSpecifiedUnits (unsigned short unitType )
+ virtual void convertToSpecifiedUnits (unsigned short /*unitType*/ )
{
//convert here
}
/**
*
*/
- virtual void setRGBColor (const DOMString& rgbColor )
+ virtual void setRGBColor (const DOMString& /*rgbColor*/ )
throw( SVGException )
{
}
/**
*
*/
- virtual void setRGBColorICCColor (const DOMString& rgbColor,
- const DOMString& iccColor )
+ virtual void setRGBColorICCColor (const DOMString& /*rgbColor*/,
+ const DOMString& /*iccColor*/ )
throw( SVGException )
{
}
/**
*
*/
- 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 )
{
}
/**
*
*/
- virtual SVGPoint matrixTransform(const SVGMatrix &matrix)
+ virtual SVGPoint matrixTransform(const SVGMatrix &/*matrix*/)
{
SVGPoint point;
return point;
/**
*
*/
- virtual css::CSSValue getPresentationAttribute (const DOMString& name )
+ virtual css::CSSValue getPresentationAttribute (const DOMString& /*name*/ )
{
css::CSSValue val;
//perform a lookup
/**
*
*/
- virtual SVGMatrix getTransformToElement (const SVGElement &element)
+ virtual SVGMatrix getTransformToElement (const SVGElement &/*element*/)
throw( SVGException )
{
SVGMatrix result;
/**
*
*/
- SVGLocatable(const SVGLocatable &other)
+ SVGLocatable(const SVGLocatable &/*other*/)
{
}
/**
*
*/
- virtual bool hasExtension (const DOMString& extension )
+ virtual bool hasExtension (const DOMString& /*extension*/ )
{
return false;
}
/**
*
*/
- SVGAnimatedPathData(const SVGAnimatedPathData &other)
+ SVGAnimatedPathData(const SVGAnimatedPathData &/*other*/)
{
}
*/
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;
* 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 95a4c05e02209e3267e4bbaeb68e28f0bc86e331..4e99b8e527b4d8efe31774e1412a55a44ef76aaa 100644 (file)
--- a/src/dom/traversal.h
+++ b/src/dom/traversal.h
/**
*
*/
- virtual short acceptNode(const Node *n)
+ virtual short acceptNode(const Node */*n*/)
{
return 0;
}
/**
*
*/
- NodeFilter(const NodeFilter &other)
+ NodeFilter(const NodeFilter &/*other*/)
{
}
/**
*
*/
- 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;
/**
*
*/
- 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;
/**
*
*/
- DocumentTraversal(const DocumentTraversal &other)
+ DocumentTraversal(const DocumentTraversal &/*other*/)
{}
/**
diff --git a/src/file.cpp b/src/file.cpp
index 8e26bdfc98b52ed0ace5e4fa335f9be482065e86..51dce81cf7a8433a57dec6288bf3bb9584e9d151 100644 (file)
--- 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<Glib::ustring> 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;
}
}
return true;
#else
- // in case we do not have GNOME_VFS
- return false;
+ // in case we do not have GNOME_VFS
+ return false;
#endif
}
if ( save_loc_local.size() > 0)
save_loc = save_loc_local;
-
+
//# Show the SaveAs dialog
char const * dialog_title;
if (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;
importDialogInstance =
Inkscape::UI::Dialog::FileOpenDialog::create(
parentWindow,
- import_path,
+ import_path,
Inkscape::UI::Dialog::IMPORT_TYPES,
(char const *)_("Select file to import"));
}