[goffice] Compilation: grand rename, part 6.

[Morten Welinder <mortenw src gnome org>]

commit f7fd1c9840ee7b1c22eaccb504840aef457ba1b2
Author: Morten Welinder <terra gnome org>
Date:   Sun Aug 23 20:22:51 2009 -0400

    Compilation: grand rename, part 6.

 docs/reference/tmpl/gog-object.sgml |   22 +++++++-------
 goffice/utils/go-units.h            |   54 +++++++++++++++++-----------------
 2 files changed, 38 insertions(+), 38 deletions(-)
---
diff --git a/docs/reference/tmpl/gog-object.sgml b/docs/reference/tmpl/gog-object.sgml
index dc3cd3e..69a0b86 100644
--- a/docs/reference/tmpl/gog-object.sgml
+++ b/docs/reference/tmpl/gog-object.sgml
@@ -54,53 +54,53 @@ Base class for all objects of graph model
 
 </para>
 
-@: 
-@: 
+ gogobject: the object which received the signal.
+ arg1: 
 
 <!-- ##### SIGNAL GogObject::child-added ##### -->
 <para>
 
 </para>
 
-@: 
-@: 
+ gogobject: the object which received the signal.
+ arg1: 
 
 <!-- ##### SIGNAL GogObject::child-name-changed ##### -->
 <para>
 
 </para>
 
-@: 
-@: 
+ gogobject: the object which received the signal.
+ arg1: 
 
 <!-- ##### SIGNAL GogObject::child-removed ##### -->
 <para>
 
 </para>
 
-@: 
-@: 
+ gogobject: the object which received the signal.
+ arg1: 
 
 <!-- ##### SIGNAL GogObject::children-reordered ##### -->
 <para>
 
 </para>
 
-@: 
+ gogobject: the object which received the signal.
 
 <!-- ##### SIGNAL GogObject::name-changed ##### -->
 <para>
 
 </para>
 
-@: 
+ gogobject: the object which received the signal.
 
 <!-- ##### SIGNAL GogObject::update-editor ##### -->
 <para>
 
 </para>
 
-@: 
+ gogobject: the object which received the signal.
 
 <!-- ##### ARG GogObject:alignment ##### -->
 <para>
diff --git a/goffice/utils/go-units.h b/goffice/utils/go-units.h
index f900190..3e7ab3b 100644
--- a/goffice/utils/go-units.h
+++ b/goffice/utils/go-units.h
@@ -30,39 +30,39 @@ G_BEGIN_DECLS
 /* This way inch, pt, and mm are all integer multipliers (in fact, a nanometer is.) */
 /* (Of course that is only true because we use the lobotomized pt size so that
    1inch is exactly 72pt.)  */
-#define PT_PER_IN 72
-#define CM_PER_IN 254
-#define EMU_PER_IN 914400
+#define GO_PT_PER_IN 72
+#define GO_CM_PER_IN 254
+#define GO_EMU_PER_IN 914400
 
-#define UN_PER_IN 228600000
-#define UN_PER_EMU (UN_PER_IN/EMU_PER_IN)
-#define UN_PER_PT (UN_PER_IN/PT_PER_IN)
-#define UN_PER_CM (UN_PER_IN/CM_PER_IN)
+#define GO_UN_PER_IN 228600000
+#define GO_UN_PER_EMU (GO_UN_PER_IN / GO_EMU_PER_IN)
+#define GO_UN_PER_PT (GO_UN_PER_IN / GO_PT_PER_IN)
+#define GO_UN_PER_CM (GO_UN_PER_IN / GO_CM_PER_IN)
 
