Cmake: Fixed the extra -l in the link command, plus a add linking for all sub-libs...

[inkscape.git] / src / dialogs / fill-style.cpp

diff --git a/src/dialogs/fill-style.cpp b/src/dialogs/fill-style.cpp
index 3c0620feb47af8e341b601a168a5e45c06278b00..e1c30e7aebdf4a5fb21625fe4e48f1a28146fabe 100644 (file)
--- a/src/dialogs/fill-style.cpp
+++ b/src/dialogs/fill-style.cpp
@@ -1,9 +1,7 @@
-#define __SP_FILL_STYLE_C__
-
-/**
- * \brief  Fill style widget
- *
- * Authors:
+/** @file
+ * @brief  Fill style widget
+ */
+/* Authors:
  *   Lauris Kaplinski <lauris@kaplinski.com>
  *   Frank Felfe <innerspace@iname.com>
  *   bulia byak <buliabyak@users.sf.net>
@@ -21,21 +19,21 @@
 #endif
 
 
-#include <widgets/sp-widget.h>
-#include <sp-linear-gradient.h>
-#include <sp-pattern.h>
-#include <sp-radial-gradient.h>
-#include <widgets/paint-selector.h>
-#include <style.h>
-#include <gradient-chemistry.h>
-#include <desktop-style.h>
-#include <desktop-handles.h>
-#include <selection.h>
-#include <inkscape.h>
-#include <document-private.h>
-#include <xml/repr.h>
+#include "widgets/sp-widget.h"
+#include "sp-linear-gradient.h"
+#include "sp-pattern.h"
+#include "sp-radial-gradient.h"
+#include "widgets/paint-selector.h"
+#include "style.h"
+#include "gradient-chemistry.h"
+#include "desktop-style.h"
+#include "desktop-handles.h"
+#include "selection.h"
+#include "inkscape.h"
+#include "document-private.h"
+#include "xml/repr.h"
 #include <glibmm/i18n.h>
-#include <display/sp-canvas.h>
+#include "display/sp-canvas.h"
 
 
 // These can be deleted once we sort out the libart dependence.
@@ -121,10 +119,8 @@ sp_fill_style_widget_new (void)
 
 
 static void
-sp_fill_style_widget_construct ( SPWidget *spw, SPPaintSelector *psel )
+sp_fill_style_widget_construct( SPWidget *spw, SPPaintSelector */*psel*/ )
 {
-    (void)psel;
-
 #ifdef SP_FS_VERBOSE
     g_print ( "Fill style widget constructed: inkscape %p repr %p\n",
               spw->inkscape, spw->repr );
@@ -136,13 +132,11 @@ sp_fill_style_widget_construct ( SPWidget *spw, SPPaintSelector *psel )
 } // end of sp_fill_style_widget_construct()
 
 static void
-sp_fill_style_widget_modify_selection ( SPWidget *spw,
-                                        Inkscape::Selection *selection,
-                                        guint flags,
-                                        SPPaintSelector *psel )
+sp_fill_style_widget_modify_selection( SPWidget *spw,
+                                       Inkscape::Selection */*selection*/,
+                                       guint flags,
+                                       SPPaintSelector */*psel*/ )
 {
-    (void)selection;
-    (void)psel;
     if (flags & ( SP_OBJECT_MODIFIED_FLAG |
                   SP_OBJECT_PARENT_MODIFIED_FLAG |
                   SP_OBJECT_STYLE_MODIFIED_FLAG) )
@@ -152,20 +146,18 @@ sp_fill_style_widget_modify_selection ( SPWidget *spw,
 }
 
 static void
-sp_fill_style_widget_change_subselection ( Inkscape::Application *inkscape,
-                                        SPDesktop *desktop,
-                                        SPWidget *spw )
+sp_fill_style_widget_change_subselection( Inkscape::Application */*inkscape*/,
+                                          SPDesktop */*desktop*/,
+                                          SPWidget *spw )
 {
-    (void)inkscape;
     sp_fill_style_widget_update (spw);
 }
 
 static void
-sp_fill_style_widget_change_selection ( SPWidget *spw,
-                                        Inkscape::Selection *selection,
-                                        SPPaintSelector *psel )
+sp_fill_style_widget_change_selection( SPWidget *spw,
+                                       Inkscape::Selection */*selection*/,
+                                       SPPaintSelector */*psel*/ )
 {
-    (void)selection;
     sp_fill_style_widget_update (spw);
 }
 
@@ -256,10 +248,9 @@ sp_fill_style_widget_update (SPWidget *spw)
 
 static void
 sp_fill_style_widget_paint_mode_changed ( SPPaintSelector *psel,
-                                          SPPaintSelectorMode mode,
+                                          SPPaintSelectorMode /*mode*/,
                                           SPWidget *spw )
 {
-    (void)mode;
     if (g_object_get_data (G_OBJECT (spw), "update"))
         return;
 
@@ -270,11 +261,10 @@ sp_fill_style_widget_paint_mode_changed ( SPPaintSelector *psel,
 }
 
 static void
-sp_fill_style_widget_fillrule_changed ( SPPaintSelector *psel,
+sp_fill_style_widget_fillrule_changed ( SPPaintSelector */*psel*/,
                                           SPPaintSelectorFillRule mode,
                                           SPWidget *spw )
 {
-    (void)psel;
     if (g_object_get_data (G_OBJECT (spw), "update"))
         return;
 
@@ -291,9 +281,9 @@ sp_fill_style_widget_fillrule_changed ( SPPaintSelector *psel,
                       _("Change fill rule"));
 }
 
-static gchar *undo_label_1 = "fill:flatcolor:1";
-static gchar *undo_label_2 = "fill:flatcolor:2";
-static gchar *undo_label = undo_label_1;
+static gchar const *undo_label_1 = "fill:flatcolor:1";
+static gchar const *undo_label_2 = "fill:flatcolor:2";
+static gchar const *undo_label = undo_label_1;
 
 /**
 This is called repeatedly while you are dragging a color slider, only for flat color