Fresco/Berlin/modules/Gadgets GadgetKitImpl.cc,1.14,1.15

Update of /cvs/fresco/Fresco/Berlin/modules/Gadgets
In directory purcel:/tmp/cvs-serv9995/Berlin/modules/Gadgets

Modified Files:
	GadgetKitImpl.cc 
Log Message:
Cleanup the cleanup.

A new template create_and_set_body added to KitImpl. That gets us around the
need to define a temporary in most places, shortening the code even further.


Index: GadgetKitImpl.cc
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/modules/Gadgets/GadgetKitImpl.cc,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- GadgetKitImpl.cc	23 Jan 2003 22:31:03 -0000	1.14
+++ GadgetKitImpl.cc	25 Jan 2003 22:37:01 -0000	1.15
@@ -225,19 +225,19 @@
 			       BoundedValue_ptr g,
 			       BoundedValue_ptr b)
 {
-  Graphic_ptr adjuster = create<Graphic>(new RGBAdjuster(r, g, b));
-  adjuster->body(gg);
-  r->attach(Observer_ptr(adjuster));
-  g->attach(Observer_ptr(adjuster));
-  b->attach(Observer_ptr(adjuster));
+  Graphic_var adjuster =
+      create_and_set_body<Graphic>(new RGBAdjuster(r, g, b), gg);
+  r->attach(Observer_ptr(Graphic_ptr(adjuster)));
+  g->attach(Observer_ptr(Graphic_ptr(adjuster)));
+  b->attach(Observer_ptr(Graphic_ptr(adjuster)));
   return adjuster;
 }
 
 Graphic_ptr GadgetKitImpl::alpha(Graphic_ptr g, BoundedValue_ptr value)
 {
-  Graphic_ptr adjuster = create<Graphic>(new AlphaAdjuster(value));
-  value->attach(Observer_ptr(adjuster));
-  adjuster->body(g);
+  Graphic_var adjuster =
+      create_and_set_body<Graphic>(new AlphaAdjuster(value), g);
+  value->attach(Observer_ptr(Graphic_ptr(adjuster)));
   return adjuster;
 }
 
@@ -246,11 +246,11 @@
 				    BoundedValue_ptr g,
 				    BoundedValue_ptr b)
 {
-  Graphic_ptr adjuster = create<Graphic>(new LightingAdjuster(r, g, b));
-  r->attach(Observer_ptr(adjuster));
-  g->attach(Observer_ptr(adjuster));
-  b->attach(Observer_ptr(adjuster));
-  adjuster->body(gg);
+  Graphic_var adjuster =
+      create_and_set_body<Graphic>(new LightingAdjuster(r, g, b), gg);
+  r->attach(Observer_ptr(Graphic_ptr(adjuster)));
+  g->attach(Observer_ptr(Graphic_ptr(adjuster)));
+  b->attach(Observer_ptr(Graphic_ptr(adjuster)));
 
   return adjuster;
 }
@@ -259,21 +259,19 @@
 				   BoundedValue_ptr value,
 				   Axis axis)
 {
-  Graphic_ptr adjuster = create<Graphic>(new RotationAdjuster(axis));
-  value->attach(Observer_ptr(adjuster));
   Graphic_var transformer = _figure->transformer(g);
-  adjuster->body(transformer);
-
+  Graphic_var adjuster =
+      create_and_set_body<Graphic>(new RotationAdjuster(axis), transformer);
+  value->attach(Observer_ptr(Graphic_ptr(adjuster)));
   return adjuster;
 }
 
 Graphic_ptr GadgetKitImpl::zoomer(Graphic_ptr g, BoundedValue_ptr value)
 {
-  Graphic_ptr adjuster = create<Graphic>(new ZoomAdjuster());
-  value->attach(Observer_ptr(adjuster));
   Graphic_var transformer = _figure->transformer(g);
-  adjuster->body(transformer);
-
+  Graphic_var adjuster =
+      create_and_set_body<Graphic>(new ZoomAdjuster(), transformer);
+  value->attach(Observer_ptr(Graphic_ptr(adjuster)));
   return adjuster;
 }