Fresco/GGI/GGIKit GGIKitImpl.cc,1.8,1.9 VisualImpl.cc,1.15,1.16 VisualImpl.hh,1.9,1.10

Update of /cvs/fresco/Fresco/GGI/GGIKit
In directory purcel:/tmp/cvs-serv14987/GGI/GGIKit

Modified Files:
	GGIKitImpl.cc VisualImpl.cc VisualImpl.hh 
Log Message:
Remove a namingconflict between a namespace and the GGIKit-class.


Index: GGIKitImpl.cc
===================================================================
RCS file: /cvs/fresco/Fresco/GGI/GGIKit/GGIKitImpl.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- GGIKitImpl.cc	27 Oct 2003 17:08:40 -0000	1.8
+++ GGIKitImpl.cc	27 Oct 2003 20:19:46 -0000	1.9
@@ -35,7 +35,7 @@
 GGI::Visual_ptr GGI::Kit::GGIKitImpl::create_visual(Fresco::PixelCoord w,
                                                     Fresco::PixelCoord h)
 {
-    return create<GGI::Visual>(new VisualImpl(w, h));
+    return create<GGI::Visual>(new GGI::Kit::VisualImpl(w, h));
 }
 
 

Index: VisualImpl.cc
===================================================================
RCS file: /cvs/fresco/Fresco/GGI/GGIKit/VisualImpl.cc,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- VisualImpl.cc	27 Oct 2003 17:08:40 -0000	1.15
+++ VisualImpl.cc	27 Oct 2003 20:19:46 -0000	1.16
@@ -34,9 +34,9 @@
 using namespace Prague;
 using namespace Fresco;
 
-GGIDrawableFactory * GGI::GGIKit::VisualImpl::_factory = 0;
+GGIDrawableFactory * GGI::Kit::VisualImpl::_factory = 0;
 
-GGI::GGIKit::VisualImpl::VisualImpl(PixelCoord w, PixelCoord h) :
+GGI::Kit::VisualImpl::VisualImpl(PixelCoord w, PixelCoord h) :
   ControllerImpl(false),
   _width(w),
   _height(h)
@@ -59,23 +59,23 @@
     _mode = buffer;
 }
 
-GGI::GGIKit::VisualImpl::~VisualImpl()
+GGI::Kit::VisualImpl::~VisualImpl()
 {
     Trace trace("VisualImpl::~VisualImpl");
     SHM::deallocate(_shm);
 }
 
-char * GGI::GGIKit::VisualImpl::name()
+char * GGI::Kit::VisualImpl::name()
 {
     return CORBA::string_dup(_ggi->name().c_str());
 }
 
-char * GGI::GGIKit::VisualImpl::mode()
+char * GGI::Kit::VisualImpl::mode()
 {
     return CORBA::string_dup(_mode.c_str());
 }
 
-void GGI::GGIKit::VisualImpl::request(Fresco::Graphic::Requisition &requisition)
+void GGI::Kit::VisualImpl::request(Fresco::Graphic::Requisition &requisition)
 {
     Trace trace("VisualImpl::request");
     requisition.x.defined = true;
@@ -89,21 +89,21 @@
     requisition.z.defined = false;
 }
 
-void GGI::GGIKit::VisualImpl::draw(DrawTraversal_ptr traversal)
+void GGI::Kit::VisualImpl::draw(DrawTraversal_ptr traversal)
 {
     Trace trace("VisualImpl::draw");
     DrawingKit_var drawing = traversal->drawing();
     drawing->copy_drawable(_drawable, 0, 0, _width, _height);
 }
 
-void GGI::GGIKit::VisualImpl::extension(const Allocation::Info &info, Region_ptr region)
+void GGI::Kit::VisualImpl::extension(const Allocation::Info &info, Region_ptr region)
 {
     Trace trace("VisualImpl::extension");
     GraphicImpl::extension(info, region);
 }
 
-CORBA::Boolean GGI::GGIKit::VisualImpl::handle_positional(PickTraversal_ptr traversal,
-                                                          const Fresco::Input::Event &event)
+CORBA::Boolean GGI::Kit::VisualImpl::handle_positional(PickTraversal_ptr traversal,
+                                                       const Fresco::Input::Event &event)
 {
     Trace trace("VisualImpl::handle_positional");
 
@@ -121,7 +121,7 @@
     return true;
 }
 
-CORBA::Boolean GGI::GGIKit::VisualImpl::handle_non_positional(const Fresco::Input::Event &event)
+CORBA::Boolean GGI::Kit::VisualImpl::handle_non_positional(const Fresco::Input::Event &event)
 {
     Trace trace("VisualImpl::handle_non_positional");
     /*
@@ -168,8 +168,8 @@
     return true;
 }
 
-void GGI::GGIKit::VisualImpl::move(Fresco::PickTraversal_ptr traversal,
-                                   const Input::Event &event)
+void GGI::Kit::VisualImpl::move(Fresco::PickTraversal_ptr traversal,
+                                const Input::Event &event)
 {
     Trace trace("VisualImpl::move");
 
@@ -201,7 +201,7 @@
     forward_event(ggi);
 }
 
-void GGI::GGIKit::VisualImpl::handle_pointer_button(const Input::Event &event)
+void GGI::Kit::VisualImpl::handle_pointer_button(const Input::Event &event)
 {
     Trace trace("VisualImpl::handle_pointer_button");
 
@@ -236,7 +236,7 @@
     forward_event(ggi);
 }
 
-void GGI::GGIKit::VisualImpl::forward_event(const ggi_event &event)
+void GGI::Kit::VisualImpl::forward_event(const ggi_event &event)
 {
     Trace trace("VisualImpl::forward_event");
     // giiEventSend(ggiJoinInputs(_ggi->visual(), 0), const_cast<ggi_event *>(&event));

Index: VisualImpl.hh
===================================================================
RCS file: /cvs/fresco/Fresco/GGI/GGIKit/VisualImpl.hh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- VisualImpl.hh	27 Oct 2003 17:08:40 -0000	1.9
+++ VisualImpl.hh	27 Oct 2003 20:19:46 -0000	1.10
@@ -34,7 +34,7 @@
 
 namespace GGI
 {
-  namespace GGIKit
+  namespace Kit
   {
 
     class VisualImpl : public virtual POA_GGI::Visual,