Doxygen cleanup.

(bzr r10660)

9 files changed, 42 insertions, 50 deletions

diff --git a/src/widgets/dash-selector.cpp b/src/widgets/dash-selector.cpp
index 3339c64d3..6b22bd396 100644
--- a/src/widgets/dash-selector.cpp
+++ b/src/widgets/dash-selector.cpp
@@ -1,7 +1,6 @@
-#define __SP_DASH_SELECTOR_NEW_C__
-
-/** @file
- * @brief Option menu for selecting dash patterns - implementation
+/**
+ * @file
+ * Option menu for selecting dash patterns - implementation.
  */
 /* Author:
  *   Lauris Kaplinski <lauris@kaplinski.com>
diff --git a/src/widgets/eek-preview.cpp b/src/widgets/eek-preview.cpp
index 1ca656ae1..5de246f6b 100644
--- a/src/widgets/eek-preview.cpp
+++ b/src/widgets/eek-preview.cpp
@@ -1,5 +1,6 @@
-/** @file
- * @brief EEK preview stuff
+/**
+ * @file
+ * EEK preview stuff.
  */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
diff --git a/src/widgets/ege-paint-def.cpp b/src/widgets/ege-paint-def.cpp
index 9eb54b039..36777d16a 100644
--- a/src/widgets/ege-paint-def.cpp
+++ b/src/widgets/ege-paint-def.cpp
@@ -1,5 +1,6 @@
-/** @file
- * @brief EGE paint definition
+/**
+ * @file
+ * EGE paint definition.
  */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
diff --git a/src/widgets/fill-style.cpp b/src/widgets/fill-style.cpp
index c6e97666a..6f076b4c4 100644
--- a/src/widgets/fill-style.cpp
+++ b/src/widgets/fill-style.cpp
@@ -1,5 +1,6 @@
-/** @file
- * @brief  Fill style widget
+/**
+ * @file
+ * Fill style widget.
  */
 /* Authors:
  *   Lauris Kaplinski <lauris@kaplinski.com>
diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp
index 259aa5f25..fc9dc9263 100644
--- a/src/widgets/paint-selector.cpp
+++ b/src/widgets/paint-selector.cpp
@@ -1,4 +1,5 @@
-/** \file
+/**
+ * @file
  * SPPaintSelector: Generic paint selector widget.
  */
 
