summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKris De Gussem <kris.degussem@gmail.com>2013-10-28 09:31:07 +0000
committerKris <Kris.De.Gussem@hotmail.com>2013-10-28 09:31:07 +0000
commite3aea550bec92bbb79e9ce5d6d0e1c357eff60b7 (patch)
tree083708cf51a8a24a93688245fc2c435b4a9be1b6
parent"fix" some "unused parameter" warnings (diff)
downloadinkscape-e3aea550bec92bbb79e9ce5d6d0e1c357eff60b7.tar.gz
inkscape-e3aea550bec92bbb79e9ce5d6d0e1c357eff60b7.zip
"fix" some "unused parameter" warnings
(bzr r12738)
-rw-r--r--src/sp-script.cpp6
-rw-r--r--src/sp-shape.cpp2
-rw-r--r--src/sp-switch.cpp2
-rw-r--r--src/sp-text.cpp2
-rw-r--r--src/text-editing.cpp12
-rw-r--r--src/winmain.cpp8
6 files changed, 16 insertions, 16 deletions
diff --git a/src/sp-script.cpp b/src/sp-script.cpp
index 158796e51..260b3dcfd 100644
--- a/src/sp-script.cpp
+++ b/src/sp-script.cpp
@@ -57,11 +57,11 @@ void SPScript::release() {
SPObject::release();
}
-void SPScript::update(SPCtx* ctx, unsigned int flags) {
+void SPScript::update(SPCtx* /*ctx*/, unsigned int /*flags*/) {
}
-void SPScript::modified(unsigned int flags) {
+void SPScript::modified(unsigned int /*flags*/) {
}
@@ -81,7 +81,7 @@ void SPScript::set(unsigned int key, const gchar* value) {
}
}
-Inkscape::XML::Node* SPScript::write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags) {
+Inkscape::XML::Node* SPScript::write(Inkscape::XML::Document* /*doc*/, Inkscape::XML::Node* repr, guint /*flags*/) {
return repr;
}
diff --git a/src/sp-shape.cpp b/src/sp-shape.cpp
index 3cc7ea1ce..b3a331cba 100644
--- a/src/sp-shape.cpp
+++ b/src/sp-shape.cpp
@@ -712,7 +712,7 @@ void SPShape::print(SPPrintContext* ctx) {
}
}
-Inkscape::DrawingItem* SPShape::show(Inkscape::Drawing &drawing, unsigned int key, unsigned int flags) {
+Inkscape::DrawingItem* SPShape::show(Inkscape::Drawing &drawing, unsigned int /*key*/, unsigned int /*flags*/) {
Inkscape::DrawingShape *s = new Inkscape::DrawingShape(drawing);
s->setStyle(this->style);
s->setPath(this->_curve);
diff --git a/src/sp-switch.cpp b/src/sp-switch.cpp
index 911357660..5c88d7af8 100644
--- a/src/sp-switch.cpp
+++ b/src/sp-switch.cpp
@@ -81,7 +81,7 @@ gchar *SPSwitch::description() const {
ngettext(_("of <b>%d</b> object"), _("of <b>%d</b> objects"), len), len);
}
-void SPSwitch::child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref) {
+void SPSwitch::child_added(Inkscape::XML::Node* /*child*/, Inkscape::XML::Node* /*ref*/) {
this->_reevaluate(true);
}
diff --git a/src/sp-text.cpp b/src/sp-text.cpp
index 11d0e1a6c..d2f433eba 100644
--- a/src/sp-text.cpp
+++ b/src/sp-text.cpp
@@ -305,7 +305,7 @@ Geom::OptRect SPText::bbox(Geom::Affine const &transform, SPItem::BBoxType type)
return bbox;
}
-Inkscape::DrawingItem* SPText::show(Inkscape::Drawing &drawing, unsigned key, unsigned flags) {
+Inkscape::DrawingItem* SPText::show(Inkscape::Drawing &drawing, unsigned /*key*/, unsigned /*flags*/) {
Inkscape::DrawingGroup *flowed = new Inkscape::DrawingGroup(drawing);
flowed->setPickChildren(false);
flowed->setStyle(this->style);
diff --git a/src/text-editing.cpp b/src/text-editing.cpp
index cf1c4811f..cae123616 100644
--- a/src/text-editing.cpp
+++ b/src/text-editing.cpp
@@ -1558,7 +1558,7 @@ static SPObject* ascend_while_first(SPObject *item, Glib::ustring::iterator text
/** empty spans: abc<span></span>def
-> abcdef */
-static bool tidy_operator_empty_spans(SPObject **item, bool has_text_decoration)
+static bool tidy_operator_empty_spans(SPObject **item, bool /*has_text_decoration*/)
{
bool result = false;
if ( !(*item)->hasChildren()
@@ -1576,7 +1576,7 @@ static bool tidy_operator_empty_spans(SPObject **item, bool has_text_decoration)
/** inexplicable spans: abc<span style="">def</span>ghi
-> "abc""def""ghi"
the repeated strings will be merged by another operator. */
-static bool tidy_operator_inexplicable_spans(SPObject **item, bool has_text_decoration)
+static bool tidy_operator_inexplicable_spans(SPObject **item, bool /*has_text_decoration*/)
{
//XML Tree being directly used here while it shouldn't be.
if (*item && sp_repr_is_meta_element((*item)->getRepr())) {
@@ -1611,7 +1611,7 @@ static bool tidy_operator_inexplicable_spans(SPObject **item, bool has_text_deco
/** repeated spans: <font a>abc</font><font a>def</font>
-> <font a>abcdef</font> */
-static bool tidy_operator_repeated_spans(SPObject **item, bool has_text_decoration)
+static bool tidy_operator_repeated_spans(SPObject **item, bool /*has_text_decoration*/)
{
SPObject *first = *item;
SPObject *second = first->getNext();
@@ -1657,7 +1657,7 @@ static bool tidy_operator_repeated_spans(SPObject **item, bool has_text_decorati
-> <font b>abc</font>
excessive nesting: <font a><size 1>abc</size></font>
-> <font a,size 1>abc</font> */
-static bool tidy_operator_excessive_nesting(SPObject **item, bool has_text_decoration)
+static bool tidy_operator_excessive_nesting(SPObject **item, bool /*has_text_decoration*/)
{
if (!(*item)->hasChildren()) {
return false;
@@ -1735,7 +1735,7 @@ example. You may note that this only does its work when the doubly-nested
child is the first or last. The other cases are called 'style inversion'
below, and I'm not yet convinced that the result of that operation will be
tidier in all cases. */
-static bool tidy_operator_redundant_double_nesting(SPObject **item, bool has_text_decoration)
+static bool tidy_operator_redundant_double_nesting(SPObject **item, bool /*has_text_decoration*/)
{
if (!(*item)->hasChildren()) return false;
if ((*item)->firstChild() == (*item)->lastChild()) return false; // this is excessive nesting, done above
@@ -1796,7 +1796,7 @@ static bool redundant_semi_nesting_processor(SPObject **item, SPObject *child, b
-> <font b>abc</font><font>def</font>
test this by applying a colour to a region, then a different colour to
a partially-overlapping region. */
-static bool tidy_operator_redundant_semi_nesting(SPObject **item, bool has_text_decoration)
+static bool tidy_operator_redundant_semi_nesting(SPObject **item, bool /*has_text_decoration*/)
{
if (!(*item)->hasChildren()) return false;
if ((*item)->firstChild() == (*item)->lastChild()) return false; // this is redundant nesting, done above
diff --git a/src/winmain.cpp b/src/winmain.cpp
index 752ab8e6b..607660740 100644
--- a/src/winmain.cpp
+++ b/src/winmain.cpp
@@ -25,10 +25,10 @@ extern int main (int argc, char **argv);
#endif
int _stdcall
-WinMain (struct HINSTANCE__ *hInstance,
- struct HINSTANCE__ *hPrevInstance,
- char *lpszCmdLine,
- int nCmdShow)
+WinMain (struct HINSTANCE__ */*hInstance*/,
+ struct HINSTANCE__ */*hPrevInstance*/,
+ char */*lpszCmdLine*/,
+ int /*nCmdShow*/)
{
if (fileno (stdout) != -1 &&
_get_osfhandle (fileno (stdout)) != -1)