-#define GO_IN_TO_UN(inch)	((inch)*UN_PER_IN)
-#define GO_IN_TO_PT(inch)	((inch)*PT_PER_IN)
-#define GO_IN_TO_CM(inch)	((inch)*CM_PER_IN/100)
-#define GO_IN_TO_EMU(inch)	((inch)*EMU_PER_IN)
+#define GO_IN_TO_UN(inch)	((inch) * GO_UN_PER_IN)
+#define GO_IN_TO_PT(inch)	((inch) * GO_PT_PER_IN)
+#define GO_IN_TO_CM(inch)	((inch) * GO_CM_PER_IN / 100)
+#define GO_IN_TO_EMU(inch)	((inch) * GO_EMU_PER_IN)
 
-#define GO_UN_TO_IN(unit)	((unit)/UN_PER_IN)
-#define GO_UN_TO_PT(unit)	((unit)/UN_PER_PT)
-#define GO_UN_TO_CM(unit)	((unit)/UN_PER_CM/100)
-#define GO_UN_TO_EMU(unit)	((unit)/UN_PER_EMU)
+#define GO_UN_TO_IN(unit)	((unit) / GO_UN_PER_IN)
+#define GO_UN_TO_PT(unit)	((unit) / GO_UN_PER_PT)
+#define GO_UN_TO_CM(unit)	((unit) / GO_UN_PER_CM / 100)
+#define GO_UN_TO_EMU(unit)	((unit) / GO_UN_PER_EMU)
 
-#define GO_PT_TO_UN(pt)		((pt)* UN_PER_PT)
-#define GO_PT_TO_IN(pt)		((pt)           /PT_PER_IN)
-#define GO_PT_TO_CM(pt)		((pt)* CM_PER_IN/PT_PER_IN/100)
-#define GO_PT_TO_EMU(pt)	((pt)*EMU_PER_IN/PT_PER_IN)
+#define GO_PT_TO_UN(pt)		((pt) * GO_UN_PER_PT)
+#define GO_PT_TO_IN(pt)		((pt) / GO_PT_PER_IN)
+#define GO_PT_TO_CM(pt)		((pt) * GO_CM_PER_IN / GO_PT_PER_IN / 100)
+#define GO_PT_TO_EMU(pt)	((pt) * GO_EMU_PER_IN / GO_PT_PER_IN)
 
-#define GO_CM_TO_UN(cm)		((cm)*100*UN_PER_CM)
-#define GO_CM_TO_IN(cm)		((cm)*100          /CM_PER_IN)
-#define GO_CM_TO_PT(cm)		((cm)*100*PT_PER_IN/CM_PER_IN)
-#define GO_CM_TO_EMU(cm)	((cm)*100*PT_PER_IN/EMU_PER_IN)
+#define GO_CM_TO_UN(cm)		((cm) * 100 * GO_UN_PER_CM)
+#define GO_CM_TO_IN(cm)		((cm) * 100 / GO_CM_PER_IN)
+#define GO_CM_TO_PT(cm)		((cm) * 100 * GO_PT_PER_IN / GO_CM_PER_IN)
+#define GO_CM_TO_EMU(cm)	((cm) * 100 * GO_PT_PER_IN / GO_EMU_PER_IN)
 
-#define GO_EMU_TO_UN(emu)	((emu)*UN_PER_EMU)
-#define GO_EMU_TO_IN(emu)	((emu)          /EMU_PER_IN)
-#define GO_EMU_TO_PT(emu)	((emu)*PT_PER_IN/EMU_PER_IN)
-#define GO_EMU_TO_CM(emu)	((emu)*CM_PER_IN/EMU_PER_IN/100)
+#define GO_EMU_TO_UN(emu)	((emu) * GO_UN_PER_EMU)
+#define GO_EMU_TO_IN(emu)	((emu) / GO_EMU_PER_IN)
+#define GO_EMU_TO_PT(emu)	((emu) * GO_PT_PER_IN / GO_EMU_PER_IN)
+#define GO_EMU_TO_CM(emu)	((emu) * GO_CM_PER_IN / GO_EMU_PER_IN / 100)
 
 typedef gint64 GODistance;
 typedef struct {