@@ -831,13 +832,10 @@ sp_pattern_menu_build (GtkWidget *m, GSList *pattern_list, SPDocument */*source*
         }
 
 /**
- * sp_pattern_list_from_doc()
- *
- * \brief Pick up all patterns from source, except those that are in
- * current_doc (if non-NULL), and add items to the pattern menu
- *
+ * Pick up all patterns from source, except those that are in
+ * current_doc (if non-NULL), and add items to the pattern menu.
  */
-static void sp_pattern_list_from_doc (GtkWidget *m, SPDocument * /*current_doc*/, SPDocument *source, SPDocument * /*pattern_doc*/)
+static void sp_pattern_list_from_doc(GtkWidget *m, SPDocument * /*current_doc*/, SPDocument *source, SPDocument * /*pattern_doc*/)
 {
     GSList *pl = ink_pattern_list_get(source);
     GSList *clean_pl = NULL;
diff --git a/src/widgets/sp-attribute-widget.cpp b/src/widgets/sp-attribute-widget.cpp
index f7cd308b2..9cdf9fab3 100644
--- a/src/widgets/sp-attribute-widget.cpp
+++ b/src/widgets/sp-attribute-widget.cpp
@@ -1,5 +1,6 @@
-/** @file
- * @brief Widget that listens and modifies repr attributes
+/**
+ * @file
+ * Widget that listens and modifies repr attributes.
  */
 /* Authors:
  *  Lauris Kaplinski <lauris@ximian.com>
diff --git a/src/widgets/spw-utilities.cpp b/src/widgets/spw-utilities.cpp
index 2225f2c57..ece329576 100644
--- a/src/widgets/spw-utilities.cpp
+++ b/src/widgets/spw-utilities.cpp
@@ -1,5 +1,3 @@
-#define __SPW_UTILITIES_C__
-
 /*
  * Inkscape Widget Utilities
  *
@@ -227,10 +225,9 @@ sp_set_font_size_smaller (GtkWidget *w)
 }
 
 /**
-\brief  Finds the descendant of w which has the data with the given key and returns the data, or NULL if there's none
-*/
-gpointer
-sp_search_by_data_recursive (GtkWidget *w, gpointer key)
+ * Finds the descendant of w which has the data with the given key and returns the data, or NULL if there's none.
+ */
+gpointer sp_search_by_data_recursive(GtkWidget *w, gpointer key)
 {
 	gpointer r = NULL;
 
@@ -251,10 +248,9 @@ sp_search_by_data_recursive (GtkWidget *w, gpointer key)
 }
 
 /**
-\brief  Returns the descendant of w which has the given key and value pair, or NULL if there's none
-*/
-GtkWidget *
-sp_search_by_value_recursive (GtkWidget *w, gchar *key, gchar *value)
+ * Returns the descendant of w which has the given key and value pair, or NULL if there's none.
+ */
+GtkWidget *sp_search_by_value_recursive(GtkWidget *w, gchar *key, gchar *value)
 {
 	gchar *r = NULL;
 	GtkWidget *child;
diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp
index bb9391c78..b4a5b5694 100644
--- a/src/widgets/stroke-style.cpp
+++ b/src/widgets/stroke-style.cpp
@@ -1,5 +1,6 @@
-/** @file
- * @brief  Stroke style dialog
+/**
+ * @file
+ * Stroke style dialog.
  */
 /* Authors:
  *   Lauris Kaplinski <lauris@kaplinski.com>
@@ -291,14 +292,10 @@ sp_marker_menu_build (Gtk::Menu *m, GSList *marker_list, SPDocument *source, SPD
 }
 
 /**
- * sp_marker_list_from_doc()
- *
- * \brief Pick up all markers from source, except those that are in
- * current_doc (if non-NULL), and add items to the m menu
- *
+ * Pick up all markers from source, except those that are in
+ * current_doc (if non-NULL), and add items to the m menu.
  */
-static void
-sp_marker_list_from_doc (Gtk::Menu *m, SPDocument * /*current_doc*/, SPDocument *source, SPDocument * /*markers_doc*/, SPDocument *sandbox, gchar const *menu_id)
+static void sp_marker_list_from_doc(Gtk::Menu *m, SPDocument * /*current_doc*/, SPDocument *source, SPDocument * /*markers_doc*/, SPDocument *sandbox, gchar const *menu_id)
 {
     GSList *ml = ink_marker_list_get(source);
     GSList *clean_ml = NULL;
@@ -644,11 +641,9 @@ static gboolean stroke_width_set_unit(SPUnitSelector *,
 
 
 /**
- * \brief  Creates a new widget for the line stroke style.
- *
+ * Creates a new widget for the line stroke style.
  */
-Gtk::Container *
-sp_stroke_style_line_widget_new(void)
+Gtk::Container *sp_stroke_style_line_widget_new(void)
 {
     Gtk::Widget *us;
     SPDashSelector *ds;
@@ -1267,14 +1262,13 @@ sp_stroke_style_line_dash_changed(Gtk::Container *spw)
 }
 
 /**
- * \brief  This routine handles toggle events for buttons in the stroke style
- *         dialog.
+ * This routine handles toggle events for buttons in the stroke style dialog.
+ *
  * When activated, this routine gets the data for the various widgets, and then
  * calls the respective routines to update css properties, etc.
  *
  */
-static void
-sp_stroke_style_any_toggled(Gtk::ToggleButton *tb, Gtk::Container *spw)
+static void sp_stroke_style_any_toggled(Gtk::ToggleButton *tb, Gtk::Container *spw)
 {
     if (spw->get_data("update")) {
         return;
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 0b37aa610..6ec393c2c 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -1,6 +1,7 @@
-/** @file
- * @brief Controls bars for some of Inkscape's tools (for some tools,
- * they are in their own files)
+/**
+ * @file
+ * Controls bars for some of Inkscape's tools (for some tools,
+ * they are in their own files).
  */
 /* Authors:
  *   MenTaLguY <mental@rydia.net>
@@ -4133,7 +4134,7 @@ static void freehand_change_shape(EgeSelectOneAction* act, GObject *dataKludge)
 }
 
 /**
- * \brief Generate the list of freehand advanced shape option entries.
+ * Generate the list of freehand advanced shape option entries.
  */
 static GList * freehand_shape_dropdown_items_list() {
     GList *glist = NULL;