Fixing more broken and split doc comments.

(bzr r10697)

2 files changed, 18 insertions, 37 deletions

diff --git a/src/trace/trace.cpp b/src/trace/trace.cpp
index 64a4a7732..8f04d7a2d 100644
--- a/src/trace/trace.cpp
+++ b/src/trace/trace.cpp
@@ -1,4 +1,4 @@
-/**
+/*
  * A generic interface for plugging different
  *  autotracers into Inkscape.
  *
@@ -38,12 +38,7 @@
 namespace Inkscape {
 namespace Trace {
 
-/**
- * Get the selected image.  Also check for any SPItems over it, in
- * case the user wants SIOX pre-processing.
- */
-SPImage *
-Tracer::getSelectedSPImage()
+SPImage *Tracer::getSelectedSPImage()
 {
 
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
@@ -198,13 +193,7 @@ public:
 
 
 
-/**
- * Process a GdkPixbuf, according to which areas have been
- * obscured in the GUI.
- */
-Glib::RefPtr<Gdk::Pixbuf>
-Tracer::sioxProcessImage(SPImage *img,
-             Glib::RefPtr<Gdk::Pixbuf>origPixbuf)
+Glib::RefPtr<Gdk::Pixbuf> Tracer::sioxProcessImage(SPImage *img, Glib::RefPtr<Gdk::Pixbuf>origPixbuf)
 {
     if (!sioxEnabled)
         return origPixbuf;
@@ -334,11 +323,7 @@ Tracer::sioxProcessImage(SPImage *img,
 }
 
 
-/**
- *
- */
-Glib::RefPtr<Gdk::Pixbuf>
-Tracer::getSelectedImage()
+Glib::RefPtr<Gdk::Pixbuf> Tracer::getSelectedImage()
 {
 
 
@@ -378,18 +363,12 @@ Tracer::getSelectedImage()
 //#  T R A C E
 //#########################################################################
 
-/**
- *  Whether we want to enable SIOX subimage selection
- */
 void Tracer::enableSiox(bool enable)
 {
     sioxEnabled = enable;
 }
 
 
-/**
- *  Threaded method that does single bitmap--->path conversion
- */
 void Tracer::traceThread()
 {
     //## Remember. NEVER leave this method without setting
@@ -559,9 +538,6 @@ void Tracer::traceThread()
 
 
 
-/**
- *  Main tracing method
- */
 void Tracer::trace(TracingEngine *theEngine)
 {
     //Check if we are already running
@@ -588,9 +564,6 @@ void Tracer::trace(TracingEngine *theEngine)
 
 
 
-/**
- *  Abort the thread that is executing trace()
- */
 void Tracer::abort()
 {
 
diff --git a/src/trace/trace.h b/src/trace/trace.h
index 45b18385f..29b8716ee 100644
--- a/src/trace/trace.h
+++ b/src/trace/trace.h
@@ -6,8 +6,8 @@
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
-#ifndef __TRACE_H__
-#define __TRACE_H__
+#ifndef SEEN_TRACE_H
+#define SEEN_TRACE_H
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -207,7 +207,7 @@ public:
     void abort();
 
     /**
-     *  Whether we want to enable SIOX subimage selection
+     *  Whether we want to enable SIOX subimage selection.
      */
     void enableSiox(bool enable);
 
@@ -216,6 +216,7 @@ private:
 
     /**
      * This is the single path code that is called by its counterpart above.
+     * Threaded method that does single bitmap--->path conversion.
      */
     void traceThread();
 
@@ -231,14 +232,21 @@ private:
      */
     TracingEngine *engine;
 
+    /**
+     * Get the selected image.  Also check for any SPItems over it, in
+     * case the user wants SIOX pre-processing.
+     */
     SPImage *getSelectedSPImage();
 
     std::vector<SPShape *> sioxShapes;
 
     bool sioxEnabled;
 
-    Glib::RefPtr<Gdk::Pixbuf> sioxProcessImage(
-           SPImage *img, Glib::RefPtr<Gdk::Pixbuf> origPixbuf);
+    /**
+     * Process a GdkPixbuf, according to which areas have been
+     * obscured in the GUI.
+     */
+    Glib::RefPtr<Gdk::Pixbuf> sioxProcessImage(SPImage *img, Glib::RefPtr<Gdk::Pixbuf> origPixbuf);
 
     Glib::RefPtr<Gdk::Pixbuf> lastSioxPixbuf;
     Glib::RefPtr<Gdk::Pixbuf> lastOrigPixbuf;
@@ -254,7 +262,7 @@ private:
 
 
 
-#endif //__TRACE_H__
+#endif // SEEN_TRACE_H
 
 //#########################################################################
 //# E N D   O F   F I L E