summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBob Jamison <ishmalius@gmail.com>2008-05-13 17:22:10 +0000
committerishmal <ishmal@users.sourceforge.net>2008-05-13 17:22:10 +0000
commit28af69b91a26f308653a049bc2790fb363471b3d (patch)
tree6d0b0ceadaded290c21687b49502995d123bf266 /src
parentremove warnings (diff)
downloadinkscape-28af69b91a26f308653a049bc2790fb363471b3d.tar.gz
inkscape-28af69b91a26f308653a049bc2790fb363471b3d.zip
remove warnings
(bzr r5668)
Diffstat (limited to 'src')
-rw-r--r--src/jabber_whiteboard/inkboard-document.cpp16
-rw-r--r--src/jabber_whiteboard/inkboard-document.h2
-rw-r--r--src/jabber_whiteboard/inkboard-node.cpp17
-rw-r--r--src/jabber_whiteboard/pedrogui.cpp16
-rw-r--r--src/jabber_whiteboard/session-manager.h3
-rw-r--r--src/pedro/pedroconfig.h4
-rw-r--r--src/sp-skeleton.cpp2
-rw-r--r--src/style-test.cpp7
8 files changed, 36 insertions, 31 deletions
diff --git a/src/jabber_whiteboard/inkboard-document.cpp b/src/jabber_whiteboard/inkboard-document.cpp
index 36295dd28..dd039ab6f 100644
--- a/src/jabber_whiteboard/inkboard-document.cpp
+++ b/src/jabber_whiteboard/inkboard-document.cpp
@@ -371,9 +371,9 @@ InkboardDocument::createPI(char const *target, char const* content)
-void InkboardDocument::notifyChildAdded(XML::Node &parent,
+void InkboardDocument::notifyChildAdded(XML::Node &/*parent*/,
XML::Node &child,
- XML::Node *prev)
+ XML::Node */*prev*/)
{
if (_in_transaction && state == State::IN_WHITEBOARD) {
@@ -389,9 +389,9 @@ void InkboardDocument::notifyChildAdded(XML::Node &parent,
}
}
-void InkboardDocument::notifyChildRemoved(XML::Node &parent,
+void InkboardDocument::notifyChildRemoved(XML::Node &/*parent*/,
XML::Node &child,
- XML::Node *prev)
+ XML::Node */*prev*/)
{
if (_in_transaction && state == State::IN_WHITEBOARD)
{
@@ -406,8 +406,8 @@ void InkboardDocument::notifyChildRemoved(XML::Node &parent,
void InkboardDocument::notifyChildOrderChanged(XML::Node &parent,
XML::Node &child,
- XML::Node *old_prev,
- XML::Node *new_prev)
+ XML::Node */*old_prev*/,
+ XML::Node */*new_prev*/)
{
if (_in_transaction && state == State::IN_WHITEBOARD)
{
@@ -424,7 +424,7 @@ void InkboardDocument::notifyChildOrderChanged(XML::Node &parent,
}
void InkboardDocument::notifyContentChanged(XML::Node &node,
- Util::ptr_shared<char> old_content,
+ Util::ptr_shared<char> /*old_content*/,
Util::ptr_shared<char> new_content)
{
if (_in_transaction && state == State::IN_WHITEBOARD)
@@ -452,7 +452,7 @@ void InkboardDocument::notifyContentChanged(XML::Node &node,
void InkboardDocument::notifyAttributeChanged(XML::Node &node,
GQuark name,
- Util::ptr_shared<char> old_value,
+ Util::ptr_shared<char> /*old_value*/,
Util::ptr_shared<char> new_value)
{
if (_in_transaction && state == State::IN_WHITEBOARD)
diff --git a/src/jabber_whiteboard/inkboard-document.h b/src/jabber_whiteboard/inkboard-document.h
index 23ce9f3b9..6bfcab59b 100644
--- a/src/jabber_whiteboard/inkboard-document.h
+++ b/src/jabber_whiteboard/inkboard-document.h
@@ -131,7 +131,7 @@ protected:
_initBindings();
}
- XML::SimpleNode* _duplicate(XML::Document* xml_doc) const
+ XML::SimpleNode* _duplicate(XML::Document* /*xml_doc*/) const
{
return new InkboardDocument(*this);
}
diff --git a/src/jabber_whiteboard/inkboard-node.cpp b/src/jabber_whiteboard/inkboard-node.cpp
index 343b6c4c1..d3d568551 100644
--- a/src/jabber_whiteboard/inkboard-node.cpp
+++ b/src/jabber_whiteboard/inkboard-node.cpp
@@ -60,11 +60,12 @@ InkboardDocument::composeNewMessage(Inkscape::XML::Node *node)
}
void
-InkboardDocument::changeConfigureText(Glib::ustring target, unsigned int version,
- Glib::ustring text)
+InkboardDocument::changeConfigureText(Glib::ustring target,
+ unsigned int /*version*/,
+ Glib::ustring text)
{
XML::Node *node = this->tracker->get(target);
- unsigned int elementVersion = this->tracker->getVersion(node);
+ //unsigned int elementVersion = this->tracker->getVersion(node);
if(node)// && version == (elementVersion + 1))
{
@@ -75,11 +76,13 @@ InkboardDocument::changeConfigureText(Glib::ustring target, unsigned int version
}
void
-InkboardDocument::changeConfigure(Glib::ustring target, unsigned int version,
- Glib::ustring attribute, Glib::ustring value)
+InkboardDocument::changeConfigure(Glib::ustring target,
+ unsigned int /*version*/,
+ Glib::ustring attribute,
+ Glib::ustring value)
{
XML::Node *node = this->tracker->get(target);
- unsigned int elementVersion = this->tracker->getVersion(node);
+ //unsigned int elementVersion = this->tracker->getVersion(node);
if(node)// && version == (elementVersion + 1))
{
@@ -93,7 +96,7 @@ InkboardDocument::changeConfigure(Glib::ustring target, unsigned int version,
void
InkboardDocument::changeNew(Glib::ustring parentid, Glib::ustring id,
- signed int index, Pedro::Element* data)
+ signed int /*index*/, Pedro::Element* data)
{
Glib::ustring name(data->getName());
diff --git a/src/jabber_whiteboard/pedrogui.cpp b/src/jabber_whiteboard/pedrogui.cpp
index b101047cb..95ef0c96a 100644
--- a/src/jabber_whiteboard/pedrogui.cpp
+++ b/src/jabber_whiteboard/pedrogui.cpp
@@ -4,7 +4,7 @@
* Authors:
* Bob Jamison
*
- * Copyright (C) 2005 Bob Jamison
+ * Copyright (C) 2005-2008 Bob Jamison
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -380,8 +380,8 @@ static const guint8 icon_xa[] =
//#########################################################################
-void Roster::doubleClickCallback(const Gtk::TreeModel::Path &path,
- Gtk::TreeViewColumn *col)
+void Roster::doubleClickCallback(const Gtk::TreeModel::Path &/*path*/,
+ Gtk::TreeViewColumn */*col*/)
{
Glib::RefPtr<Gtk::TreeModel> model = rosterView.get_model();
Glib::RefPtr<Gtk::TreeSelection> sel = rosterView.get_selection();
@@ -699,8 +699,8 @@ void MessageList::postMessage(const DOMString &from, const DOMString &msg)
//#########################################################################
//# U S E R L I S T
//#########################################################################
-void UserList::doubleClickCallback(const Gtk::TreeModel::Path &path,
- Gtk::TreeViewColumn *col)
+void UserList::doubleClickCallback(const Gtk::TreeModel::Path &/*path*/,
+ Gtk::TreeViewColumn */*col*/)
{
Glib::RefPtr<Gtk::TreeModel> model = userList.get_model();
Glib::RefPtr<Gtk::TreeSelection> sel = userList.get_selection();
@@ -1092,7 +1092,7 @@ bool GroupChatWindow::receiveMessage(const DOMString &from,
bool GroupChatWindow::receivePresence(const DOMString &fromNick,
bool presence,
const DOMString &show,
- const DOMString &status)
+ const DOMString &/*status*/)
{
DOMString presStr = "";
@@ -1585,8 +1585,8 @@ void ConnectDialog::cancelCallback()
void ConnectDialog::doubleClickCallback(
- const Gtk::TreeModel::Path &path,
- Gtk::TreeViewColumn *col)
+ const Gtk::TreeModel::Path &/*path*/,
+ Gtk::TreeViewColumn */*col*/)
{
Glib::RefPtr<Gtk::TreeModel> model = accountView.get_model();
Glib::RefPtr<Gtk::TreeSelection> sel = accountView.get_selection();
diff --git a/src/jabber_whiteboard/session-manager.h b/src/jabber_whiteboard/session-manager.h
index 318761259..53cc8f5b4 100644
--- a/src/jabber_whiteboard/session-manager.h
+++ b/src/jabber_whiteboard/session-manager.h
@@ -98,7 +98,8 @@ public:
InkboardDocument* getInkboardSession(Glib::ustring const& to);
- void operator=(XmppEventListener const& other) {}
+ void operator=(XmppEventListener const& /*other*/)
+ {}
private:
diff --git a/src/pedro/pedroconfig.h b/src/pedro/pedroconfig.h
index f3fb96e72..be8c6c665 100644
--- a/src/pedro/pedroconfig.h
+++ b/src/pedro/pedroconfig.h
@@ -6,7 +6,7 @@
* Authors:
* Bob Jamison
*
- * Copyright (C) 2005-2007 Bob Jamison
+ * Copyright (C) 2005-2008 Bob Jamison
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -178,7 +178,7 @@ public:
/**
*
*/
- XmppConfig(const XmppConfig &other)
+ XmppConfig(const XmppConfig &other) : XmppEventTarget(other)
{ assign(other); }
/**
diff --git a/src/sp-skeleton.cpp b/src/sp-skeleton.cpp
index 878d8f31b..ee0c9626b 100644
--- a/src/sp-skeleton.cpp
+++ b/src/sp-skeleton.cpp
@@ -147,7 +147,7 @@ sp_skeleton_set(SPObject *object, unsigned int key, gchar const *value)
{
debug("0x%p %s(%u): '%s'",object,
sp_attribute_name(key),key,value ? value : "<no value>");
- SPSkeleton *skeleton = SP_SKELETON(object);
+ //SPSkeleton *skeleton = SP_SKELETON(object);
/* See if any parents need this value. */
if (((SPObjectClass *) skeleton_parent_class)->set) {
diff --git a/src/style-test.cpp b/src/style-test.cpp
index 1349bd00a..d390ae79f 100644
--- a/src/style-test.cpp
+++ b/src/style-test.cpp
@@ -342,7 +342,7 @@ font_family_val(char const prop[], char const *const dummy_vals[])
* `px') for better CSS interoperability.
*/
static void
-unitful_length_val(char const prop[], char const *const dummy_vals[])
+unitful_length_val(char const /*prop*/[], char const *const dummy_vals[])
{
/* todo */
assert(dummy_vals == NULL);
@@ -381,8 +381,9 @@ uri_or_enum_val(char const prop[], char const *const vals[])
}
static void
-suppress_warning_log_handler(gchar const *log_domain, GLogLevelFlags /*log_level*/,
- gchar const *message,
+suppress_warning_log_handler(gchar const */*log_domain*/,
+ GLogLevelFlags /*log_level*/,
+ gchar const */*message*/,
gpointer /*user_data*/)
{
/* todo: We could strncpy message to a static buffer for later testing with