summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJon A. Cruz <jon@joncruz.org>2011-06-29 09:43:07 +0000
committerJon A. Cruz <jon@joncruz.org>2011-06-29 09:43:07 +0000
commita56335650da902734f5d27b9a8d743c60a0e9fd6 (patch)
tree8c729eca038813799c86116caa4e987e55cc8be8 /src
parentAs the comment says testing for a float to be equal to zero is not safe, henc... (diff)
downloadinkscape-a56335650da902734f5d27b9a8d743c60a0e9fd6.tar.gz
inkscape-a56335650da902734f5d27b9a8d743c60a0e9fd6.zip
Fixed initialization issue plus a few warnings.
(bzr r10386)
Diffstat (limited to 'src')
-rw-r--r--src/2geom/path-intersection.cpp2
-rw-r--r--src/libgdl/gdl-dock-bar.c2
-rw-r--r--src/libgdl/gdl-dock-item-grip.c12
-rw-r--r--src/libgdl/gdl-dock-paned.c2
-rw-r--r--src/libgdl/gdl-dock-placeholder.c12
-rw-r--r--src/libgdl/gdl-dock-tablabel.c1
6 files changed, 25 insertions, 6 deletions
diff --git a/src/2geom/path-intersection.cpp b/src/2geom/path-intersection.cpp
index 58ee6232b..7aa662abb 100644
--- a/src/2geom/path-intersection.cpp
+++ b/src/2geom/path-intersection.cpp
@@ -228,8 +228,6 @@ intersect_polish_f (const gsl_vector * x, void *params,
static void
intersect_polish_root (Curve const &A, double &s,
Curve const &B, double &t) {
- int status;
- size_t iter = 0;
std::vector<Point> as, bs;
as = A.pointAndDerivatives(s, 2);
bs = B.pointAndDerivatives(t, 2);
diff --git a/src/libgdl/gdl-dock-bar.c b/src/libgdl/gdl-dock-bar.c
index 1e694eec5..2b230fc54 100644
--- a/src/libgdl/gdl-dock-bar.c
+++ b/src/libgdl/gdl-dock-bar.c
@@ -246,6 +246,7 @@ gdl_dock_bar_item_clicked (GtkWidget *button,
{
GdlDockBar *dockbar;
GdlDockObject *controller;
+ (void)button;
g_return_if_fail (item != NULL);
@@ -394,6 +395,7 @@ static void
gdl_dock_bar_layout_changed_cb (GdlDockMaster *master,
GdlDockBar *dockbar)
{
+ (void)master;
update_dock_items (dockbar, FALSE);
}
diff --git a/src/libgdl/gdl-dock-item-grip.c b/src/libgdl/gdl-dock-item-grip.c
index 089eeb685..f4f628b5d 100644
--- a/src/libgdl/gdl-dock-item-grip.c
+++ b/src/libgdl/gdl-dock-item-grip.c
@@ -132,7 +132,6 @@ gdl_dock_item_grip_expose (GtkWidget *widget,
gint layout_height;
gint text_x;
gint text_y;
- gboolean item_or_child_has_focus;
grip = GDL_DOCK_ITEM_GRIP (widget);
gdl_dock_item_grip_get_title_area (grip, &title_area);
@@ -201,6 +200,7 @@ gdl_dock_item_grip_item_notify (GObject *master,
{
GdlDockItemGrip *grip;
gboolean cursor;
+ (void)master;
grip = GDL_DOCK_ITEM_GRIP (data);
@@ -318,6 +318,7 @@ static void
gdl_dock_item_grip_close_clicked (GtkWidget *widget,
GdlDockItemGrip *grip)
{
+ (void)widget;
g_return_if_fail (grip->item != NULL);
gdl_dock_item_hide_item (grip->item);
@@ -327,6 +328,7 @@ static void
gdl_dock_item_grip_iconify_clicked (GtkWidget *widget,
GdlDockItemGrip *grip)
{
+ (void)widget;
g_return_if_fail (grip->item != NULL);
gdl_dock_item_iconify_item (grip->item);
@@ -556,8 +558,9 @@ gdl_dock_item_grip_size_allocate (GtkWidget *widget,
{
GdlDockItemGrip *grip;
GtkContainer *container;
- GtkRequisition button_requisition = { 0, };
+ GtkRequisition button_requisition;
GtkAllocation child_allocation;
+ memset(&button_requisition, 0, sizeof(button_requisition));
g_return_if_fail (GDL_IS_DOCK_ITEM_GRIP (widget));
g_return_if_fail (allocation != NULL);
@@ -625,6 +628,8 @@ static void
gdl_dock_item_grip_add (GtkContainer *container,
GtkWidget *widget)
{
+ (void)container;
+ (void)widget;
g_warning ("gtk_container_add not implemented for GdlDockItemGrip");
}
@@ -632,6 +637,8 @@ static void
gdl_dock_item_grip_remove (GtkContainer *container,
GtkWidget *widget)
{
+ (void)container;
+ (void)widget;
g_warning ("gtk_container_remove not implemented for GdlDockItemGrip");
}
@@ -656,6 +663,7 @@ gdl_dock_item_grip_forall (GtkContainer *container,
static GType
gdl_dock_item_grip_child_type (GtkContainer *container)
{
+ (void)container;
return G_TYPE_NONE;
}
diff --git a/src/libgdl/gdl-dock-paned.c b/src/libgdl/gdl-dock-paned.c
index 70273c886..5d0ac17ed 100644
--- a/src/libgdl/gdl-dock-paned.c
+++ b/src/libgdl/gdl-dock-paned.c
@@ -205,6 +205,7 @@ gdl_dock_paned_notify_cb (GObject *g_object,
gpointer user_data)
{
GdlDockPaned *paned;
+ (void)g_object;
g_return_if_fail (user_data != NULL && GDL_IS_DOCK_PANED (user_data));
@@ -255,6 +256,7 @@ gdl_dock_paned_button_cb (GtkWidget *widget,
gpointer user_data)
{
GdlDockPaned *paned;
+ (void)widget;
g_return_val_if_fail (user_data != NULL && GDL_IS_DOCK_PANED (user_data), FALSE);
diff --git a/src/libgdl/gdl-dock-placeholder.c b/src/libgdl/gdl-dock-placeholder.c
index e1785ae83..ca7763a55 100644
--- a/src/libgdl/gdl-dock-placeholder.c
+++ b/src/libgdl/gdl-dock-placeholder.c
@@ -352,6 +352,7 @@ gdl_dock_placeholder_detach (GdlDockObject *object,
gboolean recursive)
{
GdlDockPlaceholder *ph = GDL_DOCK_PLACEHOLDER (object);
+ (void)recursive;
/* disconnect handlers */
disconnect_host (ph);
@@ -366,6 +367,7 @@ gdl_dock_placeholder_detach (GdlDockObject *object,
static void
gdl_dock_placeholder_reduce (GdlDockObject *object)
{
+ (void)object;
/* placeholders are not reduced */
return;
}
@@ -532,6 +534,8 @@ static void
gdl_dock_placeholder_present (GdlDockObject *object,
GdlDockObject *child)
{
+ (void)object;
+ (void)child;
/* do nothing */
return;
}
@@ -574,7 +578,8 @@ gdl_dock_placeholder_weak_notify (gpointer data,
GObject *old_object)
{
GdlDockPlaceholder *ph;
-
+ (void)old_object;
+
g_return_if_fail (data != NULL && GDL_IS_DOCK_PLACEHOLDER (data));
ph = GDL_DOCK_PLACEHOLDER (data);
@@ -606,6 +611,7 @@ detach_cb (GdlDockObject *object,
{
GdlDockPlaceholder *ph;
GdlDockObject *new_host, *obj;
+ (void)recursive;
g_return_if_fail (user_data != NULL && GDL_IS_DOCK_PLACEHOLDER (user_data));
@@ -735,7 +741,9 @@ dock_cb (GdlDockObject *object,
{
GdlDockPlacement pos = GDL_DOCK_NONE;
GdlDockPlaceholder *ph;
-
+ (void)position;
+ (void)other_data;
+
g_return_if_fail (user_data != NULL && GDL_IS_DOCK_PLACEHOLDER (user_data));
ph = GDL_DOCK_PLACEHOLDER (user_data);
g_return_if_fail (ph->_priv->host == object);
diff --git a/src/libgdl/gdl-dock-tablabel.c b/src/libgdl/gdl-dock-tablabel.c
index 790bf7612..fb233fc3e 100644
--- a/src/libgdl/gdl-dock-tablabel.c
+++ b/src/libgdl/gdl-dock-tablabel.c
@@ -254,6 +254,7 @@ gdl_dock_tablabel_item_notify (GObject *master,
gboolean locked;
gchar *label;
GtkBin *bin;
+ (void)pspec;
g_object_get (master,
"locked", &locked,